Author: davsclaus
Date: Thu Sep 23 06:34:52 2010
New Revision: 1000333
URL: http://svn.apache.org/viewvc?rev=1000333&view=rev
Log:
Fixed hanging test
Modified:
camel/trunk/examples/camel-example-loan-broker/pom.xml
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerServerTest.java
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerTest.java
camel/trunk/examples/camel-example-loan-broker/src/test/resources/log4j.properties
Modified: camel/trunk/examples/camel-example-loan-broker/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/pom.xml?rev=1000333&r1=1000332&r2=1000333&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-loan-broker/pom.xml (original)
+++ camel/trunk/examples/camel-example-loan-broker/pom.xml Thu Sep 23 06:34:52
2010
@@ -93,6 +93,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -142,7 +147,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <forkMode>once</forkMode>
+ <forkMode>pertest</forkMode>
<childDelegation>false</childDelegation>
<useFile>true</useFile>
<includes>
Modified:
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerServerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerServerTest.java?rev=1000333&r1=1000332&r2=1000333&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerServerTest.java
(original)
+++
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerServerTest.java
Thu Sep 23 06:34:52 2010
@@ -17,20 +17,24 @@
package org.apache.camel.loanbroker.queue.version;
import org.apache.camel.CamelContext;
-import org.junit.Assert;
+import org.apache.camel.test.junit4.TestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class LoanBrokerServerTest extends Assert {
+public class LoanBrokerServerTest extends TestSupport {
@Test
public void startLoanBroker() throws Exception {
- AbstractApplicationContext applicationContext =
+ deleteDirectory("activemq-data");
+
+ AbstractApplicationContext applicationContext =
new ClassPathXmlApplicationContext(new
String[]{"/META-INF/spring/queueCamelContext.xml"});
+
CamelContext camelContext =
(CamelContext)applicationContext.getBean("myCamel");
assertNotNull("The camel context should not be null", camelContext);
- Thread.sleep(2000);
+
+ Thread.sleep(2000);
camelContext.stop();
applicationContext.stop();
}
Modified:
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerTest.java?rev=1000333&r1=1000332&r2=1000333&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerTest.java
(original)
+++
camel/trunk/examples/camel-example-loan-broker/src/test/java/org/apache/camel/loanbroker/queue/version/LoanBrokerTest.java
Thu Sep 23 06:34:52 2010
@@ -17,7 +17,6 @@
package org.apache.camel.loanbroker.queue.version;
import java.util.List;
-
import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
@@ -30,19 +29,20 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
-
+import org.apache.camel.test.junit4.TestSupport;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-public class LoanBrokerTest extends Assert {
- CamelContext camelContext;
- JmsBroker broker;
- ProducerTemplate template;
+public class LoanBrokerTest extends TestSupport {
+ private CamelContext camelContext;
+ private JmsBroker broker;
+ private ProducerTemplate template;
@Before
public void startServices() throws Exception {
+ deleteDirectory("activemq-data");
+
camelContext = new DefaultCamelContext();
broker = new JmsBroker("vm://localhost");
broker.start();
@@ -67,7 +67,6 @@ public class LoanBrokerTest extends Asse
@After
public void stopServices() throws Exception {
-
if (camelContext != null) {
camelContext.stop();
}
@@ -76,7 +75,6 @@ public class LoanBrokerTest extends Asse
if (broker != null) {
broker.stop();
}
-
}
@Test
@@ -91,6 +89,7 @@ public class LoanBrokerTest extends Asse
Thread.sleep(100);
}
endpoint.assertIsSatisfied();
+
// check the response from the mock endpoint
List<Exchange> exchanges = endpoint.getExchanges();
int index = 0;
@@ -111,15 +110,14 @@ public class LoanBrokerTest extends Asse
}
});
- String bank =
(String)exchange.getOut().getHeader(Constants.PROPERTY_BANK);
- Double rate =
(Double)exchange.getOut().getHeader(Constants.PROPERTY_RATE);
- String ssn =
(String)exchange.getOut().getHeader(Constants.PROPERTY_SSN);
+ String bank = exchange.getOut().getHeader(Constants.PROPERTY_BANK,
String.class);
+ Double rate = exchange.getOut().getHeader(Constants.PROPERTY_RATE,
Double.class);
+ String ssn = exchange.getOut().getHeader(Constants.PROPERTY_SSN,
String.class);
assertNotNull("The ssn should not be null.", ssn);
assertEquals("Get a wrong ssn", "Client-B", ssn);
assertNotNull("The bank should not be null", bank);
assertNotNull("The rate should not be null", rate);
-
}
}
Modified:
camel/trunk/examples/camel-example-loan-broker/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/test/resources/log4j.properties?rev=1000333&r1=1000332&r2=1000333&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-loan-broker/src/test/resources/log4j.properties
(original)
+++
camel/trunk/examples/camel-example-loan-broker/src/test/resources/log4j.properties
Thu Sep 23 06:34:52 2010
@@ -34,5 +34,5 @@ log4j.appender.out.layout.ConversionPatt
log4j.appender.file=org.apache.log4j.FileAppender
log4j.appender.file.layout=org.apache.log4j.PatternLayout
log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} -
%m%n
-log4j.appender.file.file=target/camel-cxf-test.log
+log4j.appender.file.file=target/camel-loanbroaker-test.log
log4j.appender.file.append=true
