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 2012/05/24 14:15:49 UTC
svn commit: r1342218 - in /camel/trunk/tests/camel-itest-osgi/src/test:
java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java
resources/META-INF/persistence.xml
Author: davsclaus
Date: Thu May 24 12:15:48 2012
New Revision: 1342218
URL: http://svn.apache.org/viewvc?rev=1342218&view=rev
Log:
Polishing tests
Added:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java
- copied, changed from r1342197, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
camel/trunk/tests/camel-itest-osgi/src/test/resources/META-INF/persistence.xml
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java?rev=1342218&r1=1342217&r2=1342218&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java Thu May 24 12:15:48 2012
@@ -16,12 +16,9 @@
*/
package org.apache.camel.itest.osgi.blueprint;
-import java.lang.reflect.Method;
-
import org.apache.camel.CamelContext;
import org.apache.camel.builder.DeadLetterChannelBuilder;
import org.apache.camel.model.RouteDefinition;
-import org.apache.camel.util.jsse.SSLContextParameters;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -42,17 +39,6 @@ import static org.ops4j.pax.swissbox.tin
public class CamelBlueprint2Test extends OSGiBlueprintTestSupport {
@Test
- public void testEndpointInjection() throws Exception {
- getInstalledBundle("CamelBlueprintTestBundle10").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle10)", 10000);
- Object producer = ctn.getComponentInstance("producer");
- assertNotNull(producer);
- assertEquals(TestProducer.class.getName(), producer.getClass().getName());
- Method mth = producer.getClass().getMethod("getTestEndpoint");
- assertNotNull(mth.invoke(producer));
- }
-
- @Test
public void testRouteContext() throws Exception {
getInstalledBundle("CamelBlueprintTestBundle11").start();
CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle11)", 10000);
@@ -90,41 +76,6 @@ public class CamelBlueprint2Test extends
assertEquals(1, ctx.getRoutes().size());
assertSame(ctn.getComponentInstance("mycomp"), ctx.getComponent("mycomp"));
}
-
- @Test
- public void testJsseUtilNamespace() throws Exception {
- getInstalledBundle("CamelBlueprintTestBundle18").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle18)", 10000);
-
- SSLContextParameters scp = (SSLContextParameters) ctn.getComponentInstance("sslContextParameters");
-
- assertEquals("TLS", scp.getSecureSocketProtocol());
-
- assertNotNull(scp.getKeyManagers());
- assertEquals("changeit", scp.getKeyManagers().getKeyPassword());
- assertNull(scp.getKeyManagers().getProvider());
- assertNotNull(scp.getKeyManagers().getKeyStore());
- assertNull(scp.getKeyManagers().getKeyStore().getType());
-
- assertNotNull(scp.getTrustManagers());
- assertNull(scp.getTrustManagers().getProvider());
- assertNotNull(scp.getTrustManagers().getKeyStore());
- assertNull(scp.getTrustManagers().getKeyStore().getType());
-
- assertNull(scp.getSecureRandom());
-
- assertNull(scp.getClientParameters());
-
- assertNull(scp.getServerParameters());
-
- assertEquals("test", scp.getCamelContext().getName());
-
- assertNotNull(scp.getCamelContext());
- assertNotNull(scp.getKeyManagers().getCamelContext());
- assertNotNull(scp.getKeyManagers().getKeyStore().getCamelContext());
- assertNotNull(scp.getTrustManagers().getCamelContext());
- assertNotNull(scp.getTrustManagers().getKeyStore().getCamelContext());
- }
@Configuration
public static Option[] configure() throws Exception {
@@ -133,13 +84,6 @@ public class CamelBlueprint2Test extends
getDefaultCamelKarafOptions(),
bundle(newBundle()
- .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-10.xml"))
- .add(TestProducer.class)
- .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle10")
- .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
- .build()).noStart(),
-
- bundle(newBundle()
.add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-11.xml"))
.set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle11")
.set(Constants.DYNAMICIMPORT_PACKAGE, "*")
@@ -164,15 +108,7 @@ public class CamelBlueprint2Test extends
.set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle15")
.set(Constants.DYNAMICIMPORT_PACKAGE, "*")
.build()).noStart(),
-
- bundle(newBundle()
- .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-18.xml"))
- .add(JsseUtilTester.class)
- .add("localhost.ks", OSGiBlueprintTestSupport.class.getResourceAsStream("/org/apache/camel/itest/osgi/util/jsse/localhost.ks"))
- .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle18")
- .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
- .build()).noStart(),
-
+
// using the features to install the camel components
scanFeatures(getCamelKarafFeatureUrl(),
"camel-blueprint", "camel-test", "camel-mail", "camel-jaxb", "camel-jms"));
Copied: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java (from r1342197, camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java)
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java?p2=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java&p1=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java&r1=1342197&r2=1342218&rev=1342218&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java Thu May 24 12:15:48 2012
@@ -18,9 +18,6 @@ package org.apache.camel.itest.osgi.blue
import java.lang.reflect.Method;
-import org.apache.camel.CamelContext;
-import org.apache.camel.builder.DeadLetterChannelBuilder;
-import org.apache.camel.model.RouteDefinition;
import org.apache.camel.util.jsse.SSLContextParameters;
import org.junit.Ignore;
import org.junit.Test;
@@ -39,7 +36,8 @@ import static org.ops4j.pax.swissbox.tin
* @version
*/
@RunWith(JUnit4TestRunner.class)
-public class CamelBlueprint2Test extends OSGiBlueprintTestSupport {
+@Ignore("Fix me")
+public class CamelBlueprint8Test extends OSGiBlueprintTestSupport {
@Test
public void testEndpointInjection() throws Exception {
@@ -53,45 +51,6 @@ public class CamelBlueprint2Test extends
}
@Test
- public void testRouteContext() throws Exception {
- getInstalledBundle("CamelBlueprintTestBundle11").start();
- CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle11)", 10000);
- assertEquals(3, ctx.getRoutes().size());
- }
-
- @Test
- @Ignore("TODO: Does not work")
- public void testProxy() throws Exception {
- getInstalledBundle("CamelBlueprintTestBundle12").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle12)", 10000);
- Object proxy = ctn.getComponentInstance("myProxySender");
- assertNotNull(proxy);
- assertEquals(1, proxy.getClass().getInterfaces().length);
- assertEquals(TestProxySender.class.getName(), proxy.getClass().getInterfaces()[0].getName());
- }
-
- @SuppressWarnings("deprecation")
- @Test
- public void testErrorHandler() throws Exception {
- getInstalledBundle("CamelBlueprintTestBundle14").start();
- CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle14)", 10000);
- assertEquals(1, ctx.getRoutes().size());
- RouteDefinition rd = ctx.getRouteDefinitions().get(0);
- assertNotNull(rd.getErrorHandlerRef());
- Object eh = ctx.getRegistry().lookup(rd.getErrorHandlerRef());
- assertEquals(DeadLetterChannelBuilder.class.getName(), eh.getClass().getName());
- }
-
- @Test
- public void testRouteWithNonStdComponentFromBlueprint() throws Exception {
- getInstalledBundle("CamelBlueprintTestBundle15").start();
- BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle15)", 10000);
- CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle15)", 10000);
- assertEquals(1, ctx.getRoutes().size());
- assertSame(ctn.getComponentInstance("mycomp"), ctx.getComponent("mycomp"));
- }
-
- @Test
public void testJsseUtilNamespace() throws Exception {
getInstalledBundle("CamelBlueprintTestBundle18").start();
BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle18)", 10000);
@@ -139,43 +98,18 @@ public class CamelBlueprint2Test extends
.set(Constants.DYNAMICIMPORT_PACKAGE, "*")
.build()).noStart(),
- bundle(newBundle()
- .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-11.xml"))
- .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle11")
- .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
- .build()).noStart(),
-
- bundle(newBundle()
- .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-12.xml"))
- .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle12")
- .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
- .build()).noStart(),
bundle(newBundle()
- .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-14.xml"))
- .add(TestProxySender.class)
- .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle14")
- .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
- .build()).noStart(),
-
- bundle(newBundle()
- .add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-15.xml"))
- .add(TestProxySender.class)
- .set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle15")
- .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
- .build()).noStart(),
-
- bundle(newBundle()
.add("OSGI-INF/blueprint/test.xml", OSGiBlueprintTestSupport.class.getResource("blueprint-18.xml"))
.add(JsseUtilTester.class)
.add("localhost.ks", OSGiBlueprintTestSupport.class.getResourceAsStream("/org/apache/camel/itest/osgi/util/jsse/localhost.ks"))
.set(Constants.BUNDLE_SYMBOLICNAME, "CamelBlueprintTestBundle18")
.set(Constants.DYNAMICIMPORT_PACKAGE, "*")
.build()).noStart(),
-
+
// using the features to install the camel components
scanFeatures(getCamelKarafFeatureUrl(),
- "camel-blueprint", "camel-test", "camel-mail", "camel-jaxb", "camel-jms"));
+ "camel-blueprint", "camel-test"));
// for remote debugging
// vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5008"));
Modified: camel/trunk/tests/camel-itest-osgi/src/test/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/META-INF/persistence.xml?rev=1342218&r1=1342217&r2=1342218&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/resources/META-INF/persistence.xml (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/resources/META-INF/persistence.xml Thu May 24 12:15:48 2012
@@ -37,7 +37,7 @@
<property name="openjpa.ConnectionURL" value="jdbc:derby:target/derby;create=true"/>
<property name="openjpa.ConnectionDriverName" value="org.apache.derby.jdbc.EmbeddedDriver"/>
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema"/>
- <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO, SQL=TRACE"/>
+ <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO, SQL=INFO"/>
</properties>
</persistence-unit>
</persistence>