camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/2] git commit: Fixed test
Date Mon, 24 Feb 2014 17:05:54 GMT
Repository: camel
Updated Branches:
  refs/heads/camel-2.12.x 28d331cb7 -> f491d9c1a
  refs/heads/master 8ace0ebc0 -> e42041684


Fixed test


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e4204168
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e4204168
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e4204168

Branch: refs/heads/master
Commit: e42041684fb8bca2edbd39baeaff6da3f1dc0b6d
Parents: 8ace0eb
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Mon Feb 24 17:53:10 2014 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Mon Feb 24 17:54:59 2014 +0100

----------------------------------------------------------------------
 components/camel-blueprint/pom.xml                    |  5 +++++
 .../org/apache/camel/blueprint/BlueprintJaxbTest.java | 14 +++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/e4204168/components/camel-blueprint/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index decc463..9aeec54 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -86,6 +86,11 @@
 
         <!-- for testing -->
         <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>

http://git-wip-us.apache.org/repos/asf/camel/blob/e4204168/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbTest.java
----------------------------------------------------------------------
diff --git a/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbTest.java
b/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbTest.java
index 9ea5abc..2c49753 100644
--- a/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbTest.java
+++ b/components/camel-blueprint/src/test/java/org/apache/camel/blueprint/BlueprintJaxbTest.java
@@ -27,18 +27,18 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 import org.apache.camel.blueprint.handler.CamelNamespaceHandler;
-
+import org.apache.camel.test.junit4.TestSupport;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-
-public class BlueprintJaxbTest {
+public class BlueprintJaxbTest extends TestSupport {
 
     @Test
     public void test() throws Exception {
+        if (isJava16() && isJavaVendor("ibm")) {
+            // does not test well on java6 with ibm
+            return;
+        }
+
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         dbf.setNamespaceAware(true);
         DocumentBuilder db = dbf.newDocumentBuilder();


Mime
View raw message