Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BC0997739 for ; Tue, 9 Aug 2011 06:56:59 +0000 (UTC) Received: (qmail 45002 invoked by uid 500); 9 Aug 2011 06:56:59 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 44949 invoked by uid 500); 9 Aug 2011 06:56:58 -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 44942 invoked by uid 99); 9 Aug 2011 06:56:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Aug 2011 06:56:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 09 Aug 2011 06:56:55 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0F52423888CE for ; Tue, 9 Aug 2011 06:56:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1155232 - in /camel/trunk/tests/camel-itest-osgi/src/test: java/org/apache/camel/itest/osgi/cxf/ java/org/apache/camel/itest/osgi/cxf/blueprint/ resources/org/apache/camel/itest/osgi/cxf/ resources/org/apache/camel/itest/osgi/cxf/blueprint/ Date: Tue, 09 Aug 2011 06:56:35 -0000 To: commits@camel.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110809065636.0F52423888CE@eris.apache.org> Author: ningjiang Date: Tue Aug 9 06:56:35 2011 New Revision: 1155232 URL: http://svn.apache.org/viewvc?rev=1155232&view=rev Log: CAMEL-4299 Added OSGi integration tests Added: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java (with props) camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java (with props) camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/CxfBeanRouter.xml (with props) camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouter.xml (with props) Added: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java?rev=1155232&view=auto ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java (added) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java Tue Aug 9 06:56:35 2011 @@ -0,0 +1,86 @@ +/** + * 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.cxf; + +import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport; +import org.apache.camel.itest.osgi.cxf.blueprint.CxfRsBlueprintRouterTest; +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.util.EntityUtils; +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.springframework.osgi.context.support.OsgiBundleXmlApplicationContext; + +import static org.ops4j.pax.exam.CoreOptions.provision; +import static org.ops4j.pax.exam.OptionUtils.combine; +import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures; +import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption; +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 CxfBeanSpringRouteTest extends OSGiIntegrationSpringTestSupport { + + @Test + public void testGetCustomer() throws Exception { + HttpGet get = new HttpGet("http://localhost:9000/route/customerservice/customers/123"); + get.addHeader("Accept" , "application/json"); + HttpClient httpclient = new DefaultHttpClient(); + + try { + HttpResponse response = httpclient.execute(get); + assertEquals(200, response.getStatusLine().getStatusCode()); + assertEquals("{\"Customer\":{\"id\":123,\"name\":\"John\"}}", + EntityUtils.toString(response.getEntity())); + } finally { + httpclient.getConnectionManager().shutdown(); + } + } + + @Override + protected OsgiBundleXmlApplicationContext createApplicationContext() { + return new OsgiBundleXmlApplicationContext(new String[]{"org/apache/camel/itest/osgi/cxf/CxfBeanRouter.xml"}); + } + + @Configuration + public static Option[] configure() throws Exception { + Option[] options = combine( + getDefaultCamelKarafOptions(), + + // using the features to install the camel components + scanFeatures(getCamelKarafFeatureUrl(), + "camel-jetty", "camel-http4", "camel-cxf"), + + provision(newBundle() + .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.Customer.class) + .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerService.class) + .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerServiceResource.class) + .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.Order.class) + .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.Product.class) + .build(withBnd()))//, + //vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006") + ); + + return options; + } +} Propchange: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/CxfBeanSpringRouteTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java?rev=1155232&view=auto ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java (added) +++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java Tue Aug 9 06:56:35 2011 @@ -0,0 +1,103 @@ +/** + * 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.cxf.blueprint; + +import org.apache.camel.CamelContext; +import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport; +import org.apache.http.HttpResponse; +import org.apache.http.client.HttpClient; +import org.apache.http.client.methods.HttpGet; +import org.apache.http.impl.client.DefaultHttpClient; +import org.apache.http.util.EntityUtils; +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 static org.ops4j.pax.exam.OptionUtils.combine; +import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures; +import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle; + +@RunWith(JUnit4TestRunner.class) +public class CxfBeanBlueprintRouterTest extends OSGiBlueprintTestSupport { + + protected void doPostSetup() throws Exception { + getInstalledBundle("CxfBeanBlueprintRouterTest").start(); + getOsgiService(CamelContext.class, "(camel.context.symbolicname=CxfBeanBlueprintRouterTest)", 10000); + } + + @Test + public void testGetCustomer() throws Exception { + HttpGet get = new HttpGet("http://localhost:9000/route/customerservice/customers/123"); + get.addHeader("Accept" , "application/json"); + HttpClient httpclient = new DefaultHttpClient(); + + try { + HttpResponse response = httpclient.execute(get); + assertEquals(200, response.getStatusLine().getStatusCode()); + assertEquals("{\"Customer\":{\"id\":123,\"name\":\"John\"}}", + EntityUtils.toString(response.getEntity())); + } finally { + httpclient.getConnectionManager().shutdown(); + } + } + + + @Test + public void testGetCustomerWithQuery() throws Exception { + HttpGet get = new HttpGet("http://localhost:9000/route/customerservice/customers?id=123"); + get.addHeader("Accept" , "application/json"); + HttpClient httpclient = new DefaultHttpClient(); + + try { + HttpResponse response = httpclient.execute(get); + assertEquals(200, response.getStatusLine().getStatusCode()); + assertEquals("{\"Customer\":{\"id\":123,\"name\":\"John\"}}", + EntityUtils.toString(response.getEntity())); + } finally { + httpclient.getConnectionManager().shutdown(); + } + } + + @Configuration + public static Option[] configure() throws Exception { + Option[] options = combine( + getDefaultCamelKarafOptions(), + + // using the features to install the camel components + scanFeatures(getCamelKarafFeatureUrl(), + "camel-blueprint", "camel-jetty", "camel-http4", "camel-cxf"), + + bundle(newBundle() + .add("OSGI-INF/blueprint/test.xml", CxfRsBlueprintRouterTest.class.getResource("CxfBeanBlueprintRouter.xml")) + .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.Customer.class) + .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerService.class) + .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.CustomerServiceResource.class) + .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.Order.class) + .add(org.apache.camel.itest.osgi.cxf.jaxrs.testbean.Product.class) + .set(Constants.BUNDLE_SYMBOLICNAME, "CxfBeanBlueprintRouterTest") + .set(Constants.DYNAMICIMPORT_PACKAGE, "*") + .build()).noStart()//, + //vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006") + + ); + + return options; + } +} Propchange: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouterTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/CxfBeanRouter.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/CxfBeanRouter.xml?rev=1155232&view=auto ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/CxfBeanRouter.xml (added) +++ camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/CxfBeanRouter.xml Tue Aug 9 06:56:35 2011 @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + Propchange: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/CxfBeanRouter.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/CxfBeanRouter.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/CxfBeanRouter.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouter.xml URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouter.xml?rev=1155232&view=auto ============================================================================== --- camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouter.xml (added) +++ camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouter.xml Tue Aug 9 06:56:35 2011 @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + Propchange: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouter.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouter.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: camel/trunk/tests/camel-itest-osgi/src/test/resources/org/apache/camel/itest/osgi/cxf/blueprint/CxfBeanBlueprintRouter.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml