You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/01/12 12:55:37 UTC
svn commit: r1058095 - in /camel/trunk/tests: camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/ camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/

Author: davsclaus
Date: Wed Jan 12 11:55:36 2011
New Revision: 1058095

URL: http://svn.apache.org/viewvc?rev=1058095&view=rev
Log:
Upgraded to karaf 2.1.3 and added tests for new features.

Added:
    camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java
      - copied, changed from r1058082, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRssTest.java
Removed:
    camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWsTest.java
Modified:
    camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
    camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java
    camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java

Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java?rev=1058095&r1=1058094&r2=1058095&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java Wed Jan 12 11:55:36 2011
@@ -143,9 +143,12 @@ public abstract class AbstractFeatureTes
     }
     
     public static UrlReference getKarafFeatureUrl() {
+        String karafVersion = "2.1.3";
+        System.out.println("*** The karaf version is " + karafVersion + " ***");
+
         String type = "xml/features";
         return mavenBundle().groupId("org.apache.karaf").
-            artifactId("apache-karaf").version("2.1.0").type(type);
+            artifactId("apache-karaf").version(karafVersion).type(type);
     }
 
     public static Option[] configure(String feature) {

Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java?rev=1058095&r1=1058094&r2=1058095&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJibxTest.java Wed Jan 12 11:55:36 2011
@@ -18,7 +18,6 @@ package org.apache.camel.itest.karaf;
 
 import org.apache.camel.model.DataFormatDefinition;
 import org.apache.camel.model.dataformat.JibxDataFormat;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
@@ -26,7 +25,6 @@ import org.ops4j.pax.exam.junit.Configur
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
 @RunWith(JUnit4TestRunner.class)
-@Ignore("A feature is missing")
 public class CamelJibxTest extends AbstractFeatureTest {
 
     public static final String COMPONENT = extractName(CamelJibxTest.class);

Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java?rev=1058095&r1=1058094&r2=1058095&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java Wed Jan 12 11:55:36 2011
@@ -24,7 +24,6 @@ import org.ops4j.pax.exam.junit.Configur
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
 @RunWith(JUnit4TestRunner.class)
-@Ignore("Fails with some javax.xml.stream issue")
 public class CamelSpringWebServiceTest extends AbstractFeatureTest {
 
     public static final String COMPONENT = "spring-ws";
@@ -36,7 +35,7 @@ public class CamelSpringWebServiceTest e
 
     @Configuration
     public static Option[] configure() {
-        return configure(COMPONENT);
+        return configure(COMPONENT, false, true);
     }
 
 }
\ No newline at end of file

Copied: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java (from r1058082, camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRssTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java?p2=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java&p1=camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRssTest.java&r1=1058082&r2=1058095&rev=1058095&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelRssTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSyslogTest.java Wed Jan 12 11:55:36 2011
@@ -23,9 +23,9 @@ import org.ops4j.pax.exam.junit.Configur
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
 @RunWith(JUnit4TestRunner.class)
-public class CamelRssTest extends AbstractFeatureTest {
+public class CamelSyslogTest extends AbstractFeatureTest {
 
-    public static final String COMPONENT = extractName(CamelRssTest.class);
+    public static final String COMPONENT = extractName(CamelSyslogTest.class);
 
     @Test
     public void test() throws Exception {

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java?rev=1058095&r1=1058094&r2=1058095&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/OSGiIntegrationTestSupport.java Wed Jan 12 11:55:36 2011
@@ -82,7 +82,7 @@ public class OSGiIntegrationTestSupport 
     }
     
     public static UrlReference getKarafFeatureUrl() {
-        String karafVersion = "2.1.0";
+        String karafVersion = "2.1.3";
         System.out.println("*** The karaf version is " + karafVersion + " ***");
 
         String type = "xml/features";