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 15:42:59 UTC
svn commit: r1058159 - in
/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf:
CamelJasyptTest.java CamelJdbcAggregatorTest.java CamelJibxTest.java
CamelSpringJavaconfigTest.java CamelSpringWebServiceTest.java
Author: davsclaus
Date: Wed Jan 12 14:42:58 2011
New Revision: 1058159
URL: http://svn.apache.org/viewvc?rev=1058159&view=rev
Log:
Fixed osgi tests.
Modified:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.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/CamelSpringJavaconfigTest.java
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringWebServiceTest.java
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java?rev=1058159&r1=1058158&r2=1058159&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJasyptTest.java Wed Jan 12 14:42:58 2011
@@ -16,6 +16,7 @@
*/
package org.apache.camel.itest.karaf;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -23,13 +24,14 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
+@Ignore("Does not work on JDK 1.5")
public class CamelJasyptTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelJasyptTest.class);
@Test
public void test() throws Exception {
- // TODO: how to actually test ?
+ // not a component
}
@Configuration
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java?rev=1058159&r1=1058158&r2=1058159&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelJdbcAggregatorTest.java Wed Jan 12 14:42:58 2011
@@ -29,7 +29,7 @@ public class CamelJdbcAggregatorTest ext
@Test
public void test() throws Exception {
- testComponent(COMPONENT);
+ // its not a component
}
@Configuration
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=1058159&r1=1058158&r2=1058159&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 14:42:58 2011
@@ -18,6 +18,7 @@ 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;
@@ -25,6 +26,7 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
+@Ignore("Disabled unit jibx bundles is in central maven repo")
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/CamelSpringJavaconfigTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java?rev=1058159&r1=1058158&r2=1058159&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelSpringJavaconfigTest.java Wed Jan 12 14:42:58 2011
@@ -31,7 +31,7 @@ public class CamelSpringJavaconfigTest e
@Test
public void test() throws Exception {
- // TODO: how to test that ?
+ // TODO: spring javaconfig is being removed in Camel 3.0
}
@Configuration
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=1058159&r1=1058158&r2=1058159&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 14:42:58 2011
@@ -24,6 +24,7 @@ import org.ops4j.pax.exam.junit.Configur
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
@RunWith(JUnit4TestRunner.class)
+@Ignore("Does not work")
public class CamelSpringWebServiceTest extends AbstractFeatureTest {
public static final String COMPONENT = "spring-ws";
@@ -35,7 +36,7 @@ public class CamelSpringWebServiceTest e
@Configuration
public static Option[] configure() {
- return configure(COMPONENT, false, true);
+ return configure(COMPONENT);
}
}
\ No newline at end of file