You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/06/16 10:32:29 UTC
svn commit: r785110 - in /camel/trunk/components/camel-guice: ./
src/test/java/org/apache/camel/guice/
src/test/java/org/apache/camel/guice/consume/
src/test/java/org/apache/camel/guice/patterns/
src/test/java/org/apache/camel/guice/produce/
Author: ningjiang
Date: Tue Jun 16 08:32:28 2009
New Revision: 785110
URL: http://svn.apache.org/viewvc?rev=785110&view=rev
Log:
CAMEL-1712 Upgraded the camel-guice JUnit version to 4.6
Modified:
camel/trunk/components/camel-guice/pom.xml
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/CollectionOfCustomRoutesTest.java
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MainTest.java
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/patterns/FilterTest.java
camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java
Modified: camel/trunk/components/camel-guice/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/pom.xml?rev=785110&r1=785109&r2=785110&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/pom.xml (original)
+++ camel/trunk/components/camel-guice/pom.xml Tue Jun 16 08:32:28 2009
@@ -49,7 +49,7 @@
<!-- testing -->
<dependency>
<groupId>org.guiceyfruit</groupId>
- <artifactId>guiceyfruit-junit3</artifactId>
+ <artifactId>guiceyfruit-junit4</artifactId>
<version>${guiceyfruit-version}</version>
<scope>test</scope>
</dependency>
Modified: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/CollectionOfCustomRoutesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/CollectionOfCustomRoutesTest.java?rev=785110&r1=785109&r2=785110&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/CollectionOfCustomRoutesTest.java (original)
+++ camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/CollectionOfCustomRoutesTest.java Tue Jun 16 08:32:28 2009
@@ -30,13 +30,15 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Route;
import org.apache.camel.Routes;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Create a collection of routes via a provider method
*
* @version $Revision$
*/
-public class CollectionOfCustomRoutesTest extends TestCase {
+public class CollectionOfCustomRoutesTest extends Assert {
public static class MyModule extends CamelModuleWithMatchingRoutes {
@@ -47,6 +49,7 @@
}
}
+ @Test
public void testDummy() throws Exception {
}
Modified: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java?rev=785110&r1=785109&r2=785110&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java (original)
+++ camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java Tue Jun 16 08:32:28 2009
@@ -32,6 +32,8 @@
import org.guiceyfruit.Injectors;
import org.guiceyfruit.jndi.GuiceInitialContextFactory;
import org.guiceyfruit.jndi.JndiBind;
+import org.junit.Assert;
+import org.junit.Test;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
@@ -41,7 +43,7 @@
*
* @version $Revision$
*/
-public class ComponentFoundInRegistryTest extends TestCase {
+public class ComponentFoundInRegistryTest extends Assert {
public static class MyModule extends CamelModuleWithMatchingRoutes {
@Provides
@@ -51,6 +53,7 @@
}
}
+ @Test
public void testGuice() throws Exception {
Hashtable env = new Hashtable();
env.put(InitialContext.PROVIDER_URL, GuiceInitialContextFactory.class.getName());
Modified: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java?rev=785110&r1=785109&r2=785110&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java (original)
+++ camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java Tue Jun 16 08:32:28 2009
@@ -16,17 +16,18 @@
*/
package org.apache.camel.guice;
-import junit.framework.TestCase;
-
import com.google.inject.Guice;
import com.google.inject.Injector;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Lets use a RouteBuilder to bind instances of routes to the CamelContext
*
* @version $Revision$
*/
-public class ConciseGuiceRouteTest extends TestCase {
+public class ConciseGuiceRouteTest extends Assert {
+ @Test
public void testGuice() throws Exception {
// lets disable resource injection to avoid JNDI being used
Injector injector = Guice.createInjector(new CamelModuleWithRouteTypes(MyRouteInstaller.class, MyHardcodeRoute.class));
Modified: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java?rev=785110&r1=785109&r2=785110&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java (original)
+++ camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java Tue Jun 16 08:32:28 2009
@@ -29,6 +29,8 @@
import org.apache.camel.EndpointInject;
import org.apache.camel.Routes;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Assert;
+import org.junit.Test;
@@ -37,7 +39,7 @@
*
* @version $Revision$
*/
-public class EndpointInjectionTest extends TestCase {
+public class EndpointInjectionTest extends Assert {
public static class MyModule extends CamelModuleWithMatchingRoutes {
@@ -60,6 +62,7 @@
MockEndpoint endpoint;
}
+ @Test
public void testGuice() throws Exception {
Injector injector = Guice.createInjector(new MyModule());
Modified: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java?rev=785110&r1=785109&r2=785110&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java (original)
+++ camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java Tue Jun 16 08:32:28 2009
@@ -30,13 +30,15 @@
import org.apache.camel.builder.RouteBuilder;
import org.guiceyfruit.Injectors;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Lets use a custom CamelModule to perform explicit binding of route builders
*
* @version $Revision$
*/
-public class GuiceRouteWithNamedKeysTest extends TestCase {
+public class GuiceRouteWithNamedKeysTest extends Assert {
public static class MyModule extends CamelModuleWithMatchingRoutes {
@@ -47,7 +49,7 @@
}
}
-
+ @Test
public void testGuice() throws Exception {
Injector injector = Guice.createInjector(new MyModule());
Modified: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java?rev=785110&r1=785109&r2=785110&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java (original)
+++ camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java Tue Jun 16 08:32:28 2009
@@ -24,11 +24,13 @@
import org.apache.camel.CamelContext;
import org.guiceyfruit.Injectors;
+import org.junit.Assert;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class GuiceTest extends TestCase {
+public class GuiceTest extends Assert {
/**
* Asserts that the CamelContext is available in the given Injector, that its been started, then close the injector
@@ -60,6 +62,7 @@
}
}
+ @Test
public void testGuice() throws Exception {
// lets disable resource injection to avoid JNDI being used
Injector injector = Guice.createInjector(new CamelModuleWithMatchingRoutes());
Modified: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MainTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MainTest.java?rev=785110&r1=785109&r2=785110&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MainTest.java (original)
+++ camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MainTest.java Tue Jun 16 08:32:28 2009
@@ -22,15 +22,19 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class MainTest extends TestCase {
+public class MainTest extends Assert {
protected Main main = new Main();
protected String uri = "mock:results";
protected Object expectedBody = "<hello>world!</hello>";
+ @Test
public void testMain() throws Exception {
main.start();
List<CamelContext> contexts = main.getCamelContexts();
@@ -47,8 +51,8 @@
endpoint.assertIsSatisfied();
}
- @Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
if (main != null) {
main.stop();
}
Modified: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java?rev=785110&r1=785109&r2=785110&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java (original)
+++ camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java Tue Jun 16 08:32:28 2009
@@ -16,16 +16,17 @@
*/
package org.apache.camel.guice;
-import junit.framework.TestCase;
import com.google.inject.Guice;
import com.google.inject.Injector;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Lets use a custom CamelModule to perform explicit binding of route builders
*
* @version $Revision$
*/
-public class TraditionalGuiceRouteTest extends TestCase {
+public class TraditionalGuiceRouteTest extends Assert {
public static class MyModule extends CamelModuleWithRouteTypes {
@@ -34,6 +35,7 @@
}
}
+ @Test
public void testGuice() throws Exception {
Injector injector = Guice.createInjector(new MyModule());
GuiceTest.assertCamelContextRunningThenCloseInjector(injector);
Modified: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java?rev=785110&r1=785109&r2=785110&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java (original)
+++ camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java Tue Jun 16 08:32:28 2009
@@ -21,12 +21,20 @@
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.guice.CamelModuleWithMatchingRoutes;
-import org.guiceyfruit.testing.junit3.GuiceyTestCase;
+import org.guiceyfruit.testing.UseModule;
+import org.guiceyfruit.testing.junit4.GuiceyJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+
/**
* @version $Revision$
*/
-public class ConsumeTest extends GuiceyTestCase {
+@RunWith(GuiceyJUnit4.class)
+@UseModule(ConsumeTest.TestModule.class)
+public class ConsumeTest {
@Inject
protected MyBean bean;
@@ -35,6 +43,7 @@
protected Object expectedBody = "<hello>world!</hello>";
+ @Test
public void testConsumingWorks() throws Exception {
template.sendBody("direct:start", expectedBody);
Modified: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/patterns/FilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/patterns/FilterTest.java?rev=785110&r1=785109&r2=785110&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/patterns/FilterTest.java (original)
+++ camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/patterns/FilterTest.java Tue Jun 16 08:32:28 2009
@@ -23,13 +23,19 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.guice.CamelModuleWithMatchingRoutes;
-import org.guiceyfruit.testing.junit3.GuiceyTestCase;
+import org.apache.camel.guice.consume.ConsumeTest;
+import org.guiceyfruit.testing.UseModule;
+import org.guiceyfruit.testing.junit4.GuiceyJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
/**
* @version $Revision$
*/
// START SNIPPET: example
-public class FilterTest extends GuiceyTestCase {
+@RunWith(GuiceyJUnit4.class)
+@UseModule(FilterTest.TestModule.class)
+public class FilterTest {
@EndpointInject(uri = "mock:result")
protected MockEndpoint resultEndpoint;
@@ -37,7 +43,9 @@
@Produce(uri = "direct:start")
protected ProducerTemplate template;
+ @Test
public void testSendMatchingMessage() throws Exception {
+ resultEndpoint.reset();
String expectedBody = "<matched/>";
resultEndpoint.expectedBodiesReceived(expectedBody);
@@ -47,7 +55,9 @@
resultEndpoint.assertIsSatisfied();
}
+ @Test
public void testSendNotMatchingMessage() throws Exception {
+ resultEndpoint.reset();
resultEndpoint.expectedMessageCount(0);
template.sendBodyAndHeader("<notMatched/>", "foo", "notMatchedHeaderValue");
Modified: camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java?rev=785110&r1=785109&r2=785110&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java (original)
+++ camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java Tue Jun 16 08:32:28 2009
@@ -16,19 +16,25 @@
*/
package org.apache.camel.guice.produce;
-import junit.framework.Assert;
import org.apache.camel.Produce;
import org.apache.camel.guice.CamelModuleWithMatchingRoutes;
-import org.guiceyfruit.testing.junit3.GuiceyTestCase;
+import org.guiceyfruit.testing.UseModule;
+import org.guiceyfruit.testing.junit4.GuiceyJUnit4;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
/**
* @version $Revision$
*/
-public class ProduceTest extends GuiceyTestCase {
+@RunWith(GuiceyJUnit4.class)
+@UseModule(ProduceTest.TestModule.class)
+public class ProduceTest {
@Produce(uri = "direct:myService")
protected MyListener producer;
+ @Test
public void testInvokeService() throws Exception {
// lets send a message
String actual = producer.sayHello("James");