camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [4/4] camel git commit: CAMEL-10987: Move DuplicateNamespacePrefixIssueTest from camel-itest-karaf to camel-itest-osgi
Date Tue, 14 Mar 2017 08:49:37 GMT
CAMEL-10987: Move DuplicateNamespacePrefixIssueTest from camel-itest-karaf to camel-itest-osgi


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

Branch: refs/heads/master
Commit: 44451ab4f095ece4bf94ef8df09a12dd65d9bcb1
Parents: 8857851
Author: Tadayoshi Sato <sato.tadayoshi@gmail.com>
Authored: Tue Mar 14 14:33:00 2017 +0900
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue Mar 14 09:49:22 2017 +0100

----------------------------------------------------------------------
 tests/camel-itest-karaf/run-tests.sh            |  2 +-
 .../DuplicateNamespacePrefixIssueTest.java      | 70 ------------------
 tests/camel-itest-osgi/pom.xml                  |  5 ++
 .../DuplicateNamespacePrefixIssueTest.java      | 77 ++++++++++++++++++++
 4 files changed, 83 insertions(+), 71 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/44451ab4/tests/camel-itest-karaf/run-tests.sh
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/run-tests.sh b/tests/camel-itest-karaf/run-tests.sh
index 25f1145..471ac08 100755
--- a/tests/camel-itest-karaf/run-tests.sh
+++ b/tests/camel-itest-karaf/run-tests.sh
@@ -49,7 +49,7 @@ do
     fi 
   fi
 
-  if [ $found -eq 1 ] && [ $testname != "AbstractFeatureTest" ]
+  if [ $found -eq 1 ] && [ $testname != "BaseKarafTest" ]
   then
     echo "*******************************************************************"
     echo "Running test $testname"

http://git-wip-us.apache.org/repos/asf/camel/blob/44451ab4/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/issues/DuplicateNamespacePrefixIssueTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/issues/DuplicateNamespacePrefixIssueTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/issues/DuplicateNamespacePrefixIssueTest.java
deleted file mode 100644
index 0e42bf5..0000000
--- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/issues/DuplicateNamespacePrefixIssueTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.itest.karaf.issues;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.blueprint.BlueprintCamelContext;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.itest.karaf.BaseKarafTest;
-import org.apache.camel.model.ModelHelper;
-import org.apache.camel.model.RoutesDefinition;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.junit.PaxExam;
-
-/**
- * CAMEL-10817: dumpModelAsXml can return invalid XML namespace xmlns:xmlns
- */
-
-@RunWith(PaxExam.class)
-public class DuplicateNamespacePrefixIssueTest extends BaseKarafTest {
-
-    @Test
-    public void testRoutesNamespacePrefixesNotDuplicated() throws Exception {
-        CamelContext context = new BlueprintCamelContext(bundleContext, blueprintContainer);
-        context.addRoutes(new RouteBuilder() {
-            @Override
-            public void configure() throws Exception {
-                from("direct:foo").id("foo")
-                    .choice()
-                        .when(xpath("foo:foo/foo:foo = 'foo'"))
-                            .log("Matched foo")
-                        .when(xpath("foo:foo/foo:bar = 'bar'"))
-                            .log("Matched bar")
-                        .when(xpath("foo:foo/foo:cheese = 'cheese'"))
-                            .log("Matched cheese");
-            }
-        });
-
-        // Dump the model XML
-        String originalModelXML = ModelHelper.dumpModelAsXml(context, context.getRouteDefinition("foo"));
-
-        // Reload routes from dumped XML
-        InputStream stream = new ByteArrayInputStream(originalModelXML.getBytes("UTF-8"));
-        RoutesDefinition routesDefinition = ModelHelper.loadRoutesDefinition(context, stream);
-
-        // Verify namespaces are as we expect
-        String modifiedModelXML = ModelHelper.dumpModelAsXml(context, routesDefinition);
-        String modifiedRoutesElementXML = modifiedModelXML.split("\n")[1];
-        String expectedRoutesElementXML = "<routes xmlns=\"http://camel.apache.org/schema/spring\">";
-        Assert.assertEquals(expectedRoutesElementXML, modifiedRoutesElementXML);
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/44451ab4/tests/camel-itest-osgi/pom.xml
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index 48a40fb..8f4eda3 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -38,6 +38,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-blueprint</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-jackson</artifactId>
       <scope>test</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/44451ab4/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/DuplicateNamespacePrefixIssueTest.java
----------------------------------------------------------------------
diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/DuplicateNamespacePrefixIssueTest.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/DuplicateNamespacePrefixIssueTest.java
new file mode 100644
index 0000000..3f5488a
--- /dev/null
+++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/DuplicateNamespacePrefixIssueTest.java
@@ -0,0 +1,77 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.itest;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.blueprint.BlueprintCamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.ModelHelper;
+import org.apache.camel.model.RoutesDefinition;
+import org.apache.camel.test.karaf.AbstractFeatureTest;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+/**
+ * CAMEL-10817: dumpModelAsXml can return invalid XML namespace xmlns:xmlns
+ */
+
+@RunWith(PaxExam.class)
+public class DuplicateNamespacePrefixIssueTest extends AbstractFeatureTest {
+
+    @Test
+    public void testRoutesNamespacePrefixesNotDuplicated() throws Exception {
+        CamelContext context = new BlueprintCamelContext(bundleContext, blueprintContainer);
+        context.addRoutes(new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:foo").id("foo")
+                    .choice()
+                        .when(xpath("foo:foo/foo:foo = 'foo'"))
+                            .log("Matched foo")
+                        .when(xpath("foo:foo/foo:bar = 'bar'"))
+                            .log("Matched bar")
+                        .when(xpath("foo:foo/foo:cheese = 'cheese'"))
+                            .log("Matched cheese");
+            }
+        });
+
+        // Dump the model XML
+        String originalModelXML = ModelHelper.dumpModelAsXml(context, context.getRouteDefinition("foo"));
+
+        // Reload routes from dumped XML
+        InputStream stream = new ByteArrayInputStream(originalModelXML.getBytes("UTF-8"));
+        RoutesDefinition routesDefinition = ModelHelper.loadRoutesDefinition(context, stream);
+
+        // Verify namespaces are as we expect
+        String modifiedModelXML = ModelHelper.dumpModelAsXml(context, routesDefinition);
+        String modifiedRoutesElementXML = modifiedModelXML.split("\n")[1];
+        String expectedRoutesElementXML = "<routes xmlns=\"http://camel.apache.org/schema/spring\">";
+        Assert.assertEquals(expectedRoutesElementXML, modifiedRoutesElementXML);
+    }
+
+    @Configuration
+    public Option[] configure() {
+        return AbstractFeatureTest.configure();
+    }
+}


Mime
View raw message