This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new bae6edd4dc7 CAMEL-20785: modernize checks for supported JVMs
bae6edd4dc7 is described below
commit bae6edd4dc7450bd5879eaa3db18dc97b4bbc9ed
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Tue Jun 4 09:55:19 2024 +0200
CAMEL-20785: modernize checks for supported JVMs
---
.../camel/component/crypto/ECDSASignatureTest.java | 14 +++-------
.../camel/component/crypto/SignatureTest.java | 5 ++--
.../netty/http/NettyHttpSSLHandshakeErrorTest.java | 7 ++---
.../component/netty/http/NettyHttpSSLSNITest.java | 11 ++------
.../component/netty/http/NettyHttpSSLTest.java | 7 ++---
.../MainNettyGlobalSSLContextParametersTest.java | 7 ++---
.../netty/NettyGlobalSSLContextParametersTest.java | 7 ++---
.../component/netty/NettySSLClasspathTest.java | 7 ++---
.../netty/NettySSLClientCertHeadersTest.java | 7 ++---
.../netty/NettySSLContextParametersTest.java | 7 ++---
.../component/netty/NettySSLPassphaseBeanTest.java | 7 ++---
.../apache/camel/component/netty/NettySSLTest.java | 7 ++---
.../xpath/XPathLanguageDefaultSettingsTest.java | 23 ++++------------
.../camel/language/xpath/XPathLanguageTest.java | 32 ++++------------------
14 files changed, 38 insertions(+), 110 deletions(-)
diff --git
a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
index 749e3a1830f..e6e66fcd929 100644
---
a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
+++
b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/ECDSASignatureTest.java
@@ -32,29 +32,23 @@ import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
import static org.junit.jupiter.api.Assumptions.assumeFalse;
+@DisabledIfSystemProperty(named = "java.vendor", matches = ".*ibm.*")
public class ECDSASignatureTest extends CamelTestSupport {
private static final Logger LOG =
LoggerFactory.getLogger(ECDSASignatureTest.class);
private String payload = "Dear Alice, Rest assured it's me, signed Bob";
- private boolean ibmJDK;
private PrivateKey privateKey;
private X509Certificate x509;
private boolean canRun = true;
public ECDSASignatureTest() {
-
- // This test fails with the IBM JDK
- if (isJavaVendor("IBM")) {
- ibmJDK = true;
- }
-
// see if we can load the keystore et all
try {
KeyStore keyStore =
KeyStore.getInstance(KeyStore.getDefaultType());
@@ -70,7 +64,7 @@ public class ECDSASignatureTest extends CamelTestSupport {
@Override
protected RouteBuilder[] createRouteBuilders() {
- if (ibmJDK || !canRun) {
+ if (!canRun) {
return new RouteBuilder[] {};
}
@@ -95,7 +89,7 @@ public class ECDSASignatureTest extends CamelTestSupport {
@Test
void testECDSASHA1() throws Exception {
- assumeFalse(ibmJDK || !canRun, "Test preconditions failed: ibmJDK=" +
ibmJDK + ", canRun=" + canRun);
+ assumeFalse(!canRun, "Test preconditions failed: canRun=" + canRun);
setupMock();
sendBody("direct:ecdsa-sha1", payload);
diff --git
a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
index dd3c695ccf3..81352a05be6 100644
---
a/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
+++
b/components/camel-crypto/src/test/java/org/apache/camel/component/crypto/SignatureTest.java
@@ -40,14 +40,13 @@ import org.apache.camel.support.jsse.KeyStoreParameters;
import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import static
org.apache.camel.component.crypto.DigitalSignatureConstants.KEYSTORE_ALIAS;
import static
org.apache.camel.component.crypto.DigitalSignatureConstants.SIGNATURE_PRIVATE_KEY;
import static
org.apache.camel.component.crypto.DigitalSignatureConstants.SIGNATURE_PUBLIC_KEY_OR_CERT;
-import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
public class SignatureTest extends CamelTestSupport {
@@ -241,9 +240,9 @@ public class SignatureTest extends CamelTestSupport {
MockEndpoint.assertIsSatisfied(context);
}
+ @DisabledIfSystemProperty(named = "java.vendor", matches = ".*ibm.*")
@Test
void testSetProviderInRouteDefinition() throws Exception {
- assumeFalse(isJavaVendor("ibm"), "can only be run on SUN JDK");
setupMock();
sendBody("direct:provider", payload);
MockEndpoint.assertIsSatisfied(context);
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java
index 5ab241bba95..3ccf5450c62 100644
---
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLHandshakeErrorTest.java
@@ -21,13 +21,13 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.support.DefaultExchange;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
+@DisabledIfSystemProperty(named = "java.vendor", matches = ".*ibm.*")
public class NettyHttpSSLHandshakeErrorTest extends BaseNettyTest {
@Override
@@ -37,9 +37,6 @@ public class NettyHttpSSLHandshakeErrorTest extends
BaseNettyTest {
@Test
public void testHttpsHandshakeError() throws Exception {
- // ibm jdks dont have sun security algorithms
- assumeFalse(isJavaVendor("ibm"));
-
getMockEndpoint("mock:target").expectedMessageCount(0);
context.addRoutes(new RouteBuilder() {
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLSNITest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLSNITest.java
index 6a473bb317f..c9738caee29 100644
---
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLSNITest.java
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLSNITest.java
@@ -31,10 +31,9 @@ import
org.apache.camel.support.jsse.SSLContextClientParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
-
+@DisabledIfSystemProperty(named = "java.vendor", matches = ".*ibm.*")
public class NettyHttpSSLSNITest extends BaseNettyTest {
@Override
@@ -44,9 +43,6 @@ public class NettyHttpSSLSNITest extends BaseNettyTest {
@Test
public void testSSLAddsDefaultServerNameIndication() throws Exception {
- // ibm jdks dont have sun security algorithms
- assumeFalse(isJavaVendor("ibm"));
-
getMockEndpoint("mock:output").expectedBodiesReceived("localhost");
context.getRegistry().bind("customSSLContextParameters",
createSSLContextParameters(null));
@@ -67,9 +63,6 @@ public class NettyHttpSSLSNITest extends BaseNettyTest {
@Test
public void testSSLAddsCustomServerNameIndication() throws Exception {
- // ibm jdks dont have sun security algorithms
- assumeFalse(isJavaVendor("ibm"));
-
String customSNI = "custom.host.name";
getMockEndpoint("mock:output").expectedBodiesReceived(customSNI);
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
index 3a4bd1a0c42..5d424261a71 100644
---
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
@@ -29,11 +29,11 @@ import org.apache.camel.test.junit5.CamelTestSupport;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
+@DisabledIfSystemProperty(named = "java.vendor", matches = ".*ibm.*")
public class NettyHttpSSLTest extends BaseNettyTest {
private static final String NULL_VALUE_MARKER =
CamelTestSupport.class.getCanonicalName();
@@ -83,9 +83,6 @@ public class NettyHttpSSLTest extends BaseNettyTest {
@Test
public void testSSLInOutWithNettyConsumer() throws Exception {
- // ibm jdks dont have sun security algorithms
- assumeFalse(isJavaVendor("ibm"));
-
getMockEndpoint("mock:input").expectedBodiesReceived("Hello World");
context.addRoutes(new RouteBuilder() {
diff --git
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/MainNettyGlobalSSLContextParametersTest.java
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/MainNettyGlobalSSLContextParametersTest.java
index 608f404dc63..bd0f5d42ed7 100644
---
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/MainNettyGlobalSSLContextParametersTest.java
+++
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/MainNettyGlobalSSLContextParametersTest.java
@@ -24,11 +24,11 @@ import javax.net.ssl.SSLSession;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.main.Main;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
+@DisabledIfSystemProperty(named = "java.vendor", matches = ".*ibm.*")
public class MainNettyGlobalSSLContextParametersTest extends BaseNettyTest {
@Override
@@ -38,9 +38,6 @@ public class MainNettyGlobalSSLContextParametersTest extends
BaseNettyTest {
@Test
public void testSSLInOutWithNettyConsumer() throws Exception {
- // ibm jdks dont have sun security algorithms
- assumeFalse(isJavaVendor("ibm"));
-
Main main = new Main();
main.configure().sslConfig().setEnabled(true);
main.configure().sslConfig().setKeyStore(
diff --git
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyGlobalSSLContextParametersTest.java
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyGlobalSSLContextParametersTest.java
index 34e4cc1259e..7b97ee56594 100644
---
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyGlobalSSLContextParametersTest.java
+++
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyGlobalSSLContextParametersTest.java
@@ -28,11 +28,11 @@ import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.SSLContextServerParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
+@DisabledIfSystemProperty(named = "java.vendor", matches = ".*ibm.*")
public class NettyGlobalSSLContextParametersTest extends BaseNettyTest {
@Override
@@ -71,9 +71,6 @@ public class NettyGlobalSSLContextParametersTest extends
BaseNettyTest {
@Test
public void testSSLInOutWithNettyConsumer() throws Exception {
- // ibm jdks dont have sun security algorithms
- assumeFalse(isJavaVendor("ibm"));
-
context.addRoutes(new RouteBuilder() {
public void configure() {
from("netty:tcp://localhost:{{port}}?sync=true&ssl=true")
diff --git
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLClasspathTest.java
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLClasspathTest.java
index e0990e24536..cac97a6008b 100644
---
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLClasspathTest.java
+++
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLClasspathTest.java
@@ -20,11 +20,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
+@DisabledIfSystemProperty(named = "java.vendor", matches = ".*ibm.*")
public class NettySSLClasspathTest extends BaseNettyTest {
@Override
@@ -34,9 +34,6 @@ public class NettySSLClasspathTest extends BaseNettyTest {
@Test
public void testSSLInOutWithNettyConsumer() throws Exception {
- // ibm jdks dont have sun security algorithms
- assumeFalse(isJavaVendor("ibm"));
-
context.addRoutes(new RouteBuilder() {
public void configure() {
from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=changeit&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks")
diff --git
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLClientCertHeadersTest.java
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLClientCertHeadersTest.java
index 1028a3b3b86..64d740b9a2e 100644
---
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLClientCertHeadersTest.java
+++
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLClientCertHeadersTest.java
@@ -22,11 +22,11 @@ import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
+@DisabledIfSystemProperty(named = "java.vendor", matches = ".*ibm.*")
public class NettySSLClientCertHeadersTest extends BaseNettyTest {
@BindToRegistry("ksf")
@@ -46,9 +46,6 @@ public class NettySSLClientCertHeadersTest extends
BaseNettyTest {
@Test
public void testSSLInOutWithNettyConsumer() throws Exception {
- // ibm jdks dont have sun security algorithms
- assumeFalse(isJavaVendor("ibm"));
-
getMockEndpoint("mock:input").expectedMessageCount(1);
getMockEndpoint("mock:input").expectedHeaderReceived(NettyConstants.NETTY_SSL_CLIENT_CERT_SUBJECT_NAME,
diff --git
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLContextParametersTest.java
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLContextParametersTest.java
index 451dbcbc7f8..c400115c88c 100644
---
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLContextParametersTest.java
+++
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLContextParametersTest.java
@@ -27,11 +27,11 @@ import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.SSLContextServerParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
+@DisabledIfSystemProperty(named = "java.vendor", matches = ".*ibm.*")
public class NettySSLContextParametersTest extends BaseNettyTest {
@BindToRegistry("sslContextParameters")
@@ -70,9 +70,6 @@ public class NettySSLContextParametersTest extends
BaseNettyTest {
@Test
public void testSSLInOutWithNettyConsumer() throws Exception {
- // ibm jdks dont have sun security algorithms
- assumeFalse(isJavaVendor("ibm"));
-
context.addRoutes(new RouteBuilder() {
public void configure() {
from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&sslContextParameters=#sslContextParameters")
diff --git
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLPassphaseBeanTest.java
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLPassphaseBeanTest.java
index ae55a798226..40c57c50358 100644
---
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLPassphaseBeanTest.java
+++
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLPassphaseBeanTest.java
@@ -21,11 +21,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
+@DisabledIfSystemProperty(named = "java.vendor", matches = ".*ibm.*")
public class NettySSLPassphaseBeanTest extends BaseNettyTest {
@BindToRegistry("myBean")
@@ -38,9 +38,6 @@ public class NettySSLPassphaseBeanTest extends BaseNettyTest {
@Test
public void testPassphaseBean() throws Exception {
- // ibm jdks dont have sun security algorithms
- assumeFalse(isJavaVendor("ibm"));
-
context.addRoutes(new RouteBuilder() {
public void configure() {
from("netty:tcp://localhost:{{port}}?sync=true&ssl=true&passphrase=#myBean&keyStoreResource=classpath:keystore.jks&trustStoreResource=classpath:keystore.jks")
diff --git
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java
index 72da6c7b453..869241df330 100644
---
a/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java
+++
b/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java
@@ -27,11 +27,11 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
-import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assumptions.assumeFalse;
+@DisabledIfSystemProperty(named = "java.vendor", matches = ".*ibm.*")
public class NettySSLTest extends BaseNettyTest {
@BindToRegistry("ksf")
@@ -51,9 +51,6 @@ public class NettySSLTest extends BaseNettyTest {
@Test
public void testSSLInOutWithNettyConsumer() throws Exception {
- // ibm jdks dont have sun security algorithms
- assumeFalse(isJavaVendor("ibm"));
-
context.addRoutes(new RouteBuilder() {
public void configure() {
// needClientAuth=true so we can get the client certificate
diff --git
a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java
b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java
index 6761f57212f..bb153f1fc86 100644
---
a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java
+++
b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageDefaultSettingsTest.java
@@ -21,37 +21,28 @@ import javax.xml.xpath.XPathFactory;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.parallel.ResourceLock;
import org.junit.jupiter.api.parallel.Resources;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
-
/**
* Tests that verify the usage of default settings in the XPath language by
declaring a bean called xpath in the
* registry
*/
@ResourceLock(Resources.SYSTEM_PROPERTIES)
+@DisabledIfSystemProperty(named = "java.vendor", matches = ".*ibm.*")
public class XPathLanguageDefaultSettingsTest extends CamelSpringTestSupport {
private static final String KEY = XPathFactory.DEFAULT_PROPERTY_NAME + ":"
+ "http://java.sun.com/jaxp/xpath/dom";;
- private boolean jvmAdequate = true;
private String oldPropertyValue;
@Override
- @BeforeEach
- public void setUp() throws Exception {
- if (!isJavaVendor("ibm")) {
- // Force using the JAXP default implementation, because having
Saxon in the classpath will automatically make JAXP use it
- // because of Service Provider discovery (this does not happen in
OSGi because the META-INF/services package is not exported
- oldPropertyValue = System.setProperty(KEY,
"com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl");
- } else {
- jvmAdequate = false;
- }
- super.setUp();
+ public void setupResources() {
+ // Force using the JAXP default implementation, because having Saxon
in the classpath will automatically make JAXP use it
+ // because of Service Provider discovery (this does not happen in OSGi
because the META-INF/services package is not exported
+ oldPropertyValue = System.setProperty(KEY,
"com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl");
}
@Override
@@ -72,8 +63,6 @@ public class XPathLanguageDefaultSettingsTest extends
CamelSpringTestSupport {
@Test
public void testSpringDSLXPathLanguageDefaultSettings() throws Exception {
- assumeTrue(jvmAdequate, "JVM is not adequate");
-
MockEndpoint mockEndpointResult =
getMockEndpoint("mock:testDefaultXPathSettingsResult");
MockEndpoint mockEndpointException =
getMockEndpoint("mock:testDefaultXPathSettingsResultException");
diff --git
a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java
b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java
index 2ee1da0cd5c..d644da552ab 100644
---
a/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java
+++
b/components/camel-saxon/src/test/java/org/apache/camel/language/xpath/XPathLanguageTest.java
@@ -22,38 +22,30 @@ import org.apache.camel.Exchange;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.spring.junit5.CamelSpringTestSupport;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
import org.junit.jupiter.api.parallel.ResourceLock;
import org.junit.jupiter.api.parallel.Resources;
import org.springframework.context.support.AbstractXmlApplicationContext;
-import static org.apache.camel.test.junit5.TestSupport.isJavaVendor;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
/**
*
*/
@ResourceLock(Resources.SYSTEM_PROPERTIES)
+@DisabledIfSystemProperty(named = "java.vendor", matches = ".*ibm.*")
public class XPathLanguageTest extends CamelSpringTestSupport {
private static final String KEY = XPathFactory.DEFAULT_PROPERTY_NAME + ":"
+ "http://java.sun.com/jaxp/xpath/dom";;
- private boolean jvmAdequate = true;
private String oldPropertyValue;
@Override
- @BeforeEach
- public void setUp() throws Exception {
- if (!isJavaVendor("ibm")) {
- // Force using the JAXP default implementation, because having
Saxon in the classpath will automatically make JAXP use it
- // because of Service Provider discovery (this does not happen in
OSGi because the META-INF/services package is not exported
- oldPropertyValue = System.setProperty(KEY,
"com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl");
- } else {
- jvmAdequate = false;
- }
- super.setUp();
+ public void setupResources() {
+ // Force using the JAXP default implementation, because having Saxon
in the classpath will automatically make JAXP use it
+ // because of Service Provider discovery (this does not happen in OSGi
because the META-INF/services package is not exported
+ oldPropertyValue = System.setProperty(KEY,
"com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl");
}
@Override
@@ -74,8 +66,6 @@ public class XPathLanguageTest extends CamelSpringTestSupport
{
@Test
public void testSpringDSLXPathSaxonFlag() throws Exception {
- assumeTrue(jvmAdequate, "JVM is not adequate");
-
MockEndpoint mockEndpoint =
getMockEndpoint("mock:testSaxonWithFlagResult");
mockEndpoint.expectedMessageCount(1);
@@ -89,8 +79,6 @@ public class XPathLanguageTest extends CamelSpringTestSupport
{
@Test
public void testSpringDSLXPathFactory() throws Exception {
- assumeTrue(jvmAdequate, "JVM is not adequate");
-
MockEndpoint mockEndpoint =
getMockEndpoint("mock:testSaxonWithFactoryResult");
mockEndpoint.expectedMessageCount(1);
@@ -105,8 +93,6 @@ public class XPathLanguageTest extends
CamelSpringTestSupport {
@Disabled("See
http://www.saxonica.com/documentation/index.html#!xpath-api/jaxp-xpath/factory";)
@Test
public void testSpringDSLXPathObjectModel() throws Exception {
- assumeTrue(jvmAdequate, "JVM is not adequate");
-
MockEndpoint mockEndpoint =
getMockEndpoint("mock:testSaxonWithObjectModelResult");
mockEndpoint.expectedMessageCount(1);
@@ -120,8 +106,6 @@ public class XPathLanguageTest extends
CamelSpringTestSupport {
@Test
public void testSpringDSLXPathSaxonFlagPredicate() throws Exception {
- assumeTrue(jvmAdequate, "JVM is not adequate");
-
MockEndpoint mockEndpoint =
getMockEndpoint("mock:testSaxonWithFlagResultPredicate");
mockEndpoint.expectedMessageCount(1);
@@ -132,8 +116,6 @@ public class XPathLanguageTest extends
CamelSpringTestSupport {
@Test
public void testSpringDSLXPathFactoryPredicate() throws Exception {
- assumeTrue(jvmAdequate, "JVM is not adequate");
-
MockEndpoint mockEndpoint =
getMockEndpoint("mock:testSaxonWithFactoryResultPredicate");
mockEndpoint.expectedMessageCount(1);
@@ -145,8 +127,6 @@ public class XPathLanguageTest extends
CamelSpringTestSupport {
@Disabled("See
http://www.saxonica.com/documentation/index.html#!xpath-api/jaxp-xpath/factory";)
@Test
public void testSpringDSLXPathObjectModelPredicate() throws Exception {
- assumeTrue(jvmAdequate, "JVM is not adequate");
-
MockEndpoint mockEndpoint =
getMockEndpoint("mock:testSaxonWithObjectModelResultPredicate");
mockEndpoint.expectedMessageCount(1);
