Author: davsclaus
Date: Fri Dec 10 07:03:12 2010
New Revision: 1044219

URL: http://svn.apache.org/viewvc?rev=1044219&view=rev
Log:
Ensure OSGi blueprint tests is run as it must end with Test in the classname.

Added:
    
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java
Modified:
    
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintTestSupport.java
    
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/TestInterceptStrategy.java

Added: 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java?rev=1044219&view=auto
==============================================================================
--- 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java
 (added)
+++ 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java
 Fri Dec 10 07:03:12 2010
@@ -0,0 +1,284 @@
+/**
+ * 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.osgi.blueprint;
+
+import java.lang.reflect.Method;
+
+import org.apache.camel.CamelContext;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.osgi.framework.Constants;
+import org.osgi.service.blueprint.container.BlueprintContainer;
+
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.wrappedBundle;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.profile;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
+import static 
org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
+import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
+
+/**
+ * @version $Revision$
+ */
+...@runwith(JUnit4TestRunner.class)
+public class CamelBlueprintTest extends OSGiBlueprintTestSupport {
+
+    @Test
+    public void testRouteWithAllComponents() throws Exception {
+        try {
+            getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle1)", 1000);
+            fail("The blueprint container should not be available");
+        } catch (Exception e) {
+        }
+        getInstalledBundle("CamelBlueprintTestBundle1").start();
+        getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle1)", 5000);
+        getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle1)", 5000);
+    }
+
+    @Test
+    public void testRouteWithMissingComponent() throws Exception {
+        getInstalledBundle("org.apache.camel.camel-mail").stop();
+        try {
+            getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle2)", 1000);
+            fail("The blueprint container should not be available");
+        } catch (Exception e) {
+        }
+        getInstalledBundle("CamelBlueprintTestBundle2").start();
+        try {
+            getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle2)", 1000);
+            fail("The blueprint container should not be available");
+        } catch (Exception e) {
+        }
+        getInstalledBundle("org.apache.camel.camel-mail").start();
+        getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle2)", 5000);
+        getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle2)", 5000);
+    }
+
+    @Test
+    public void testRouteWithMissingDataFormat() throws Exception {
+        getInstalledBundle("org.apache.camel.camel-jaxb").stop();
+        try {
+            getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle3)", 1000);
+            fail("The blueprint container should not be available");
+        } catch (Exception e) {
+        }
+        getInstalledBundle("CamelBlueprintTestBundle3").start();
+        try {
+            getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle3)", 1000);
+            fail("The blueprint container should not be available");
+        } catch (Exception e) {
+        }
+        getInstalledBundle("org.apache.camel.camel-jaxb").start();
+        getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle3)", 5000);
+        getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle3)", 5000);
+    }
+
+    @Test
+    public void testRouteWithPackage() throws Exception {
+        getInstalledBundle("CamelBlueprintTestBundle4").start();
+        getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle4)", 5000);
+        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle4)", 5000);
+        assertEquals(1, ctx.getRoutes().size());
+    }
+
+    @Test
+    public void testRouteWithPackageScan() throws Exception {
+        getInstalledBundle("CamelBlueprintTestBundle5").start();
+        getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle5)", 5000);
+        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle5)", 5000);
+        assertEquals(1, ctx.getRoutes().size());
+    }
+
+    @Test
+    public void testRouteWithComponentFromBlueprint() throws Exception {
+        getInstalledBundle("CamelBlueprintTestBundle6").start();
+        BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle6)", 5000);
+        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle6)", 5000);
+        assertEquals(1, ctx.getRoutes().size());
+        assertSame(ctn.getComponentInstance("seda"), ctx.getComponent("seda"));
+    }
+
+    @Test
+    public void testRouteWithInterceptStrategy() throws Exception {
+        getInstalledBundle("CamelBlueprintTestBundle7").start();
+        BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle7)", 5000);
+        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle7)", 5000);
+        assertEquals(1, ctx.getRoutes().size());
+        assertEquals(1, ctx.getInterceptStrategies().size());
+        assertEquals(TestInterceptStrategy.class.getName(), 
ctx.getInterceptStrategies().get(0).getClass().getName());
+    }
+
+    @Test
+    public void testComponentProperties() throws Exception {
+        getInstalledBundle("CamelBlueprintTestBundle8").start();
+        BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle8)", 5000);
+        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle8)", 5000);
+        assertEquals(1, ctx.getRoutes().size());
+        assertEquals("direct://start", 
ctx.getRoutes().get(0).getEndpoint().getEndpointUri());
+    }
+
+    @Test
+    public void testRouteBuilderRef() throws Exception {
+        getInstalledBundle("CamelBlueprintTestBundle9").start();
+        BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle9)", 5000);
+        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle9)", 5000);
+        assertEquals(1, ctx.getRoutes().size());
+    }
+
+    @Test
+    public void testEndpointInjection() throws Exception {
+        getInstalledBundle("CamelBlueprintTestBundle10").start();
+        BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle10)", 5000);
+        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle10)", 5000);
+        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)", 5000);
+        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle11)", 5000);
+        assertEquals(3, ctx.getRoutes().size());
+    }
+
+    @Test
+    public void testProxy() throws Exception {
+        getInstalledBundle("CamelBlueprintTestBundle12").start();
+        BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle12)", 5000);
+        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle12)", 5000);
+        Object proxy = ctn.getComponentInstance("myProxySender");
+        assertNotNull(proxy);
+        assertEquals(1, proxy.getClass().getInterfaces().length);
+        assertEquals(TestProxySender.class.getName(), 
proxy.getClass().getInterfaces()[0].getName());
+    }
+
+    @Configuration
+    public static Option[] configure() throws Exception {
+
+        Option[] options = options(
+
+                bundle(newBundle()
+                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-1.xml"))
+                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle1")
+                        .build()).noStart(),
+
+                bundle(newBundle()
+                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-2.xml"))
+                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle2")
+                        .build()).noStart(),
+
+                bundle(newBundle()
+                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-3.xml"))
+                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle3")
+                        .build()).noStart(),
+
+                bundle(newBundle()
+                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-4.xml"))
+                        .add(TestRouteBuilder.class)
+                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle4")
+                        .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
+                        .build()).noStart(),
+
+                bundle(newBundle()
+                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-5.xml"))
+                        .add(TestRouteBuilder.class)
+                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle5")
+                        .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
+                        .build()).noStart(),
+
+                bundle(newBundle()
+                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-6.xml"))
+                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle6")
+                        .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
+                        .build()).noStart(),
+
+                bundle(newBundle()
+                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-7.xml"))
+                        .add(TestInterceptStrategy.class)
+                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle7")
+                        .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
+                        .build()).noStart(),
+
+                bundle(newBundle()
+                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-8.xml"))
+                        
.add("org/apache/camel/component/properties/cheese.properties", 
OSGiBlueprintTestSupport.class.getResource("cheese.properties"))
+                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle8")
+                        .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
+                        .build()).noStart(),
+
+                bundle(newBundle()
+                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-9.xml"))
+                        .add(TestRouteBuilder.class)
+                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle9")
+                        .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
+                        .build()).noStart(),
+
+                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, "*")
+                        .build()).noStart(),
+
+                bundle(newBundle()
+                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-12.xml"))
+                        .add(TestProxySender.class)
+                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle12")
+                        .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
+                        .build()).noStart(),
+
+                // install the spring dm profile
+                profile("spring.dm").version("1.2.0"),
+                // this is how you set the default log level when using pax 
logging (logProfile)
+                
org.ops4j.pax.exam.CoreOptions.systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("TRACE"),
+
+                // install blueprint requirements
+                mavenBundle("org.apache.felix", 
"org.apache.felix.configadmin"),
+                // install tiny bundles
+                mavenBundle("org.ops4j.base", "ops4j-base-store"),
+                wrappedBundle(mavenBundle("org.ops4j.pax.swissbox", 
"pax-swissbox-bnd")),
+                mavenBundle("org.ops4j.pax.swissbox", 
"pax-swissbox-tinybundles"),
+
+                // using the features to install the camel components
+                scanFeatures(getCamelKarafFeatureUrl(),
+                        "camel-core", "camel-blueprint", "camel-test", 
"camel-mail", "camel-jaxb", "camel-jms"),
+
+                workingDirectory("target/paxrunner/"),
+
+                // vmOption("-Xdebug 
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5008"),
+
+                //felix(),
+                equinox());
+
+        return options;
+    }
+
+}

Modified: 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintTestSupport.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintTestSupport.java?rev=1044219&r1=1044218&r2=1044219&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintTestSupport.java
 (original)
+++ 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/OSGiBlueprintTestSupport.java
 Fri Dec 10 07:03:12 2010
@@ -46,258 +46,12 @@ import static org.ops4j.pax.exam.contain
 import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
 import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
 
-...@runwith(JUnit4TestRunner.class)
-public class OSGiBlueprintTestSupport extends AbstractIntegrationTest {
+/**
+ * Base class for OSGi blueprint tests.
+ */
+public abstract class OSGiBlueprintTestSupport extends AbstractIntegrationTest 
{
 
-    @Test
-    public void testRouteWithAllComponents() throws Exception {
-        try {
-            getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle1)", 1000);
-            fail("The blueprint container should not be available");
-        } catch (Exception e) {
-        }
-        getInstalledBundle("CamelBlueprintTestBundle1").start();
-        getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle1)", 5000);
-        getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle1)", 5000);
-    }
-
-    @Test
-    public void testRouteWithMissingComponent() throws Exception {
-        getInstalledBundle("org.apache.camel.camel-mail").stop();
-        try {
-            getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle2)", 1000);
-            fail("The blueprint container should not be available");
-        } catch (Exception e) {
-        }
-        getInstalledBundle("CamelBlueprintTestBundle2").start();
-        try {
-            getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle2)", 1000);
-            fail("The blueprint container should not be available");
-        } catch (Exception e) {
-        }
-        getInstalledBundle("org.apache.camel.camel-mail").start();
-        getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle2)", 5000);
-        getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle2)", 5000);
-    }
-
-    @Test
-    public void testRouteWithMissingDataFormat() throws Exception {
-        getInstalledBundle("org.apache.camel.camel-jaxb").stop();
-        try {
-            getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle3)", 1000);
-            fail("The blueprint container should not be available");
-        } catch (Exception e) {
-        }
-        getInstalledBundle("CamelBlueprintTestBundle3").start();
-        try {
-            getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle3)", 1000);
-            fail("The blueprint container should not be available");
-        } catch (Exception e) {
-        }
-        getInstalledBundle("org.apache.camel.camel-jaxb").start();
-        getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle3)", 5000);
-        getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle3)", 5000);
-    }
-
-    @Test
-    public void testRouteWithPackage() throws Exception {
-        getInstalledBundle("CamelBlueprintTestBundle4").start();
-        getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle4)", 5000);
-        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle4)", 5000);
-        assertEquals(1, ctx.getRoutes().size());
-    }
-
-    @Test
-    public void testRouteWithPackageScan() throws Exception {
-        getInstalledBundle("CamelBlueprintTestBundle5").start();
-        getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle5)", 5000);
-        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle5)", 5000);
-        assertEquals(1, ctx.getRoutes().size());
-    }
-
-    @Test
-    public void testRouteWithComponentFromBlueprint() throws Exception {
-        getInstalledBundle("CamelBlueprintTestBundle6").start();
-        BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle6)", 5000);
-        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle6)", 5000);
-        assertEquals(1, ctx.getRoutes().size());
-        assertSame(ctn.getComponentInstance("seda"), ctx.getComponent("seda"));
-    }
-
-    @Test
-    public void testRouteWithInterceptStrategy() throws Exception {
-        getInstalledBundle("CamelBlueprintTestBundle7").start();
-        BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle7)", 5000);
-        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle7)", 5000);
-        assertEquals(1, ctx.getRoutes().size());
-        assertEquals(1, ctx.getInterceptStrategies().size());
-        assertEquals(TestInterceptStrategy.class.getName(), 
ctx.getInterceptStrategies().get(0).getClass().getName());
-    }
-
-    @Test
-    public void testComponentProperties() throws Exception {
-        getInstalledBundle("CamelBlueprintTestBundle8").start();
-        BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle8)", 5000);
-        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle8)", 5000);
-        assertEquals(1, ctx.getRoutes().size());
-        assertEquals("direct://start", 
ctx.getRoutes().get(0).getEndpoint().getEndpointUri());
-    }
-
-    @Test
-    public void testRouteBuilderRef() throws Exception {
-        getInstalledBundle("CamelBlueprintTestBundle9").start();
-        BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle9)", 5000);
-        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle9)", 5000);
-        assertEquals(1, ctx.getRoutes().size());
-    }
-
-    @Test
-    public void testEndpointInjection() throws Exception {
-        getInstalledBundle("CamelBlueprintTestBundle10").start();
-        BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle10)", 5000);
-        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle10)", 5000);
-        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)", 5000);
-        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle11)", 5000);
-        assertEquals(3, ctx.getRoutes().size());
-    }
-
-    @Test
-    public void testProxy() throws Exception {
-        getInstalledBundle("CamelBlueprintTestBundle12").start();
-        BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, 
"(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle12)", 5000);
-        CamelContext ctx = getOsgiService(CamelContext.class, 
"(camel.context.symbolicname=CamelBlueprintTestBundle12)", 5000);
-        Object proxy = ctn.getComponentInstance("myProxySender");
-        assertNotNull(proxy);
-        assertEquals(1, proxy.getClass().getInterfaces().length);
-        assertEquals(TestProxySender.class.getName(), 
proxy.getClass().getInterfaces()[0].getName());
-    }
-
-    @Before
-    public void setUp() throws Exception {
-    }
-
-    @After
-    public void tearDown() throws Exception {
-    }
-
-    @Configuration
-    public static Option[] configure() throws Exception {
-
-        Option[] options = options(
-
-                bundle(newBundle()
-                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-1.xml"))
-                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle1")
-                        .build()).noStart(),
-
-                bundle(newBundle()
-                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-2.xml"))
-                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle2")
-                        .build()).noStart(),
-
-                bundle(newBundle()
-                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-3.xml"))
-                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle3")
-                        .build()).noStart(),
-
-                bundle(newBundle()
-                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-4.xml"))
-                        .add(TestRouteBuilder.class)
-                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle4")
-                        .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
-                        .build()).noStart(),
-
-                bundle(newBundle()
-                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-5.xml"))
-                        .add(TestRouteBuilder.class)
-                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle5")
-                        .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
-                        .build()).noStart(),
-
-                bundle(newBundle()
-                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-6.xml"))
-                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle6")
-                        .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
-                        .build()).noStart(),
-
-                bundle(newBundle()
-                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-7.xml"))
-                        .add(TestInterceptStrategy.class)
-                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle7")
-                        .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
-                        .build()).noStart(),
-
-                bundle(newBundle()
-                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-8.xml"))
-                        
.add("org/apache/camel/component/properties/cheese.properties", 
OSGiBlueprintTestSupport.class.getResource("cheese.properties"))
-                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle8")
-                        .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
-                        .build()).noStart(),
-
-                bundle(newBundle()
-                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-9.xml"))
-                        .add(TestRouteBuilder.class)
-                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle9")
-                        .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
-                        .build()).noStart(),
-
-                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, "*")
-                        .build()).noStart(),
-
-                bundle(newBundle()
-                        .add("OSGI-INF/blueprint/test.xml", 
OSGiBlueprintTestSupport.class.getResource("blueprint-12.xml"))
-                        .add(TestProxySender.class)
-                        .set(Constants.BUNDLE_SYMBOLICNAME, 
"CamelBlueprintTestBundle12")
-                        .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
-                        .build()).noStart(),
-
-                // install the spring dm profile
-                profile("spring.dm").version("1.2.0"),
-                // this is how you set the default log level when using pax 
logging (logProfile)
-                
org.ops4j.pax.exam.CoreOptions.systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("TRACE"),
-
-                // install blueprint requirements
-                mavenBundle("org.apache.felix", 
"org.apache.felix.configadmin"),
-                // install tiny bundles
-                mavenBundle("org.ops4j.base", "ops4j-base-store"),
-                wrappedBundle(mavenBundle("org.ops4j.pax.swissbox", 
"pax-swissbox-bnd")),
-                mavenBundle("org.ops4j.pax.swissbox", 
"pax-swissbox-tinybundles"),
-
-                // using the features to install the camel components
-                scanFeatures(getCamelKarafFeatureUrl(),
-                        "camel-core", "camel-blueprint", "camel-test", 
"camel-mail", "camel-jaxb", "camel-jms"),
-
-                workingDirectory("target/paxrunner/"),
-
-//                vmOption("-Xdebug 
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5008"),
-
-                //felix(),
-                equinox());
-
-        return options;
-    }
-
-    private static void copy(InputStream input, OutputStream output, boolean 
close) throws IOException {
+    protected static void copy(InputStream input, OutputStream output, boolean 
close) throws IOException {
         try {
             byte[] buf = new byte[8192];
             int bytesRead = input.read(buf);
@@ -313,7 +67,7 @@ public class OSGiBlueprintTestSupport ex
         }
     }
 
-    private static void close(Closeable... closeables) {
+    protected static void close(Closeable... closeables) {
         if (closeables != null) {
             for (Closeable c : closeables) {
                 try {
@@ -324,7 +78,7 @@ public class OSGiBlueprintTestSupport ex
         }
     }
 
-    private static UrlProvisionOption bundle(final InputStream stream) throws 
IOException {
+    protected static UrlProvisionOption bundle(final InputStream stream) 
throws IOException {
         Store<InputStream> store = StoreFactory.defaultStore();
         return new 
UrlProvisionOption(store.getLocation(store.store(stream)).toURL().toExternalForm());
     }

Modified: 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/TestInterceptStrategy.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/TestInterceptStrategy.java?rev=1044219&r1=1044218&r2=1044219&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/TestInterceptStrategy.java
 (original)
+++ 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/TestInterceptStrategy.java
 Fri Dec 10 07:03:12 2010
@@ -24,6 +24,6 @@ import org.apache.camel.spi.InterceptStr
 public class TestInterceptStrategy implements InterceptStrategy {
 
     public Processor wrapProcessorInInterceptors(CamelContext context, 
ProcessorDefinition<?> definition, Processor target, Processor nextTarget) 
throws Exception {
-        return null;  //To change body of implemented methods use File | 
Settings | File Templates.
+        return null;
     }
 }


Reply via email to