Author: kkolinko
Date: Fri Mar 14 15:46:45 2014
New Revision: 1577582
URL: http://svn.apache.org/r1577582
Log:
Merged revisions r1577557 r1577565 r1577581 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/catalina/comet/TestCometProcessor.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1577557,1577565,1577581
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java?rev=1577582&r1=1577581&r2=1577582&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/comet/TestCometProcessor.java
Fri Mar 14 15:46:45 2014
@@ -33,6 +33,7 @@ import static org.junit.Assert.assertTru
import static org.junit.Assert.fail;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.Test;
import org.apache.catalina.Context;
@@ -50,11 +51,9 @@ public class TestCometProcessor extends
@Test
public void testAsyncClose() throws Exception {
-
- if (!isCometSupported()) {
- log.info("This test is skipped, because this connector does not
support Comet.");
- return;
- }
+ Assume.assumeTrue(
+ "This test is skipped, because this connector does not support
Comet.",
+ isCometSupported());
// Setup Tomcat instance
Tomcat tomcat = getTomcatInstance();
@@ -119,11 +118,9 @@ public class TestCometProcessor extends
@Test
public void testSyncClose() throws Exception {
-
- if (!isCometSupported()) {
- log.info("This test is skipped, because this connector does not
support Comet.");
- return;
- }
+ Assume.assumeTrue(
+ "This test is skipped, because this connector does not support
Comet.",
+ isCometSupported());
// Setup Tomcat instance
Tomcat tomcat = getTomcatInstance();
@@ -192,11 +189,9 @@ public class TestCometProcessor extends
@Test
public void testConnectionClose() throws Exception {
-
- if (!isCometSupported()) {
- log.info("This test is skipped, because this connector does not
support Comet.");
- return;
- }
+ Assume.assumeTrue(
+ "This test is skipped, because this connector does not support
Comet.",
+ isCometSupported());
// Setup Tomcat instance
Tomcat tomcat = getTomcatInstance();
@@ -267,10 +262,9 @@ public class TestCometProcessor extends
}
private void doSimpleCometTest(String initParam) throws Exception {
- if (!isCometSupported()) {
- log.info("This test is skipped, because this connector does not
support Comet.");
- return;
- }
+ Assume.assumeTrue(
+ "This test is skipped, because this connector does not support
Comet.",
+ isCometSupported());
// Setup Tomcat instance
Tomcat tomcat = getTomcatInstance();
@@ -362,11 +356,9 @@ public class TestCometProcessor extends
*/
@Test
public void testCometConnectorStop() throws Exception {
-
- if (!isCometSupported()) {
- log.info("This test is skipped, because this connector does not
support Comet.");
- return;
- }
+ Assume.assumeTrue(
+ "This test is skipped, because this connector does not support
Comet.",
+ isCometSupported());
// Setup Tomcat instance
SimpleCometServlet servlet = new SimpleCometServlet();
@@ -461,11 +453,7 @@ public class TestCometProcessor extends
private boolean isCometSupported() {
String protocol =
getTomcatInstance().getConnector().getProtocolHandlerClassName();
- if (protocol.indexOf("Nio") == -1 && protocol.indexOf("Apr") == -1) {
- return false;
- } else {
- return true;
- }
+ return (protocol.contains("Nio") || protocol.contains("Apr"));
}
private static class SimpleCometServlet extends HttpServlet
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestClientCert.java?rev=1577582&r1=1577581&r2=1577582&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestClientCert.java
Fri Mar 14 15:46:45 2014
@@ -20,6 +20,7 @@ import java.util.Arrays;
import static org.junit.Assert.assertEquals;
+import org.junit.Assume;
import org.junit.Test;
import org.apache.catalina.startup.Tomcat;
@@ -35,9 +36,8 @@ public class TestClientCert extends Tomc
@Test
public void testClientCertGet() throws Exception {
- if (!TesterSupport.isRenegotiationSupported(getTomcatInstance())) {
- return;
- }
+ Assume.assumeTrue("SSL renegotiation has to be supported for this
test",
+ TesterSupport.isRenegotiationSupported(getTomcatInstance()));
// Unprotected resource
ByteChunk res =
@@ -72,9 +72,8 @@ public class TestClientCert extends Tomc
private void doTestClientCertPost(int bodySize, boolean
expectProtectedFail)
throws Exception {
- if (!TesterSupport.isRenegotiationSupported(getTomcatInstance())) {
- return;
- }
+ Assume.assumeTrue("SSL renegotiation has to be supported for this
test",
+ TesterSupport.isRenegotiationSupported(getTomcatInstance()));
byte[] body = new byte[bodySize];
Arrays.fill(body, TesterSupport.DATA);
Modified:
tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java?rev=1577582&r1=1577581&r2=1577582&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestCustomSsl.java Fri
Mar 14 15:46:45 2014
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import org.junit.Assume;
import org.junit.Test;
import org.apache.catalina.connector.Connector;
@@ -49,10 +50,9 @@ public class TestCustomSsl extends Tomca
Tomcat tomcat = getTomcatInstance();
Connector connector = tomcat.getConnector();
- if (connector.getProtocolHandlerClassName().contains("Apr")) {
- // This test is only for JSSE based SSL connectors
- return;
- }
+
+ Assume.assumeFalse("This test is only for JSSE based SSL connectors",
+ connector.getProtocolHandlerClassName().contains("Apr"));
connector.setProperty("sslImplementationName",
"org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl");
@@ -99,9 +99,8 @@ public class TestCustomSsl extends Tomca
Tomcat tomcat = getTomcatInstance();
- if (!TesterSupport.isRenegotiationSupported(getTomcatInstance())) {
- return;
- }
+ Assume.assumeTrue("SSL renegotiation has to be supported for this
test",
+ TesterSupport.isRenegotiationSupported(getTomcatInstance()));
TesterSupport.configureClientCertContext(tomcat);
Modified: tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java?rev=1577582&r1=1577581&r2=1577582&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java (original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/tomcat/util/net/TestSsl.java Fri Mar
14 15:46:45 2014
@@ -33,6 +33,7 @@ import javax.net.ssl.SSLSocketFactory;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import org.junit.Assume;
import org.junit.Test;
import org.apache.catalina.startup.Tomcat;
@@ -156,9 +157,8 @@ public class TestSsl extends TomcatBaseT
public void testRenegotiateWorks() throws Exception {
Tomcat tomcat = getTomcatInstance();
- if (!TesterSupport.isRenegotiationSupported(tomcat)) {
- return;
- }
+ Assume.assumeTrue("SSL renegotiation has to be supported for this
test",
+ TesterSupport.isRenegotiationSupported(getTomcatInstance()));
File appDir = new File(getBuildDirectory(), "webapps/examples");
// app dir is relative to server home
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
