Repository: qpid-broker-j Updated Branches: refs/heads/master 988e5c960 -> d773df7d7
QPID-8151: [Broker-J] [Unit tests] Add missing exclusion when running on an IBM JDK. Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/d773df7d Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/d773df7d Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/d773df7d Branch: refs/heads/master Commit: d773df7d7c78480de02d8a0feab7d7401df22e50 Parents: 988e5c9 Author: Keith Wall <kw...@apache.org> Authored: Mon Apr 2 16:30:48 2018 +0100 Committer: Keith Wall <kw...@apache.org> Committed: Mon Apr 2 16:31:15 2018 +0100 ---------------------------------------------------------------------- .../qpid/server/transport/TCPandSSLTransportTest.java | 7 +++++++ test-profiles/IBMJDKExcludes | 14 -------------- 2 files changed, 7 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d773df7d/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java ---------------------------------------------------------------------- diff --git a/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java b/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java index d3fd34d..53d81f5 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java +++ b/broker-core/src/test/java/org/apache/qpid/server/transport/TCPandSSLTransportTest.java @@ -20,7 +20,12 @@ */ package org.apache.qpid.server.transport; +import static org.apache.qpid.test.utils.JvmVendor.IBM; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.not; import static org.junit.Assert.fail; +import static org.junit.Assume.assumeThat; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -60,6 +65,7 @@ public class TCPandSSLTransportTest extends UnitTestBase @Test public void testNoSSLv3SupportOnSSLOnlyPort() throws Exception { + assumeThat("The IBM JDK has different TLS defaults", getJvmVendor(), is(not(equalTo(IBM)))); try { checkSSLExcluded("SSLv3", Transport.SSL); @@ -105,6 +111,7 @@ public class TCPandSSLTransportTest extends UnitTestBase @Test public void testNoSSLv3SupportOnSharedPort() throws Exception { + assumeThat("The IBM JDK has different TLS defaults", getJvmVendor(), is(not(equalTo(IBM)))); try { checkSSLExcluded("SSLv3", Transport.TCP, Transport.SSL); http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/d773df7d/test-profiles/IBMJDKExcludes ---------------------------------------------------------------------- diff --git a/test-profiles/IBMJDKExcludes b/test-profiles/IBMJDKExcludes index 353c739..969b927 100644 --- a/test-profiles/IBMJDKExcludes +++ b/test-profiles/IBMJDKExcludes @@ -17,17 +17,3 @@ // under the License. // -org.apache.qpid.server.transport.TCPandSSLTransportTest#* - -# Transformer on IBM JDK has different whitespace behaviour -org.apache.qpid.disttest.results.ResultsXmlWriterTest#* - -# THe IBMJSSE2 trust factory (IbmX509) validates the entire certificate chain, including trusted certificates. -# https://www.ibm.com/support/knowledgecenter/en/SSYKE2_8.0.0/com.ibm.java.security.component.80.doc/security-component/jsse2Docs/knowndiffsun.html -org.apache.qpid.server.security.FileTrustStoreTest#testUseOfExpiredTrustAnchorAllowed - -# (QPID-7955) Behaviourial difference between the IBM JDK and the Open JDK -# https://www.ibm.com/developerworks/community/forums/html/topic?id=8482d948-665c-47a2-862e-457e49ac71a4&ps=25 -org.apache.qpid.server.logging.logback.Logback1027WorkaroundTurboFilterTest#testSuppressedExceptionRecursion -org.apache.qpid.server.logging.logback.Logback1027WorkaroundTurboFilterTest#testInitCauseRecursion - --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org