Author: dkulp
Date: Wed Jul 27 17:25:38 2011
New Revision: 1151542
URL: http://svn.apache.org/viewvc?rev=1151542&view=rev
Log:
Bunch more junit4 updates and compiler warning fixes
Modified:
camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java
camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminProducer.java
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java
camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbConverterTest.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/MessageTypeTest.java
camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelEndpointTest.java
camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelProduceAndConsumeTest.java
camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelProducerTest.java
camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelSingleThreadedConsumerTest.java
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicy.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java
camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/demo/RouteboxDemoTestSupport.java
camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java
camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java
camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthorizationTest.java
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java
camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
Modified:
camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java
(original)
+++
camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvUnmarshalPipeDelimiterTest.java
Wed Jul 27 17:25:38 2011
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.csv.CSVStrategy;
import org.junit.Test;
Modified:
camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminProducer.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminProducer.java
(original)
+++
camel/trunk/components/camel-eventadmin/src/main/java/org/apache/camel/component/eventadmin/EventAdminProducer.java
Wed Jul 27 17:25:38 2011
@@ -99,7 +99,7 @@ public class EventAdminProducer extends
Message in = exchange.getIn();
CamelContext context = endpoint.getCamelContext();
Map map = context.getTypeConverter().convertTo(Map.class, exchange,
in.getBody());
- Dictionary dict = new Hashtable();
+ Dictionary<String, Object> dict = new Hashtable<String, Object>();
for (Object object : map.entrySet()) {
Entry entry = (Entry) object;
String keyString = CamelContextHelper.convertTo(context,
String.class, entry.getKey());
Modified:
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java
(original)
+++
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerForSpringTest.java
Wed Jul 27 17:25:38 2011
@@ -23,6 +23,8 @@ import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.IMap;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.apache.camel.util.CastUtils;
+
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -92,13 +94,13 @@ public class HazelcastMapProducerForSpri
String q2 = "foo LIKE alp%";
template.sendBodyAndHeader("direct:query", null,
HazelcastConstants.QUERY, q1);
- Collection<Dummy> b1 = consumer.receiveBody("seda:out", 5000,
Collection.class);
+ Collection<Dummy> b1 = CastUtils.cast(consumer.receiveBody("seda:out",
5000, Collection.class));
assertNotNull(b1);
assertEquals(2, b1.size());
template.sendBodyAndHeader("direct:query", null,
HazelcastConstants.QUERY, q2);
- Collection<Dummy> b2 = consumer.receiveBody("seda:out", 5000,
Collection.class);
+ Collection<Dummy> b2 = CastUtils.cast(consumer.receiveBody("seda:out",
5000, Collection.class));
assertNotNull(b2);
assertEquals(1, b2.size());
Modified:
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java
(original)
+++
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMapProducerTest.java
Wed Jul 27 17:25:38 2011
@@ -24,6 +24,8 @@ import com.hazelcast.core.IMap;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.CastUtils;
+
import org.junit.Test;
public class HazelcastMapProducerTest extends CamelTestSupport implements
Serializable {
@@ -86,13 +88,13 @@ public class HazelcastMapProducerTest ex
String q2 = "foo LIKE alp%";
template.sendBodyAndHeader("direct:query", null,
HazelcastConstants.QUERY, q1);
- Collection<Dummy> b1 = consumer.receiveBody("seda:out", 5000,
Collection.class);
+ Collection<Dummy> b1 = CastUtils.cast(consumer.receiveBody("seda:out",
5000, Collection.class));
assertNotNull(b1);
assertEquals(2, b1.size());
template.sendBodyAndHeader("direct:query", null,
HazelcastConstants.QUERY, q2);
- Collection<Dummy> b2 = consumer.receiveBody("seda:out", 5000,
Collection.class);
+ Collection<Dummy> b2 = CastUtils.cast(consumer.receiveBody("seda:out",
5000, Collection.class));
assertNotNull(b2);
assertEquals(1, b2.size());
Modified:
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java
(original)
+++
camel/trunk/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastMultimapProducerForSpringTest.java
Wed Jul 27 17:25:38 2011
@@ -22,6 +22,8 @@ import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.MultiMap;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.apache.camel.util.CastUtils;
+
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -73,7 +75,7 @@ public class HazelcastMultimapProducerFo
map.put("4711", "my-foo");
template.sendBodyAndHeader("direct:get", null,
HazelcastConstants.OBJECT_ID, "4711");
- Collection<Object> body = consumer.receiveBody("seda:out", 5000,
Collection.class);
+ Collection<Object> body =
CastUtils.cast(consumer.receiveBody("seda:out", 5000, Collection.class));
assertTrue(body.contains("my-foo"));
}
Modified:
camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java
(original)
+++
camel/trunk/components/camel-hdfs/src/test/java/org/apache/camel/component/hdfs/integration/HdfsProducerConsumerIntegrationTest.java
Wed Jul 27 17:25:38 2011
@@ -22,11 +22,14 @@ import junit.framework.Assert;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+
+import org.junit.After;
import org.junit.Ignore;
+import org.junit.Test;
@Ignore("Must run manual")
public class HdfsProducerConsumerIntegrationTest extends CamelTestSupport {
@@ -36,6 +39,7 @@ public class HdfsProducerConsumerIntegra
return false;
}
+ @Test
public void testSimpleSplitWriteRead() throws Exception {
context.addRoutes(new RouteBuilder() {
@Override
@@ -63,7 +67,8 @@ public class HdfsProducerConsumerIntegra
}
@Override
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
super.tearDown();
Thread.sleep(100);
Configuration conf = new Configuration();
Modified:
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
(original)
+++
camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
Wed Jul 27 17:25:38 2011
@@ -186,8 +186,6 @@ public class IrcEndpoint extends Default
public void joinChannel(String channel) {
- List<String> channels = configuration.getChannels();
-
IRCConnection connection = component.getIRCConnection(configuration);
// check for key for channel
Modified:
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbConverterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbConverterTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbConverterTest.java
(original)
+++
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/JaxbConverterTest.java
Wed Jul 27 17:25:38 2011
@@ -29,6 +29,7 @@ import org.apache.camel.test.junit4.Exch
import org.junit.Before;
import org.junit.Test;
+@SuppressWarnings("deprecation")
public class JaxbConverterTest extends ExchangeTestSupport {
private JaxbConverter jaxbConverter;
private PurchaseOrder order;
Modified:
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/MessageTypeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/MessageTypeTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/MessageTypeTest.java
(original)
+++
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/converter/jaxb/MessageTypeTest.java
Wed Jul 27 17:25:38 2011
@@ -34,6 +34,7 @@ public class MessageTypeTest extends Exc
@Test
public void testCamelToJaxbUsingExplicitJaxbConverter() throws Exception {
+ @SuppressWarnings("deprecation")
MessageDefinition messageType = JaxbConverter.toMessageType(exchange);
assertNotNull("Should have created a valid message Type");
Modified:
camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelEndpointTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelEndpointTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelEndpointTest.java
(original)
+++
camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelEndpointTest.java
Wed Jul 27 17:25:38 2011
@@ -19,7 +19,9 @@ package org.apache.camel.component.kestr
import java.util.Arrays;
import org.apache.camel.CamelContext;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
public class KestrelEndpointTest extends CamelTestSupport {
@@ -94,6 +96,7 @@ public class KestrelEndpointTest extends
private KestrelConfiguration baseConfiguration;
private KestrelComponent kestrelComponent;
+ @Test
public void testEndpoints() throws Exception {
for (TestCase testCase : TEST_CASES) {
KestrelEndpoint endpoint = (KestrelEndpoint)
Modified:
camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelProduceAndConsumeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelProduceAndConsumeTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelProduceAndConsumeTest.java
(original)
+++
camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelProduceAndConsumeTest.java
Wed Jul 27 17:25:38 2011
@@ -23,8 +23,9 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
+import org.junit.Test;
@Ignore("Manual test as you need to start a Kestrel broker")
public class KestrelProduceAndConsumeTest extends CamelTestSupport {
@@ -32,6 +33,7 @@ public class KestrelProduceAndConsumeTes
@EndpointInject(uri = "kestrel://cameltest2")
private ProducerTemplate producerTemplate;
+ @Test
public void testProduceAndConsume() throws Exception {
List<String> bodies = new ArrayList<String>();
for (int k = 0; k < 10; ++k) {
Modified:
camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelProducerTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelProducerTest.java
(original)
+++
camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelProducerTest.java
Wed Jul 27 17:25:38 2011
@@ -18,8 +18,9 @@ package org.apache.camel.component.kestr
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
+import org.junit.Test;
@Ignore("Manual test as you need to start a Kestrel broker")
public class KestrelProducerTest extends CamelTestSupport {
@@ -27,6 +28,7 @@ public class KestrelProducerTest extends
@EndpointInject(uri = "kestrel://cameltest1")
ProducerTemplate producerTemplate;
+ @Test
public void testKestrelProducer() throws Exception {
for (int k = 0; k < 100; ++k) {
producerTemplate.sendBody("test body " + k);
Modified:
camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelSingleThreadedConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelSingleThreadedConsumerTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelSingleThreadedConsumerTest.java
(original)
+++
camel/trunk/components/camel-kestrel/src/test/java/org/apache/camel/component/kestrel/KestrelSingleThreadedConsumerTest.java
Wed Jul 27 17:25:38 2011
@@ -23,8 +23,9 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
+import org.junit.Test;
@Ignore("Manual test as you need to start a Kestrel broker")
public class KestrelSingleThreadedConsumerTest extends CamelTestSupport {
@@ -32,6 +33,7 @@ public class KestrelSingleThreadedConsum
@EndpointInject(uri = "kestrel://cameltest4")
private ProducerTemplate producerTemplate;
+ @Test
public void testProduceAndConsume() throws Exception {
List<String> bodies = new ArrayList<String>();
for (int k = 0; k < 10; ++k) {
Modified:
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
(original)
+++
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/component/lucene/LuceneIndexAndQueryProducerTest.java
Wed Jul 27 17:25:38 2011
@@ -26,7 +26,7 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.processor.lucene.support.Hits;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.analysis.WhitespaceAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
@@ -35,6 +35,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
public class LuceneIndexAndQueryProducerTest extends CamelTestSupport {
private static final transient Logger LOG =
LoggerFactory.getLogger(LuceneIndexAndQueryProducerTest.class);
private String[] humorousQuotes = {
Modified:
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
(original)
+++
camel/trunk/components/camel-lucene/src/test/java/org/apache/camel/processor/lucene/LuceneQueryProcessorTest.java
Wed Jul 27 17:25:38 2011
@@ -23,7 +23,7 @@ import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.processor.lucene.support.Hits;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.util.Version;
Modified:
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java
(original)
+++
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettySSLTest.java
Wed Jul 27 17:25:38 2011
@@ -30,8 +30,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class NettySSLTest extends BaseNettyTest {
- private static final transient Logger LOG =
LoggerFactory.getLogger(NettySSLTest.class);
-
@Produce(uri = "direct:start")
protected ProducerTemplate producerTemplate;
Modified:
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java
(original)
+++
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyTCPAsyncTest.java
Wed Jul 27 17:25:38 2011
@@ -34,8 +34,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class NettyTCPAsyncTest extends BaseNettyTest {
- private static final transient Logger LOG =
LoggerFactory.getLogger(NettyTCPAsyncTest.class);
-
@EndpointInject(uri = "mock:result")
protected MockEndpoint resultEndpoint;
@Produce(uri = "direct:start")
Modified:
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicy.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicy.java
(original)
+++
camel/trunk/components/camel-quartz/src/main/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicy.java
Wed Jul 27 17:25:38 2011
@@ -28,7 +28,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SimpleScheduledRoutePolicy extends ScheduledRoutePolicy {
- private static final transient Logger LOG =
LoggerFactory.getLogger(CronScheduledRoutePolicy.class);
private Date routeStartDate;
private int routeStartRepeatCount;
private long routeStartRepeatInterval;
Modified:
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java
(original)
+++
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SpringMultiplePoliciesOnRouteTest.java
Wed Jul 27 17:25:38 2011
@@ -16,8 +16,8 @@
*/
package org.apache.camel.routepolicy.quartz;
-import org.apache.camel.test.CamelSpringTestSupport;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
Modified:
camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/demo/RouteboxDemoTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/demo/RouteboxDemoTestSupport.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/demo/RouteboxDemoTestSupport.java
(original)
+++
camel/trunk/components/camel-routebox/src/test/java/org/apache/camel/component/routebox/demo/RouteboxDemoTestSupport.java
Wed Jul 27 17:25:38 2011
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.routebox.strategy.RouteboxDispatchStrategy;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
public class RouteboxDemoTestSupport extends CamelTestSupport {
Modified:
camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java
(original)
+++
camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java
Wed Jul 27 17:25:38 2011
@@ -20,7 +20,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class RssPollingConsumerWithFeedHeaderDisabledTest extends
CamelTestSupport {
Modified:
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java
(original)
+++
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XPathAnnotationResultTypeTest.java
Wed Jul 27 17:25:38 2011
@@ -21,15 +21,18 @@ import javax.xml.xpath.XPathFactory;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.language.XPath;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jndi.JndiContext;
+import org.junit.Test;
+
/**
* @version
*/
public class XPathAnnotationResultTypeTest extends CamelTestSupport {
protected MyBean myBean = new MyBean();
+ @Test
public void testSendMessage() throws Exception {
String response = (String) template.requestBody("direct:in1",
"<a><b>hello</b></a>");
Modified:
camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java
(original)
+++
camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthenticationTest.java
Wed Jul 27 17:25:38 2011
@@ -22,7 +22,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.shiro.authc.IncorrectCredentialsException;
import org.apache.shiro.authc.LockedAccountException;
import org.apache.shiro.authc.UnknownAccountException;
Modified:
camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthorizationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthorizationTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthorizationTest.java
(original)
+++
camel/trunk/components/camel-shiro/src/test/java/org/apache/camel/component/shiro/security/ShiroAuthorizationTest.java
Wed Jul 27 17:25:38 2011
@@ -24,7 +24,7 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.shiro.authz.Permission;
import org.apache.shiro.authz.permission.WildcardPermission;
import org.apache.shiro.config.IniSecurityManagerFactory;
Modified:
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java
(original)
+++
camel/trunk/components/camel-soap/src/test/java/org/apache/camel/dataformat/soap/SoapUnMarshalTest.java
Wed Jul 27 17:25:38 2011
@@ -29,7 +29,9 @@ import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import org.junit.Test;
/**
* Checks that a static soap request is unmarshalled to the correct java
@@ -45,6 +47,7 @@ public class SoapUnMarshalTest extends C
@Produce(uri = "direct:start")
protected ProducerTemplate producer;
+ @Test
public void testUnMarshalSoap() throws IOException, InterruptedException {
resultEndpoint.expectedMessageCount(1);
InputStream in = this.getClass().getResourceAsStream("request.xml");
Modified:
camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
(original)
+++
camel/trunk/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceProducer.java
Wed Jul 27 17:25:38 2011
@@ -34,7 +34,7 @@ import org.springframework.ws.soap.clien
public class SpringWebserviceProducer extends DefaultProducer {
- private static final SourceExtractor SOURCE_EXTRACTOR = new
NoopSourceExtractor();
+ private static final SourceExtractor<Object> SOURCE_EXTRACTOR = new
NoopSourceExtractor();
private SpringWebserviceEndpoint endpoint;
public SpringWebserviceProducer(Endpoint endpoint) {
@@ -94,7 +94,7 @@ public class SpringWebserviceProducer ex
* A {@link SourceExtractor} that performs no conversion, instead
conversion
* is handled by Camel's {@link TypeConverter} hierarchy.
*/
- private static class NoopSourceExtractor implements SourceExtractor {
+ private static class NoopSourceExtractor implements
SourceExtractor<Object> {
public Object extractData(Source source) throws IOException,
TransformerException {
return source;
}
Modified:
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java
(original)
+++
camel/trunk/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/ConsumerEndpointMappingRouteTest.java
Wed Jul 27 17:25:38 2011
@@ -36,7 +36,7 @@ import org.springframework.ws.soap.clien
public class ConsumerEndpointMappingRouteTest extends CamelSpringTestSupport {
- private static final SourceExtractor NOOP_SOURCE_EXTRACTOR = new
SourceExtractor() {
+ private static final SourceExtractor<Object> NOOP_SOURCE_EXTRACTOR = new
SourceExtractor<Object>() {
public Object extractData(Source source) throws IOException,
TransformerException {
return null;
}
Modified:
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java?rev=1151542&r1=1151541&r2=1151542&view=diff
==============================================================================
---
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
(original)
+++
camel/trunk/components/camel-xmpp/src/main/java/org/apache/camel/component/xmpp/XmppEndpoint.java
Wed Jul 27 17:25:38 2011
@@ -121,6 +121,7 @@ public class XmppEndpoint extends Defaul
return true;
}
+ @SuppressWarnings("deprecation")
public XMPPConnection createConnection() throws XMPPException {
if (connection != null) {
