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 2010/04/28 05:39:23 UTC
svn commit: r938767 - in /camel/trunk/tests:
camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/
camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/
camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/
camel-...
Author: ningjiang
Date: Wed Apr 28 03:39:23 2010
New Revision: 938767
URL: http://svn.apache.org/viewvc?rev=938767&view=rev
Log:
Clean up the @SuppressWarnings of tests
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/VelocityTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJaxbTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java?rev=938767&r1=938766&r2=938767&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java Wed Apr 28 03:39:23 2010
@@ -85,7 +85,7 @@ public class MailRouteTest extends OSGiI
Object content = message.getContent();
assertNotNull("The content should not be null!", content);
if (content instanceof InputStream) {
- assertEquals("hello world!", IOConverter.toString((InputStream)content));
+ assertEquals("hello world!", IOConverter.toString((InputStream)content, null));
} else {
assertEquals("hello world!", message.getContent());
}
@@ -131,7 +131,7 @@ public class MailRouteTest extends OSGiI
// using the features to install the camel components
scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
artifactId("apache-camel").versionAsInProject().type("xml/features"),
- "camel-core","camel-spring-osgi", "camel-test"),
+ "camel-core", "camel-spring-osgi", "camel-test"),
// using the java mail API bundle
mavenBundle().groupId("org.apache.servicemix.specs").artifactId("org.apache.servicemix.specs.javamail-api-1.4").version("1.3.0"),
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/VelocityTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/VelocityTest.java?rev=938767&r1=938766&r2=938767&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/VelocityTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/VelocityTest.java Wed Apr 28 03:39:23 2010
@@ -39,7 +39,7 @@ import static org.ops4j.pax.exam.contain
@RunWith(JUnit4TestRunner.class)
public class VelocityTest extends OSGiIntegrationTestSupport {
- private static final transient Log LOG = LogFactory.getLog(VelocityTest.class);
+
@Test
public void testReceivesFooResponse() throws Exception {
assertRespondsWith("foo", "<hello>foo</hello>");
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java?rev=938767&r1=938766&r2=938767&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/jaxb/JaxbFallbackConverterTest.java Wed Apr 28 03:39:23 2010
@@ -38,7 +38,6 @@ import static org.ops4j.pax.exam.contain
@RunWith(JUnit4TestRunner.class)
public class JaxbFallbackConverterTest extends OSGiIntegrationTestSupport {
- private static final transient Log LOG = LogFactory.getLog(JaxbFallbackConverterTest.class);
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java?rev=938767&r1=938766&r2=938767&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/servlet/support/ServletActivator.java Wed Apr 28 03:39:23 2010
@@ -67,7 +67,7 @@ public final class ServletActivator impl
// create a default context to share between registrations
final HttpContext httpContext = httpService.createDefaultHttpContext();
// register the hello world servlet
- final Dictionary initParams = new Hashtable();
+ final Dictionary<String, String> initParams = new Hashtable<String, String>();
initParams.put("matchOnUriPrefix", "false");
initParams.put("servlet-name", "camelServlet");
httpService.registerServlet("/camel/services", // alias
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java?rev=938767&r1=938766&r2=938767&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterConsumerTest.java Wed Apr 28 03:39:23 2010
@@ -23,8 +23,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.cxf.CxfConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
@@ -36,8 +34,7 @@ import static org.junit.Assert.assertTru
@ContextConfiguration
public class CamelGreeterConsumerTest extends AbstractJUnit4SpringContextTests {
- private static final transient Log LOG = LogFactory.getLog(CamelGreeterTest.class);
-
+
@Autowired
protected CamelContext camelContext;
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJaxbTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJaxbTest.java?rev=938767&r1=938766&r2=938767&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJaxbTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsJaxbTest.java Wed Apr 28 03:39:23 2010
@@ -92,7 +92,7 @@ public class JmsJaxbTest extends CamelTe
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("jms:queue:error").redeliverDelay(0));
+ errorHandler(deadLetterChannel("jms:queue:error").redeliveryDelay(0));
onException(InvalidOrderException.class).maximumRedeliveries(0).handled(true)
.to("jms:queue:invalid");
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java?rev=938767&r1=938766&r2=938767&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java Wed Apr 28 03:39:23 2010
@@ -52,8 +52,7 @@ public class JmsToHttpTXWithOnExceptionA
private MockEndpoint rollback;
// the ok response to expect
- private String ok = "<?xml version=\"1.0\"?><reply><status>ok</status></reply>";
- private String nok = "<?xml version=\"1.0\"?><reply><status>nok</status></reply>";
+ private String ok = "<?xml version=\"1.0\"?><reply><status>ok</status></reply>";
private String noAccess = "<?xml version=\"1.0\"?><reply><status>Access denied</status></reply>";
@Test
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java?rev=938767&r1=938766&r2=938767&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java Wed Apr 28 03:39:23 2010
@@ -53,8 +53,7 @@ public class JmsToHttpTXWithOnExceptionT
private MockEndpoint rollback;
// the ok response to expect
- private String ok = "<?xml version=\"1.0\"?><reply><status>ok</status></reply>";
- private String nok = "<?xml version=\"1.0\"?><reply><status>nok</status></reply>";
+ private String ok = "<?xml version=\"1.0\"?><reply><status>ok</status></reply>";
private String noAccess = "<?xml version=\"1.0\"?><reply><status>Access denied</status></reply>";
@Test