Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 1689 invoked from network); 16 Jan 2011 14:49:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 16 Jan 2011 14:49:20 -0000 Received: (qmail 73402 invoked by uid 500); 16 Jan 2011 14:49:20 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 73348 invoked by uid 500); 16 Jan 2011 14:49:18 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 73341 invoked by uid 99); 16 Jan 2011 14:49:18 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Jan 2011 14:49:18 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 16 Jan 2011 14:49:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 20D48238896F; Sun, 16 Jan 2011 14:48:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1059577 - in /camel/trunk: diff_1056749_1056745.txt tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java Date: Sun, 16 Jan 2011 14:48:48 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110116144848.20D48238896F@eris.apache.org> Author: davsclaus Date: Sun Jan 16 14:48:47 2011 New Revision: 1059577 URL: http://svn.apache.org/viewvc?rev=1059577&view=rev Log: Fixed blueprint test. Removed diff file from root. Removed: camel/trunk/diff_1056749_1056745.txt Modified: 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/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=1059577&r1=1059576&r2=1059577&view=diff ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java (original) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/CamelBlueprintTest.java Sun Jan 16 14:48:47 2011 @@ -55,8 +55,8 @@ public class CamelBlueprintTest extends } catch (Exception e) { } getInstalledBundle("CamelBlueprintTestBundle1").start(); - getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle1)", 5000); - getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle1)", 5000); + getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle1)", 10000); + getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle1)", 10000); } @Test @@ -74,8 +74,8 @@ public class CamelBlueprintTest extends } 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); + getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle2)", 10000); + getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle2)", 10000); } @Test @@ -93,31 +93,31 @@ public class CamelBlueprintTest extends } 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); + getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle3)", 10000); + getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle3)", 10000); } @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); + getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle4)", 10000); + CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle4)", 10000); 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); + getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle5)", 10000); + CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle5)", 10000); 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); + BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle6)", 10000); + CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle6)", 10000); assertEquals(1, ctx.getRoutes().size()); assertSame(ctn.getComponentInstance("seda"), ctx.getComponent("seda")); } @@ -125,8 +125,8 @@ public class CamelBlueprintTest extends @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); + BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle7)", 10000); + CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle7)", 10000); assertEquals(1, ctx.getRoutes().size()); assertEquals(1, ctx.getInterceptStrategies().size()); assertEquals(TestInterceptStrategy.class.getName(), ctx.getInterceptStrategies().get(0).getClass().getName()); @@ -135,8 +135,8 @@ public class CamelBlueprintTest extends @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); + BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle8)", 10000); + CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle8)", 10000); assertEquals(1, ctx.getRoutes().size()); assertEquals("direct://start", ctx.getRoutes().get(0).getEndpoint().getEndpointUri()); } @@ -144,16 +144,16 @@ public class CamelBlueprintTest extends @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); + BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle9)", 10000); + CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle9)", 10000); 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); + 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()); @@ -164,8 +164,8 @@ public class CamelBlueprintTest extends @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); + BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle11)", 10000); + CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle11)", 10000); assertEquals(3, ctx.getRoutes().size()); } @@ -173,8 +173,8 @@ public class CamelBlueprintTest extends @Ignore("TODO: Does not work") 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); + BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle12)", 10000); + CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle12)", 10000); Object proxy = ctn.getComponentInstance("myProxySender"); assertNotNull(proxy); assertEquals(1, proxy.getClass().getInterfaces().length); @@ -184,8 +184,8 @@ public class CamelBlueprintTest extends @Test public void testErrorHandler() throws Exception { getInstalledBundle("CamelBlueprintTestBundle14").start(); - BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle14)", 5000); - CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle14)", 5000); + BlueprintContainer ctn = getOsgiService(BlueprintContainer.class, "(osgi.blueprint.container.symbolicname=CamelBlueprintTestBundle14)", 10000); + CamelContext ctx = getOsgiService(CamelContext.class, "(camel.context.symbolicname=CamelBlueprintTestBundle14)", 10000); assertEquals(1, ctx.getRoutes().size()); RouteDefinition rd = ctx.getRouteDefinitions().get(0); assertNotNull(rd.getErrorHandlerRef());