Author: davsclaus
Date: Thu May 24 14:16:00 2012
New Revision: 1342280
URL: http://svn.apache.org/viewvc?rev=1342280&view=rev
Log:
Polishing tests
Added:
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java
- copied unchanged from r1342218,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint8Test.java
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/resources/META-INF/persistence.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1342218
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java?rev=1342280&r1=1342279&r2=1342280&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
(original)
+++
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprint2Test.java
Thu May 24 14:16:00 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,18 +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);
- CamelContext ctx = getOsgiService(CamelContext.class,
"(camel.context.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();
BlueprintContainer ctn = getOsgiService(BlueprintContainer.class,
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle11)", 10000);
@@ -93,41 +78,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 {
@@ -136,13 +86,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, "*")
@@ -167,15 +110,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"));
Modified:
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/resources/META-INF/persistence.xml?rev=1342280&r1=1342279&r2=1342280&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/resources/META-INF/persistence.xml
(original)
+++
camel/branches/camel-2.9.x/tests/camel-itest-osgi/src/test/resources/META-INF/persistence.xml
Thu May 24 14:16:00 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>
