This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 89eee4fdf08acad4d67b5a996520651083227bbd
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Dec 21 11:50:02 2020 +0100
XPath test should run correctly with JDK 16
---
.../component/milo/AbstractMiloServerTest.java | 227 +++++++++++----------
.../camel/builder/xml/XPathTransformTest.java | 6 +-
2 files changed, 119 insertions(+), 114 deletions(-)
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
index 1d2fc63..c8a26d5 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/AbstractMiloServerTest.java
@@ -36,118 +36,119 @@ import static
org.junit.jupiter.api.Assumptions.assumeTrue;
public abstract class AbstractMiloServerTest extends CamelTestSupport {
- private int serverPort;
-
- @Override
- protected void doPreSetup() throws Exception {
- assumeTrue(isJavaVersionSatisfied(9), "Requires java 9+");
- super.doPreSetup();
- this.serverPort = AvailablePortFinder.getNextAvailable();
- }
-
- public int getServerPort() {
- return this.serverPort;
- }
-
- protected boolean isAddServer() {
- return true;
- }
-
- /**
- * Replace the port placeholder with the dynamic server port
- *
- * @param uri the URI to process
- * @return the result, may be {@code null} if the input is {@code null}
- */
- protected String resolve(String uri) {
- if (uri == null) {
- return uri;
- }
-
- return uri.replace("@@port@@", Integer.toString(this.serverPort));
- }
-
- public static void testBody(final AssertionClause clause, final
Consumer<DataValue> valueConsumer) {
- testBody(clause, DataValue.class, valueConsumer);
- }
-
- public static <T> void testBody(final AssertionClause clause, final
Class<T> bodyClass, final Consumer<T> valueConsumer) {
- clause.predicate(exchange -> {
- final T body = exchange.getIn().getBody(bodyClass);
- valueConsumer.accept(body);
- return true;
- });
- }
-
- public static Consumer<DataValue> assertGoodValue(final Object
expectedValue) {
- return value -> {
- assertNotNull(value);
- assertEquals(expectedValue, value.getValue().getValue());
- assertTrue(value.getStatusCode().isGood());
- assertFalse(value.getStatusCode().isBad());
- };
- }
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- final CamelContext context = super.createCamelContext();
- configureContext(context);
- return context;
- }
-
- protected void configureContext(final CamelContext context) throws
Exception {
- if (isAddServer()) {
- final MiloServerComponent server =
context.getComponent("milo-server", MiloServerComponent.class);
- configureMiloServer(server);
- }
- }
-
- protected void configureMiloServer(final MiloServerComponent server)
throws Exception {
- server.setBindAddresses("localhost");
- server.setPort(this.serverPort);
- server.setUserAuthenticationCredentials("foo:bar,foo2:bar2");
- server.setUsernameSecurityPolicyUri(SecurityPolicy.None);
- server.setSecurityPoliciesById("None");
- }
-
- /**
- * Create a default key store for testing
- *
- * @return always returns a key store
- */
- protected KeyStoreLoader.Result loadDefaultTestKey() {
- try {
-
- final KeyStoreLoader loader = new KeyStoreLoader();
- loader.setUrl("file:src/test/resources/keystore");
- loader.setKeyStorePassword("testtest");
-
- loader.setKeyPassword("test");
- return loader.load();
- } catch (final GeneralSecurityException | IOException e) {
- throw new RuntimeException(e);
- }
-
- }
-
- /**
- * Return true, if java version (defined by method
getRequiredJavaVersion()) is satisfied. Works for java versions
- * 9+
- */
- boolean isJavaVersionSatisfied(int requiredVersion) {
- String version = System.getProperty("java.version");
- if (!version.startsWith("1.")) {
- int dot = version.indexOf('.');
- if (dot != -1) {
- version = version.substring(0, dot);
- }
- if (version.equalsIgnoreCase("16-ea")) {
- return true;
- } else if (Integer.parseInt(version) >= requiredVersion) {
- return true;
- }
- }
- return false;
- }
+ private int serverPort;
+
+ @Override
+ protected void doPreSetup() throws Exception {
+ assumeTrue(isJavaVersionSatisfied(9), "Requires java 9+");
+ super.doPreSetup();
+ this.serverPort = AvailablePortFinder.getNextAvailable();
+ }
+
+ public int getServerPort() {
+ return this.serverPort;
+ }
+
+ protected boolean isAddServer() {
+ return true;
+ }
+
+ /**
+ * Replace the port placeholder with the dynamic server port
+ *
+ * @param uri the URI to process
+ * @return the result, may be {@code null} if the input is {@code null}
+ */
+ protected String resolve(String uri) {
+ if (uri == null) {
+ return uri;
+ }
+
+ return uri.replace("@@port@@",
Integer.toString(this.serverPort));
+ }
+
+ public static void testBody(final AssertionClause clause, final
Consumer<DataValue> valueConsumer) {
+ testBody(clause, DataValue.class, valueConsumer);
+ }
+
+ public static <T> void testBody(final AssertionClause clause, final
Class<T> bodyClass,
+ final Consumer<T> valueConsumer) {
+ clause.predicate(exchange -> {
+ final T body = exchange.getIn().getBody(bodyClass);
+ valueConsumer.accept(body);
+ return true;
+ });
+ }
+
+ public static Consumer<DataValue> assertGoodValue(final Object
expectedValue) {
+ return value -> {
+ assertNotNull(value);
+ assertEquals(expectedValue,
value.getValue().getValue());
+ assertTrue(value.getStatusCode().isGood());
+ assertFalse(value.getStatusCode().isBad());
+ };
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ final CamelContext context = super.createCamelContext();
+ configureContext(context);
+ return context;
+ }
+
+ protected void configureContext(final CamelContext context) throws
Exception {
+ if (isAddServer()) {
+ final MiloServerComponent server =
context.getComponent("milo-server", MiloServerComponent.class);
+ configureMiloServer(server);
+ }
+ }
+
+ protected void configureMiloServer(final MiloServerComponent server)
throws Exception {
+ server.setBindAddresses("localhost");
+ server.setPort(this.serverPort);
+ server.setUserAuthenticationCredentials("foo:bar,foo2:bar2");
+ server.setUsernameSecurityPolicyUri(SecurityPolicy.None);
+ server.setSecurityPoliciesById("None");
+ }
+
+ /**
+ * Create a default key store for testing
+ *
+ * @return always returns a key store
+ */
+ protected KeyStoreLoader.Result loadDefaultTestKey() {
+ try {
+
+ final KeyStoreLoader loader = new KeyStoreLoader();
+ loader.setUrl("file:src/test/resources/keystore");
+ loader.setKeyStorePassword("testtest");
+
+ loader.setKeyPassword("test");
+ return loader.load();
+ } catch (final GeneralSecurityException | IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ }
+
+ /**
+ * Return true, if java version (defined by method
getRequiredJavaVersion()) is
+ * satisfied. Works for java versions 9+
+ */
+ boolean isJavaVersionSatisfied(int requiredVersion) {
+ String version = System.getProperty("java.version");
+ if (!version.startsWith("1.")) {
+ int dot = version.indexOf('.');
+ if (dot != -1) {
+ version = version.substring(0, dot);
+ }
+ if (version.equalsIgnoreCase("16-ea")) {
+ return true;
+ } else if (Integer.parseInt(version) >=
requiredVersion) {
+ return true;
+ }
+ }
+ return false;
+ }
}
diff --git
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
index 2ec89fa..e6cc956 100644
---
a/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
+++
b/core/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
@@ -122,6 +122,10 @@ public class XPathTransformTest extends ContextTestSupport
{
version = version.substring(0, dot);
}
}
- return Integer.parseInt(version);
+ if (version.equalsIgnoreCase("16-ea")) {
+ return 16;
+ } else {
+ return Integer.parseInt(version);
+ }
}
}
