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 2011/02/15 09:16:29 UTC
svn commit: r1070802 - in /camel/trunk/tests:
camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/
camel-itest/src/test/java/org/apache/camel/itest/greeter/
camel-itest/src/test/java/org/apache/camel/itest/http/
camel-itest/src/test/java/org/a...
Author: ningjiang
Date: Tue Feb 15 08:16:29 2011
New Revision: 1070802
URL: http://svn.apache.org/viewvc?rev=1070802&view=rev
Log:
Fixed the CS errors of tests
Modified:
camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpTestServer.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java?rev=1070802&r1=1070801&r2=1070802&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java (original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java Tue Feb 15 08:16:29 2011
@@ -20,14 +20,14 @@ import org.apache.camel.CamelContext;
import org.apache.camel.impl.DefaultRouteContext;
import org.apache.camel.model.DataFormatDefinition;
import org.apache.camel.osgi.CamelContextFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Before;
import org.ops4j.pax.exam.Inject;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.options.UrlReference;
import org.osgi.framework.BundleContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.junit.Assert.assertNotNull;
import static org.ops4j.pax.exam.CoreOptions.equinox;
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java?rev=1070802&r1=1070801&r2=1070802&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelFileGreeterOneWayTest.java Tue Feb 15 08:16:29 2011
@@ -23,11 +23,11 @@ import javax.xml.ws.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java?rev=1070802&r1=1070801&r2=1070802&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/CamelGreeterTest.java Tue Feb 15 08:16:29 2011
@@ -17,6 +17,7 @@
package org.apache.camel.itest.greeter;
import java.util.List;
+
import javax.xml.ws.Endpoint;
import org.apache.camel.CamelContext;
@@ -25,18 +26,17 @@ import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.cxf.CxfConstants;
import org.apache.camel.component.mock.MockEndpoint;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
@ContextConfiguration
public class CamelGreeterTest extends AbstractJUnit4SpringContextTests {
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpTestServer.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpTestServer.java?rev=1070802&r1=1070801&r2=1070802&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpTestServer.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/http/HttpTestServer.java Tue Feb 15 08:16:29 2011
@@ -69,7 +69,7 @@ public class HttpTestServer {
* on hosts that map "localhost" to an IPv6 address or something else.
* The port is 0 to let the system pick one.
*/
- public final static InetSocketAddress TEST_SERVER_ADDR =
+ public static final InetSocketAddress TEST_SERVER_ADDR =
new InetSocketAddress("localhost", 18080);
/** The request handler registry. */
@@ -120,8 +120,8 @@ public class HttpTestServer {
this.workers = Collections.synchronizedSet(new HashSet<Worker>());
this.httpservice = new HttpService(
proc != null ? proc : newProcessor(),
- reuseStrat != null ? reuseStrat: newConnectionReuseStrategy(),
- responseFactory != null ? responseFactory: newHttpResponseFactory(),
+ reuseStrat != null ? reuseStrat : newConnectionReuseStrategy(),
+ responseFactory != null ? responseFactory : newHttpResponseFactory(),
handlerRegistry,
expectationVerifier,
params != null ? params : newDefaultParams());
@@ -159,13 +159,10 @@ public class HttpTestServer {
* @return a protocol processor for server-side use
*/
protected HttpProcessor newProcessor() {
- return new ImmutableHttpProcessor(
- new HttpResponseInterceptor[] {
- new ResponseDate(),
- new ResponseServer(),
- new ResponseContent(),
- new ResponseConnControl()
- });
+ return new ImmutableHttpProcessor(new HttpResponseInterceptor[] {new ResponseDate(),
+ new ResponseServer(),
+ new ResponseContent(),
+ new ResponseConnControl()});
}
@@ -273,7 +270,7 @@ public class HttpTestServer {
t.shutdown();
}
synchronized (workers) {
- for (Iterator<Worker> it = workers.iterator(); it.hasNext(); ) {
+ for (Iterator<Worker> it = workers.iterator(); it.hasNext();) {
Worker worker = it.next();
worker.shutdown();
}
@@ -291,10 +288,11 @@ public class HttpTestServer {
ServerSocket ssock = servicedSocket; // avoid synchronization
StringBuilder sb = new StringBuilder(80);
sb.append("LocalTestServer/");
- if (ssock == null)
+ if (ssock == null) {
sb.append("stopped");
- else
+ } else {
sb.append(ssock.getLocalSocketAddress());
+ }
return sb.toString();
}
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java?rev=1070802&r1=1070801&r2=1070802&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java Tue Feb 15 08:16:29 2011
@@ -18,6 +18,7 @@ package org.apache.camel.itest.jms;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+
import javax.jms.ConnectionFactory;
import javax.naming.Context;
@@ -26,11 +27,11 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jndi.JndiContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java?rev=1070802&r1=1070801&r2=1070802&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsResequencerTest.java Tue Feb 15 08:16:29 2011
@@ -32,10 +32,10 @@ import org.apache.camel.component.mock.M
import org.apache.camel.model.config.BatchResequencerConfig;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jndi.JndiContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.junit.Before;
import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JmsResequencerTest extends CamelTestSupport {