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 2014/03/15 15:30:09 UTC
svn commit: r1577867 -
/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Author: kkolinko
Date: Sat Mar 15 14:30:09 2014
New Revision: 1577867
URL: http://svn.apache.org/r1577867
Log:
Better reporting for skipped tests.
With org.junit.Assume the tests are clearly reported as 'skipped' in JUnit test run summary.
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java?rev=1577867&r1=1577866&r2=1577867&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java Sat Mar 15 14:30:09 2014
@@ -28,6 +28,7 @@ import javax.websocket.Session;
import javax.websocket.WebSocketContainer;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -49,10 +50,10 @@ public class TestWebSocketFrameClientSSL
// do the encryption inline apparently messes up
// the websockets writes, which deadlock until timedout.
// Reenable later when investigated and fixed.
- if (getTomcatInstance().getConnector().getProtocol().equals(
- "org.apache.coyote.http11.Http11Nio2Protocol")) {
- return;
- }
+ Assume.assumeFalse(
+ "Skip this test on NIO2. FIXME: investigate.",
+ getTomcatInstance().getConnector().getProtocol()
+ .equals("org.apache.coyote.http11.Http11Nio2Protocol"));
Tomcat tomcat = getTomcatInstance();
// Must have a real docBase - just use temp
@@ -105,10 +106,10 @@ public class TestWebSocketFrameClientSSL
public void testBug56032() throws Exception {
// TODO Investigate options to get this test to pass with the HTTP BIO
// connector.
- if (getTomcatInstance().getConnector().getProtocol().equals(
- "org.apache.coyote.http11.Http11Protocol")) {
- return;
- }
+ Assume.assumeFalse(
+ "Skip this test on BIO. TODO: investigate options to make it pass with HTTP BIO connector",
+ getTomcatInstance().getConnector().getProtocol()
+ .equals("org.apache.coyote.http11.Http11Protocol"));
Tomcat tomcat = getTomcatInstance();
// Must have a real docBase - just use temp
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org