Author: kkolinko
Date: Sun Mar 16 13:51:28 2014
New Revision: 1578072
URL: http://svn.apache.org/r1578072
Log:
Merged r1577944 from tomcat/trunk:
Better reporting for skipped tests.
With org.junit.Assume the tests are clearly reported as 'skipped' in JUnit test
run summary.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1577944
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java?rev=1578072&r1=1578071&r2=1578072&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java
Sun Mar 16 13:51:28 2014
@@ -43,6 +43,7 @@ import javax.websocket.server.ServerEndp
import javax.websocket.server.ServerEndpointConfig;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -383,6 +384,11 @@ public class TestWsWebSocketContainer ex
private void doTestWriteTimeoutServer(boolean setTimeoutOnContainer)
throws Exception {
+ // This will never work for BIO
+ Assume.assumeFalse(
+ "Skipping test. This feature will never work for BIO
connector.",
+ getProtocol().equals(Http11Protocol.class.getName()));
+
/*
* Note: There are all sorts of horrible uses of statics in this test
* because the API uses classes and the tests really need access
@@ -392,11 +398,6 @@ public class TestWsWebSocketContainer ex
Tomcat tomcat = getTomcatInstance();
- if (getProtocol().equals(Http11Protocol.class.getName())) {
- // This will never work for BIO
- return;
- }
-
// Must have a real docBase - just use temp
Context ctx =
tomcat.addContext("", System.getProperty("java.io.tmpdir"));
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
