Author: dkulp
Date: Wed Jul 27 16:33:45 2011
New Revision: 1151528
URL: http://svn.apache.org/viewvc?rev=1151528&view=rev
Log:
junit4 update and compiler warning fixes for camel-cache, camel-context,
and camel-cometd
Modified:
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheProducerTest.java
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRegistryRefTest.java
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRoutesManagementTest.java
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutInteractiveMain.java
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java
Modified:
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java?rev=1151528&r1=1151527&r2=1151528&view=diff
==============================================================================
---
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java
(original)
+++
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheManagerFactoryRefTest.java
Wed Jul 27 16:33:45 2011
@@ -25,7 +25,7 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class CacheManagerFactoryRefTest extends CamelTestSupport {
Modified:
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheProducerTest.java?rev=1151528&r1=1151527&r2=1151528&view=diff
==============================================================================
---
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheProducerTest.java
(original)
+++
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheProducerTest.java
Wed Jul 27 16:33:45 2011
@@ -48,9 +48,6 @@ public class CacheProducerTest extends C
@EndpointInject(uri = "mock:CacheProducerTest.cacheException")
protected MockEndpoint cacheExceptionEndpoint;
- @EndpointInject(uri =
"mock:CacheProducerTest.noTypeConversionAvailableException")
- private MockEndpoint noTypeConversionAvailableExceptionEndpoint;
-
@Override
public boolean isUseRouteBuilder() {
return false;
Modified:
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRegistryRefTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRegistryRefTest.java?rev=1151528&r1=1151527&r2=1151528&view=diff
==============================================================================
---
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRegistryRefTest.java
(original)
+++
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRegistryRefTest.java
Wed Jul 27 16:33:45 2011
@@ -38,7 +38,7 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class CacheRegistryRefTest extends CamelTestSupport {
@@ -134,8 +134,8 @@ public class CacheRegistryRefTest extend
public class TestLoader implements CacheLoaderWrapper {
+ protected Ehcache cache;
private Status status;
- private Ehcache cache;
public TestLoader() {
status = Status.STATUS_UNINITIALISED;
Modified:
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRoutesManagementTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRoutesManagementTest.java?rev=1151528&r1=1151527&r2=1151528&view=diff
==============================================================================
---
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRoutesManagementTest.java
(original)
+++
camel/trunk/components/camel-cache/src/test/java/org/apache/camel/component/cache/CacheRoutesManagementTest.java
Wed Jul 27 16:33:45 2011
@@ -28,7 +28,7 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class CacheRoutesManagementTest extends CamelTestSupport {
Modified:
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutInteractiveMain.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutInteractiveMain.java?rev=1151528&r1=1151527&r2=1151528&view=diff
==============================================================================
---
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutInteractiveMain.java
(original)
+++
camel/trunk/components/camel-cometd/src/test/java/org/apache/camel/component/cometd/CometdProducerConsumerInOutInteractiveMain.java
Wed Jul 27 16:33:45 2011
@@ -21,6 +21,7 @@ import java.net.URI;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -62,7 +63,7 @@ public class CometdProducerConsumerInOut
URI keyStoreUrl = file.toURI();
component.setSslKeystore(keyStoreUrl.getPath());
- from(URI, URIS).inOut().process(new Processor() {
+ from(URI,
URIS).setExchangePattern(ExchangePattern.InOut).process(new Processor() {
public void process(Exchange exchange) throws Exception {
Message out = new DefaultMessage();
out.setBody("reply: " + exchange.getIn().getBody());
Modified:
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java?rev=1151528&r1=1151527&r2=1151528&view=diff
==============================================================================
---
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java
(original)
+++
camel/trunk/components/camel-context/src/test/java/org/apache/camel/component/context/JavaDslBlackBoxTest.java
Wed Jul 27 16:33:45 2011
@@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.JndiRegistry;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
