You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/06/08 12:04:30 UTC
svn commit: r782579 - in
/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest:
greeter/ jetty/ jms/
Author: davsclaus
Date: Mon Jun 8 10:04:29 2009
New Revision: 782579
URL: http://svn.apache.org/viewvc?rev=782579&view=rev
Log:
A little cleanup in camel-itest.
Modified:
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/greeter/CamelGreeterTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/GreeterImpl.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsPrepareRequest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsPrepareResponse.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/PrepareResponse.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/Server.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java
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=782579&r1=782578&r2=782579&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 Mon Jun 8 10:04:29 2009
@@ -19,15 +19,10 @@
import java.util.ArrayList;
import java.util.List;
-import javax.xml.ws.Endpoint;
-
import org.apache.camel.CamelContext;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.cxf.CxfConstants;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +36,6 @@
@Autowired
protected CamelContext camelContext;
-
public void testMocksAreValid() throws Exception {
assertNotNull(camelContext);
@@ -52,6 +46,8 @@
params, CxfConstants.OPERATION_NAME, "greetMe");
assertTrue("Result is a list instance ", result instanceof List);
assertEquals("Get the wrong response", ((List)result).get(0), "HelloWillem");
+
+ template.stop();
}
}
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=782579&r1=782578&r2=782579&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 Mon Jun 8 10:04:29 2009
@@ -43,14 +43,12 @@
private Endpoint endpoint;
-
protected void setUp() throws Exception {
// Start the Greeter Server
Object implementor = new GreeterImpl();
String address = "http://localhost:9000/SoapContext/SoapPort";
endpoint = Endpoint.publish(address, implementor);
LOG.info("The WS endpoint is published! ");
-
}
protected void tearDown() throws Exception {
@@ -60,8 +58,6 @@
}
}
-
-
public void testMocksAreValid() throws Exception {
assertNotNull(camelContext);
assertNotNull(resultEndpoint);
@@ -71,6 +67,7 @@
// Sleep a while and wait for the message whole processing
Thread.sleep(4000);
+ template.stop();
MockEndpoint.assertIsSatisfied(camelContext);
List<Exchange> list = resultEndpoint.getReceivedExchanges();
@@ -79,8 +76,6 @@
String result = (String) exchange.getIn().getBody();
assertEquals("Get the wrong result ", result, "Hello Willem");
}
-
-
}
}
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/GreeterImpl.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/GreeterImpl.java?rev=782579&r1=782578&r2=782579&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/GreeterImpl.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/GreeterImpl.java Mon Jun 8 10:04:29 2009
@@ -32,31 +32,22 @@
private static final Logger LOG =
Logger.getLogger(GreeterImpl.class.getPackage().getName());
- /* (non-Javadoc)
- * @see org.apache.hello_world_soap_http.Greeter#greetMe(java.lang.String)
- */
public String greetMe(String me) {
LOG.info("Executing operation greetMe");
- System.out.println("Executing operation greetMe");
- System.out.println("Message received: " + me + "\n");
+ LOG.info("Executing operation greetMe");
+ LOG.info("Message received: " + me + "\n");
return "Hello " + me;
}
- /* (non-Javadoc)
- * @see org.apache.hello_world_soap_http.Greeter#greetMeOneWay(java.lang.String)
- */
public void greetMeOneWay(String me) {
LOG.info("Executing operation greetMeOneWay");
- System.out.println("Executing operation greetMeOneWay\n");
- System.out.println("Hello there " + me);
+ LOG.info("Executing operation greetMeOneWay\n");
+ LOG.info("Hello there " + me);
}
- /* (non-Javadoc)
- * @see org.apache.hello_world_soap_http.Greeter#sayHi()
- */
public String sayHi() {
LOG.info("Executing operation sayHi");
- System.out.println("Executing operation sayHi\n");
+ LOG.info("Executing operation sayHi\n");
return "Bonjour";
}
@@ -66,7 +57,7 @@
faultDetail.setMinor((short)1);
LOG.info("Executing operation pingMe, throwing PingMeFault exception, message = "
+ messageIn);
- System.out.println("Executing operation pingMe, throwing PingMeFault exception\n");
+ LOG.info("Executing operation pingMe, throwing PingMeFault exception\n");
throw new PingMeFault("PingMeFault raised by server", faultDetail);
}
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsPrepareRequest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsPrepareRequest.java?rev=782579&r1=782578&r2=782579&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsPrepareRequest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsPrepareRequest.java Mon Jun 8 10:04:29 2009
@@ -16,17 +16,10 @@
*/
package org.apache.camel.itest.greeter;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.component.cxf.CxfConstants;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
public class JmsPrepareRequest implements Processor {
- private static final transient Log LOG = LogFactory.getLog(JmsPrepareRequest.class);
public void process(Exchange exchange) throws Exception {
String request = exchange.getIn().getBody(String.class);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsPrepareResponse.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsPrepareResponse.java?rev=782579&r1=782578&r2=782579&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsPrepareResponse.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsPrepareResponse.java Mon Jun 8 10:04:29 2009
@@ -20,6 +20,7 @@
import org.apache.camel.Processor;
public class JmsPrepareResponse implements Processor {
+
public void process(Exchange exchange) throws Exception {
String request = exchange.getIn().getBody(String.class);
exchange.getOut().setBody("Hello" + request);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/PrepareResponse.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/PrepareResponse.java?rev=782579&r1=782578&r2=782579&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/PrepareResponse.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/PrepareResponse.java Mon Jun 8 10:04:29 2009
@@ -20,6 +20,7 @@
import org.apache.camel.Processor;
public class PrepareResponse implements Processor {
+
public void process(Exchange exchange) throws Exception {
Object[] result = exchange.getIn().getBody(Object[].class);
exchange.getOut().setBody(result[0]);
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/Server.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/Server.java?rev=782579&r1=782578&r2=782579&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/Server.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/Server.java Mon Jun 8 10:04:29 2009
@@ -26,7 +26,6 @@
Object implementor = new GreeterImpl();
String address = "http://cxf.apache.org/transports/jms";
endpoint = Endpoint.publish(address, implementor);
-
}
public void stop() {
@@ -35,7 +34,6 @@
}
}
-
public static void main(String args[]) throws Exception {
Server server = new Server();
System.out.println("Server ready...");
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java?rev=782579&r1=782578&r2=782579&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyFileMulticastTest.java Mon Jun 8 10:04:29 2009
@@ -52,6 +52,7 @@
// Sleep a while and wait for the message whole processing
Thread.sleep(2000);
+ template.stop();
MockEndpoint.assertIsSatisfied(camelContext);
List<Exchange> resultExchanges = resultEndpoint.getReceivedExchanges();
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java?rev=782579&r1=782578&r2=782579&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTest.java Mon Jun 8 10:04:29 2009
@@ -62,6 +62,7 @@
// Sleep a while and wait for the message whole processing
Thread.sleep(4000);
+ template.stop();
MockEndpoint.assertIsSatisfied(camelContext);
List<Exchange> list = resultEndpoint.getReceivedExchanges();
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java?rev=782579&r1=782578&r2=782579&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jetty/JettyJmsTwowayTest.java Mon Jun 8 10:04:29 2009
@@ -41,7 +41,7 @@
});
assertEquals("get result ", "<response><hello>Willem</hello></response>", exchange.getOut().getBody(String.class));
+ template.stop();
Thread.sleep(2000);
-
}
}
Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java?rev=782579&r1=782578&r2=782579&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/FileToJmsTest.java Mon Jun 8 10:04:29 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.itest.jms;
import org.apache.camel.EndpointInject;
@@ -25,9 +24,6 @@
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
-/**
- *
- */
@ContextConfiguration
public class FileToJmsTest extends AbstractJUnit38SpringContextTests {