[camel] branch master updated: Fix some unit test on JDK >= 12

[gn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 799a6ee  Fix some unit test on JDK >= 12
799a6ee is described below

commit 799a6eefd2c7393508c7bbbea45778dbcbd53c60
Author: gnodet <gn...@gmail.com>
AuthorDate: Fri Mar 20 08:37:32 2020 +0100

    Fix some unit test on JDK >= 12
---
 .../apache/camel/builder/xml/XPathTransformTest.java   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

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 126e07c..045699e 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
@@ -19,6 +19,8 @@ package org.apache.camel.builder.xml;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 
+import org.hamcrest.Matchers;
+import org.junit.Assume;
 import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
@@ -55,6 +57,8 @@ public class XPathTransformTest extends ContextTestSupport {
 
     @Test
     public void testXPathNamespaceLoggingEnabledJavaDSL() throws Exception {
+        Assume.assumeThat("Reflection on java.lang.Field has been disabled in JDK 12", getJavaVersion(), Matchers.lessThanOrEqualTo(11));
+
         Logger l = mock(Logger.class);
 
         when(l.isInfoEnabled()).thenReturn(true);
@@ -80,6 +84,8 @@ public class XPathTransformTest extends ContextTestSupport {
 
     @Test
     public void testXPathNamespaceLoggingDisabledJavaDSL() throws Exception {
+        Assume.assumeThat("Reflection on java.lang.Field has been disabled in JDK 12", getJavaVersion(), Matchers.lessThanOrEqualTo(11));
+
         Logger l = mock(Logger.class);
 
         when(l.isInfoEnabled()).thenReturn(true);
@@ -103,4 +109,16 @@ public class XPathTransformTest extends ContextTestSupport {
         verify(l, never()).info(argThat(containsString("Namespaces discovered in message")), any(Object.class));
     }
 
+    private static int getJavaVersion() {
+        String version = System.getProperty("java.version");
+        if (version.startsWith("1.")) {
+            version = version.substring(2, 3);
+        } else {
+            int dot = version.indexOf(".");
+            if (dot != -1) {
+                version = version.substring(0, dot);
+            }
+        }
+        return Integer.parseInt(version);
+    }
 }