Author: rjung
Date: Wed Dec 18 14:33:48 2013
New Revision: 1551953
URL: http://svn.apache.org/r1551953
Log:
Reset test side-efect between test cases.
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java?rev=1551953&r1=1551952&r2=1551953&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWsSubprotocols.java Wed
Dec 18 14:33:48 2013
@@ -77,6 +77,7 @@ public class TestWsSubprotocols extends
Assert.assertTrue(wsSession.getNegotiatedSubprotocol().isEmpty());
}
wsSession.close();
+ SubProtocolsEndpoint.recycle();
wsSession = wsContainer.connectToServer(
TesterProgrammaticEndpoint.class, ClientEndpointConfig.Builder
@@ -97,6 +98,7 @@ public class TestWsSubprotocols extends
Assert.assertArrayEquals(new String[]{"sp1","sp2"},
SubProtocolsEndpoint.subprotocols.toArray(new String[2]));
wsSession.close();
+ SubProtocolsEndpoint.recycle();
}
@ServerEndpoint(value = "/echo", subprotocols = {"sp1","sp2"})
@@ -110,6 +112,10 @@ public class TestWsSubprotocols extends
subprotocols = ((ServerEndpointConfig)epc).getSubprotocols();
}
+ public static void recycle() {
+ subprotocols = null;
+ }
+
}
public static class Config extends WsContextListener {
@@ -126,4 +132,4 @@ public class TestWsSubprotocols extends
}
}
}
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
