Description: Modify the tests to build with the version of junit in wheezy
Author: Emmanuel Bourg <ebourg@pache.org>
Forwarded: not-needed
--- a/test/org/apache/tomcat/util/net/TestSsl.java
+++ b/test/org/apache/tomcat/util/net/TestSsl.java
@@ -157,7 +157,7 @@
     public void testRenegotiateWorks() throws Exception {
         Tomcat tomcat = getTomcatInstance();
 
-        Assume.assumeTrue("SSL renegotiation has to be supported for this test",
+        Assume.assumeTrue(//"SSL renegotiation has to be supported for this test",
                 TesterSupport.isRenegotiationSupported(getTomcatInstance()));
 
         File appDir = new File(getBuildDirectory(), "webapps/examples");
--- a/test/org/apache/catalina/comet/TestCometProcessor.java
+++ b/test/org/apache/catalina/comet/TestCometProcessor.java
@@ -53,7 +53,7 @@
     @Test
     public void testAsyncClose() throws Exception {
         Assume.assumeTrue(
-                "This test is skipped, because this connector does not support Comet.",
+                //"This test is skipped, because this connector does not support Comet.",
                 isCometSupported());
 
         // Setup Tomcat instance
@@ -120,7 +120,7 @@
     @Test
     public void testSyncClose() throws Exception {
         Assume.assumeTrue(
-                "This test is skipped, because this connector does not support Comet.",
+                //"This test is skipped, because this connector does not support Comet.",
                 isCometSupported());
 
         // Setup Tomcat instance
@@ -191,7 +191,7 @@
     @Ignore("fails consistently on Debian/Linux")
     public void testConnectionClose() throws Exception {
         Assume.assumeTrue(
-                "This test is skipped, because this connector does not support Comet.",
+                //"This test is skipped, because this connector does not support Comet.",
                 isCometSupported());
 
         // Setup Tomcat instance
@@ -264,7 +264,7 @@
 
     private void doSimpleCometTest(String initParam) throws Exception {
         Assume.assumeTrue(
-                "This test is skipped, because this connector does not support Comet.",
+                //"This test is skipped, because this connector does not support Comet.",
                 isCometSupported());
 
         // Setup Tomcat instance
@@ -358,7 +358,7 @@
     @Test
     public void testCometConnectorStop() throws Exception {
         Assume.assumeTrue(
-                "This test is skipped, because this connector does not support Comet.",
+                //"This test is skipped, because this connector does not support Comet.",
                 isCometSupported());
 
         // Setup Tomcat instance
--- a/test/org/apache/tomcat/util/net/TestClientCert.java
+++ b/test/org/apache/tomcat/util/net/TestClientCert.java
@@ -46,7 +46,7 @@
     }
 
     private void doTestClientCertGet(boolean preemtive) throws Exception {
-        Assume.assumeTrue("SSL renegotiation has to be supported for this test",
+        Assume.assumeTrue(//"SSL renegotiation has to be supported for this test",
                 TesterSupport.isRenegotiationSupported(getTomcatInstance()));
 
         if (preemtive) {
@@ -96,7 +96,7 @@
 
     private void doTestClientCertPost(int bodySize, boolean expectProtectedFail)
             throws Exception {
-        Assume.assumeTrue("SSL renegotiation has to be supported for this test",
+        Assume.assumeTrue(//"SSL renegotiation has to be supported for this test",
                 TesterSupport.isRenegotiationSupported(getTomcatInstance()));
 
         getTomcatInstance().start();
--- a/test/org/apache/tomcat/util/net/TestCustomSsl.java
+++ b/test/org/apache/tomcat/util/net/TestCustomSsl.java
@@ -51,8 +51,8 @@
         Tomcat tomcat = getTomcatInstance();
         Connector connector = tomcat.getConnector();
 
-        Assume.assumeFalse("This test is only for JSSE based SSL connectors",
-                connector.getProtocolHandlerClassName().contains("Apr"));
+        Assume.assumeTrue(//"This test is only for JSSE based SSL connectors",
+                !connector.getProtocolHandlerClassName().contains("Apr"));
 
         connector.setProperty("sslImplementationName",
                 "org.apache.tomcat.util.net.jsse.TesterBug50640SslImpl");
@@ -99,7 +99,7 @@
 
         Tomcat tomcat = getTomcatInstance();
 
-        Assume.assumeTrue("SSL renegotiation has to be supported for this test",
+        Assume.assumeTrue(//"SSL renegotiation has to be supported for this test",
                 TesterSupport.isRenegotiationSupported(getTomcatInstance()));
 
         TesterSupport.configureClientCertContext(tomcat);