Author: kkolinko
Date: Sat Mar 15 15:22:58 2014
New Revision: 1577879
URL: http://svn.apache.org/r1577879
Log:
Backport of r1577867 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/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java?rev=1577879&r1=1577878&r2=1577879&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
(original)
+++
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Sat Mar 15 15:22:58 2014
@@ -30,6 +30,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;
@@ -103,9 +104,9 @@ 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("HTTP/1.1")) {
- return;
- }
+ Assume.assumeFalse(
+ "Skip this test on BIO. TODO: investigate options to make it
pass with HTTP BIO connector",
+
getTomcatInstance().getConnector().getProtocol().equals("HTTP/1.1"));
Tomcat tomcat = getTomcatInstance();
// Must have a real docBase - just use temp
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
