Author: davsclaus
Date: Tue Sep 28 07:06:34 2010
New Revision: 1002038
URL: http://svn.apache.org/viewvc?rev=1002038&view=rev
Log:
CAMEL-3126: Added more osgi tests.
Added:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/clazz/
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java
- copied, changed from r1002017,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java
- copied, changed from r1002017,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java
Copied:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java
(from r1002017,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java?p2=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java&p1=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java&r1=1002017&r2=1002038&rev=1002038&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/bean/BeanRouteTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/core/clazz/ClassRouteTest.java
Tue Sep 28 07:06:34 2010
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.osgi.core.bean;
+package org.apache.camel.itest.osgi.core.clazz;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,10 +32,10 @@ import static org.ops4j.pax.exam.contain
import static
org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
@RunWith(JUnit4TestRunner.class)
-public class BeanRouteTest extends OSGiIntegrationTestSupport {
+public class ClassRouteTest extends OSGiIntegrationTestSupport {
@Test
- public void testBean() throws Exception {
+ public void testClass() throws Exception {
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
template.sendBody("direct:start", "World");
@@ -45,17 +44,10 @@ public class BeanRouteTest extends OSGiI
}
@Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry jndi = super.createRegistry();
- jndi.bind("foo", new MyFooBean());
- return jndi;
- }
-
- @Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("direct:start").to("bean:foo").to("mock:result");
+
from("direct:start").to("class:org.apache.camel.itest.osgi.core.bean.MyFooBean").to("mock:result");
}
};
}
Copied:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java
(from r1002017,
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java?p2=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java&p1=camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java&r1=1002017&r2=1002038&rev=1002038&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/mina/MinaTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/stream/StreamTest.java
Tue Sep 28 07:06:34 2010
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.itest.osgi.mina;
+package org.apache.camel.itest.osgi.stream;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
@@ -32,14 +32,13 @@ import static org.ops4j.pax.exam.contain
import static
org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
@RunWith(JUnit4TestRunner.class)
-public class MinaTest extends OSGiIntegrationTestSupport {
+public class StreamTest extends OSGiIntegrationTestSupport {
@Test
- public void testMina() throws Exception {
- getMockEndpoint("mock:result").expectedBodiesReceived("World");
+ public void testStream() throws Exception {
+ getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
- String reply =
template.requestBody("mina:tcp://localhost:8877?textline=true", "World",
String.class);
- assertEquals("Bye World", reply);
+ template.sendBody("direct:start", "Hello World");
assertMockEndpointsSatisfied();
}
@@ -47,9 +46,9 @@ public class MinaTest extends OSGiIntegr
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("mina:tcp://localhost:8877?textline=true")
- .to("mock:result")
- .transform(body().prepend("Bye "));
+ from("direct:start")
+ .to("stream:out")
+ .to("mock:result");
}
};
}
@@ -64,7 +63,7 @@ public class MinaTest extends OSGiIntegr
// using the features to install the camel components
scanFeatures(getCamelKarafFeatureUrl(),
- "camel-core", "camel-test", "camel-mina"),
+ "camel-core", "camel-test", "camel-stream"),
workingDirectory("target/paxrunner/"),
