This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch wheezy-backports in repository tomcat8.
commit d55ed1d0597965bfbe17a31342d63290fc0faf4b Author: Emmanuel Bourg <[email protected]> Date: Fri Jun 27 12:38:42 2014 +0200 Modified the tests to compile and run with the versions of JUnit, Hamcrest and EasyMock available in Wheezy --- debian/changelog | 2 + debian/control | 8 +- debian/patches/0100-test-compat.patch | 164 ++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 2 +- 5 files changed, 172 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5995486..a4bf210 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ tomcat8 (8.0.14-1~bpo70+1) wheezy-backports; urgency=low - Depend on openjdk-7 instead of openjdk-6 which is the default in Wheezy - Build the Javadoc with the JDK specified by the JAVA_HOME variable instead of the default JDK + - Modified the tests to compile and run with the versions of JUnit, + Hamcrest and EasyMock available in Wheezy -- Emmanuel Bourg <[email protected]> Wed, 10 Dec 2014 15:41:03 +0100 diff --git a/debian/control b/debian/control index f3a4f5c..deb8acf 100644 --- a/debian/control +++ b/debian/control @@ -12,11 +12,11 @@ Build-Depends: ant-optional, openjdk-7-jdk, po-debconf Build-Depends-Indep: javahelper, - junit4 (>= 4.11), - libcglib3-java, - libeasymock-java (>= 3.0), + junit4, + libcglib-java, + libeasymock-java, libecj-java (>= 3.10.0), - libhamcrest-java (>= 1.3), + libhamcrest-java (>= 1.2), libjakarta-taglibs-standard-java, libjstl1.1-java, libobjenesis-java, diff --git a/debian/patches/0100-test-compat.patch b/debian/patches/0100-test-compat.patch new file mode 100644 index 0000000..8d7c26e --- /dev/null +++ b/debian/patches/0100-test-compat.patch @@ -0,0 +1,164 @@ +Description: Modifies the tests to compile and run with the versions of JUnit, + Hamcrest and EasyMock available in Wheezy +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java ++++ b/test/org/apache/tomcat/websocket/TestWsWebSocketContainer.java +@@ -389,9 +389,7 @@ + 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())); ++ Assume.assumeTrue(!getProtocol().equals(Http11Protocol.class.getName())); + + /* + * Note: There are all sorts of horrible uses of statics in this test +--- 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 +@@ -53,8 +53,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"); +@@ -97,7 +97,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); +--- a/test/org/apache/tomcat/util/net/TestSsl.java ++++ b/test/org/apache/tomcat/util/net/TestSsl.java +@@ -94,7 +94,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())); + + Context root = tomcat.addContext("", TEMP_DIR); +--- a/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java ++++ b/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java +@@ -95,9 +95,9 @@ + public void testBug56032() throws Exception { + // TODO Investigate options to get this test to pass with the HTTP BIO + // connector. +- Assume.assumeFalse( +- "Skip this test on BIO. TODO: investigate options to make it pass with HTTP BIO connector", +- getTomcatInstance().getConnector().getProtocol() ++ Assume.assumeTrue( ++ //"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(); +--- 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 +@@ -192,7 +192,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 +@@ -265,7 +265,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 +@@ -359,7 +359,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/catalina/nonblocking/TestNonBlockingAPI.java ++++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java +@@ -92,9 +92,9 @@ + public void testNonBlockingReadIgnoreIsReady() throws Exception { + // TODO Investigate options to get this test to pass with the HTTP BIO + // connector. +- Assume.assumeFalse( +- "Skipping as this test requires true non-blocking IO", +- getTomcatInstance().getConnector().getProtocol() ++ Assume.assumeTrue( ++ //"Skipping as this test requires true non-blocking IO", ++ !getTomcatInstance().getConnector().getProtocol() + .equals("org.apache.coyote.http11.Http11Protocol")); + doTestNonBlockingRead(true); + } +--- a/test/org/apache/catalina/startup/TestWebappServiceLoader.java ++++ b/test/org/apache/catalina/startup/TestWebappServiceLoader.java +@@ -42,7 +42,7 @@ + private ClassLoader parent; + private ServletContext context; + private WebappServiceLoader<ServletContainerInitializer> loader; +- ++/* + @Before + public void init() { + control = EasyMock.createStrictControl(); +@@ -173,4 +173,5 @@ + control.verify(); + } + } ++*/ + } diff --git a/debian/patches/series b/debian/patches/series index 1e5dd81..323c857 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,3 +12,4 @@ 0018-fix-manager-webapp.patch 0019-add-distribution-to-error-page.patch #0020-disable-java8-support-with-jdtcompiler.patch +0100-test-compat.patch diff --git a/debian/rules b/debian/rules index 3d31294..83c19e0 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,7 @@ TOMCAT_DISTRIBUTION := "$(shell lsb_release -si)" ANT_ARGS := -Dcompile.debug=true \ -Djdt.jar=/usr/share/java/ecj.jar \ -Djunit.jar=/usr/share/java/junit4.jar \ - -Dcglib.jar=/usr/share/java/cglib3-nodep.jar \ + -Dcglib.jar=/usr/share/java/cglib-nodep.jar \ -Deasymock.jar=/usr/share/java/easymock.jar \ -Dhamcrest.jar=/usr/share/java/hamcrest-core.jar \ -Dobjenesis.jar=/usr/share/java/objenesis.jar \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
