Author: jstrachan
Date: Thu Oct 23 07:01:32 2008
New Revision: 707376
URL: http://svn.apache.org/viewvc?rev=707376&view=rev
Log:
upgraded the guice tests to the latest guiceyfruit testing framework
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MainTest.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java
activemq/camel/trunk/pom.xml
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java?rev=707376&r1=707375&r2=707376&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ComponentFoundInRegistryTest.java
Thu Oct 23 07:01:32 2008
@@ -16,15 +16,9 @@
*/
package org.apache.camel.guice;
-import java.util.Hashtable;
-
-import javax.naming.InitialContext;
-
-import junit.framework.TestCase;
-
import com.google.inject.Injector;
import com.google.inject.Provides;
-
+import junit.framework.TestCase;
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
import org.apache.camel.Endpoint;
@@ -33,10 +27,12 @@
import org.guiceyfruit.Injectors;
import org.guiceyfruit.jndi.GuiceInitialContextFactory;
import org.guiceyfruit.jndi.JndiBind;
-
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
+import javax.naming.InitialContext;
+import java.util.Hashtable;
+
/**
* Lets use a custom CamelModule to perform explicit binding of route builders
*
@@ -63,7 +59,7 @@
Object value = context.lookup("foo");
assertNotNull("Should have found a value for foo!", value);
-
+
CamelContext camelContext = injector.getInstance(CamelContext.class);
Component component = camelContext.getComponent("foo");
assertThat(component, is(MockComponent.class));
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java?rev=707376&r1=707375&r2=707376&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/ConciseGuiceRouteTest.java
Thu Oct 23 07:01:32 2008
@@ -16,13 +16,9 @@
*/
package org.apache.camel.guice;
-import junit.framework.TestCase;
-
import com.google.inject.Guice;
import com.google.inject.Injector;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
+import junit.framework.TestCase;
/**
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java?rev=707376&r1=707375&r2=707376&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/EndpointInjectionTest.java
Thu Oct 23 07:01:32 2008
@@ -16,20 +16,18 @@
*/
package org.apache.camel.guice;
-import java.util.Collection;
-
-import junit.framework.TestCase;
-
import com.google.common.collect.Lists;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Provides;
import com.google.inject.name.Named;
-
+import junit.framework.TestCase;
import org.apache.camel.EndpointInject;
import org.apache.camel.Routes;
import org.apache.camel.component.mock.MockEndpoint;
+import java.util.Collection;
+
/**
* Create a collection of routes via a provider method
*
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java?rev=707376&r1=707375&r2=707376&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceRouteWithNamedKeysTest.java
Thu Oct 23 07:01:32 2008
@@ -16,10 +16,6 @@
*/
package org.apache.camel.guice;
-import java.util.Collection;
-
-import junit.framework.TestCase;
-
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Key;
@@ -27,11 +23,12 @@
import com.google.inject.matcher.Matchers;
import com.google.inject.name.Named;
import com.google.inject.name.Names;
-
-import org.apache.camel.CamelContext;
+import junit.framework.TestCase;
import org.apache.camel.builder.RouteBuilder;
import org.guiceyfruit.Injectors;
+import java.util.Collection;
+
/**
* Lets use a custom CamelModule to perform explicit binding of route builders
*
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java?rev=707376&r1=707375&r2=707376&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/GuiceTest.java
Thu Oct 23 07:01:32 2008
@@ -16,13 +16,11 @@
*/
package org.apache.camel.guice;
-import junit.framework.TestCase;
-
import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.spi.CloseFailedException;
-
+import junit.framework.TestCase;
import org.apache.camel.CamelContext;
/**
@@ -32,6 +30,7 @@
/**
* Asserts that the CamelContext is available in the given Injector, that
its been started, then close the injector
+ *
* @param injector
* @throws CloseFailedException
*/
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MainTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MainTest.java?rev=707376&r1=707375&r2=707376&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MainTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/MainTest.java
Thu Oct 23 07:01:32 2008
@@ -16,14 +16,13 @@
*/
package org.apache.camel.guice;
-import java.util.List;
-
import junit.framework.TestCase;
-
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.mock.MockEndpoint;
+import java.util.List;
+
/**
* @version $Revision$
*/
@@ -44,7 +43,7 @@
endpoint.expectedBodiesReceived(expectedBody);
template.sendBody(uri, expectedBody);
-
+
endpoint.assertIsSatisfied();
}
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java?rev=707376&r1=707375&r2=707376&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/TraditionalGuiceRouteTest.java
Thu Oct 23 07:01:32 2008
@@ -16,12 +16,9 @@
*/
package org.apache.camel.guice;
-import junit.framework.TestCase;
-
import com.google.inject.Guice;
import com.google.inject.Injector;
-
-import org.apache.camel.CamelContext;
+import junit.framework.TestCase;
/**
* Lets use a custom CamelModule to perform explicit binding of route builders
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java?rev=707376&r1=707375&r2=707376&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/consume/ConsumeTest.java
Thu Oct 23 07:01:32 2008
@@ -21,12 +21,12 @@
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.guice.CamelModuleWithMatchingRoutes;
-import org.guiceyfruit.testing.junit3.GuiceyFruitTestCase;
+import org.guiceyfruit.testing.junit3.GuiceyTestCase;
/**
* @version $Revision: 697494 $
*/
-public class ConsumeTest extends GuiceyFruitTestCase {
+public class ConsumeTest extends GuiceyTestCase {
@Inject
protected MyBean bean;
@@ -42,7 +42,7 @@
assertEquals("Body of bean", expectedBody, bean.body);
}
- public static class Configuration extends CamelModuleWithMatchingRoutes {
+ public static class TestModule extends CamelModuleWithMatchingRoutes {
@Override
protected void configure() {
super.configure();
Modified:
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java?rev=707376&r1=707375&r2=707376&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java
(original)
+++
activemq/camel/trunk/components/camel-guice/src/test/java/org/apache/camel/guice/produce/ProduceTest.java
Thu Oct 23 07:01:32 2008
@@ -19,12 +19,12 @@
import junit.framework.Assert;
import org.apache.camel.Produce;
import org.apache.camel.guice.CamelModuleWithMatchingRoutes;
-import org.guiceyfruit.testing.junit3.GuiceyFruitTestCase;
+import org.guiceyfruit.testing.junit3.GuiceyTestCase;
/**
* @version $Revision: 697494 $
*/
-public class ProduceTest extends GuiceyFruitTestCase {
+public class ProduceTest extends GuiceyTestCase {
@Produce(uri = "direct:myService")
protected MyListener producer;
@@ -35,7 +35,7 @@
Assert.assertEquals("response", "Hello James", actual);
}
- public static class Configuration extends CamelModuleWithMatchingRoutes {
+ public static class TestModule extends CamelModuleWithMatchingRoutes {
@Override
protected void configure() {
super.configure();
Modified: activemq/camel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=707376&r1=707375&r2=707376&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Thu Oct 23 07:01:32 2008
@@ -72,7 +72,7 @@
<hibernate-entitymanager-version>3.2.1.ga</hibernate-entitymanager-version>
<hsqldb-version>1.8.0.7</hsqldb-version>
<groovy-version>1.5.6</groovy-version>
- <guiceyfruit-version>2.0-beta-3</guiceyfruit-version>
+ <guiceyfruit-version>2.0-beta-4</guiceyfruit-version>
<junit-version>3.8.2</junit-version>
<saxon-version>9.1.0.1</saxon-version>
<scala-version>2.7.2-rc1</scala-version>
