You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2020/07/08 13:52:00 UTC
[tomcat] branch 7.0.x updated: Bug 64583 - Make tests more robust.
Fix disabled tests.
This is an automated email from the ASF dual-hosted git repository.
kkolinko pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 90f95ab Bug 64583 - Make tests more robust. Fix disabled tests.
90f95ab is described below
commit 90f95ab83874dba5a7062fc0bc8803aecaba1937
Author: Konstantin Kolinko <kk...@apache.org>
AuthorDate: Wed Jul 8 16:49:25 2020 +0300
Bug 64583 - Make tests more robust. Fix disabled tests.
Followup to previous commit, fixing compilation failures in the test case.
In build.xml there is no separate compilation step for tests that are running with Java 7 (such as this test).
All test classes are compiled with -source 1.6 / -target 1.6.
---
test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
index 484a8b4..93cf639 100644
--- a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
+++ b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
@@ -367,7 +367,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
@ClientEndpoint
public static class StringClient {
- private final Queue<Object> received = new ConcurrentLinkedQueue<>();
+ private final Queue<Object> received = new ConcurrentLinkedQueue<Object>();
@OnMessage
public void rx(String in) {
@@ -398,7 +398,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
configurator=SingletonConfigurator.class)
public static class MessagesServer {
- private final Queue<String> received = new ConcurrentLinkedQueue<>();
+ private final Queue<String> received = new ConcurrentLinkedQueue<String>();
private volatile Throwable t = null;
@OnMessage
@@ -420,7 +420,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
configurator=SingletonConfigurator.class)
public static class BatchedServer {
- private final Queue<String> received = new ConcurrentLinkedQueue<>();
+ private final Queue<String> received = new ConcurrentLinkedQueue<String>();
private volatile Throwable t = null;
@OnMessage
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [tomcat] branch 7.0.x updated: Bug 64583 - Make tests more
robust. Fix disabled tests.
Posted by Mark Thomas <ma...@apache.org>.
On 08/07/2020 14:52, kkolinko@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
>
> kkolinko pushed a commit to branch 7.0.x
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/7.0.x by this push:
> new 90f95ab Bug 64583 - Make tests more robust. Fix disabled tests.
> 90f95ab is described below
>
> commit 90f95ab83874dba5a7062fc0bc8803aecaba1937
> Author: Konstantin Kolinko <kk...@apache.org>
> AuthorDate: Wed Jul 8 16:49:25 2020 +0300
>
> Bug 64583 - Make tests more robust. Fix disabled tests.
>
> Followup to previous commit, fixing compilation failures in the test case.
>
> In build.xml there is no separate compilation step for tests that are running with Java 7 (such as this test).
> All test classes are compiled with -source 1.6 / -target 1.6.
Thanks for fixing this.
Mark
> ---
> test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
> index 484a8b4..93cf639 100644
> --- a/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
> +++ b/test/org/apache/tomcat/websocket/pojo/TestEncodingDecoding.java
> @@ -367,7 +367,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
> @ClientEndpoint
> public static class StringClient {
>
> - private final Queue<Object> received = new ConcurrentLinkedQueue<>();
> + private final Queue<Object> received = new ConcurrentLinkedQueue<Object>();
>
> @OnMessage
> public void rx(String in) {
> @@ -398,7 +398,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
> configurator=SingletonConfigurator.class)
> public static class MessagesServer {
>
> - private final Queue<String> received = new ConcurrentLinkedQueue<>();
> + private final Queue<String> received = new ConcurrentLinkedQueue<String>();
> private volatile Throwable t = null;
>
> @OnMessage
> @@ -420,7 +420,7 @@ public class TestEncodingDecoding extends TomcatBaseTest {
> configurator=SingletonConfigurator.class)
> public static class BatchedServer {
>
> - private final Queue<String> received = new ConcurrentLinkedQueue<>();
> + private final Queue<String> received = new ConcurrentLinkedQueue<String>();
> private volatile Throwable t = null;
>
> @OnMessage
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org