camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r905534 - in /camel/trunk: components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/ parent/
Date Tue, 02 Feb 2010 06:59:48 GMT
Author: davsclaus
Date: Tue Feb  2 06:59:46 2010
New Revision: 905534

URL: http://svn.apache.org/viewvc?rev=905534&view=rev
Log:
Upgraded to OpenJPA 1.2.2. Fixed JPA tests on slower boxes.

Modified:
    camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaShutdownCompleteAllTasksTest.java
    camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaShutdownCompleteCurrentTaskOnlyTest.java
    camel/trunk/parent/pom.xml

Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaShutdownCompleteAllTasksTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaShutdownCompleteAllTasksTest.java?rev=905534&r1=905533&r2=905534&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaShutdownCompleteAllTasksTest.java
(original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaShutdownCompleteAllTasksTest.java
Tue Feb  2 06:59:46 2010
@@ -61,6 +61,9 @@
 
     @Test
     public void testCompleteAllTasks() throws Exception {
+        // give it 20 seconds to shutdown
+        context.getShutdownStrategy().setTimeout(20);
+
         context.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
@@ -76,7 +79,6 @@
 
         MockEndpoint bar = getMockEndpoint("mock:bar");
         bar.expectedMinimumMessageCount(1);
-        bar.setResultWaitTime(3000);
 
         assertMockEndpointsSatisfied();
 

Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaShutdownCompleteCurrentTaskOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaShutdownCompleteCurrentTaskOnlyTest.java?rev=905534&r1=905533&r2=905534&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaShutdownCompleteCurrentTaskOnlyTest.java
(original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaShutdownCompleteCurrentTaskOnlyTest.java
Tue Feb  2 06:59:46 2010
@@ -61,6 +61,9 @@
 
     @Test
     public void testCompleteCurrentTaskOnly() throws Exception {
+        // give it 20 seconds to shutdown
+        context.getShutdownStrategy().setTimeout(20);
+
         context.addRoutes(new RouteBuilder() {
             @Override
             public void configure() throws Exception {
@@ -76,7 +79,6 @@
 
         MockEndpoint bar = getMockEndpoint("mock:bar");
         bar.expectedMinimumMessageCount(1);
-        bar.setResultWaitTime(3000);
 
         assertMockEndpointsSatisfied();
 

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=905534&r1=905533&r2=905534&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Feb  2 06:59:46 2010
@@ -87,7 +87,7 @@
     <mina-version>1.1.7</mina-version>
     <mockito-version>1.8.2</mockito-version>
     <ognl-version>2.7.3_1</ognl-version>
-    <openjpa-version>1.2.1</openjpa-version>
+    <openjpa-version>1.2.2</openjpa-version>
     <pax-exam-version>1.2.0</pax-exam-version>
     <pax-tiny-bundle-version>1.2.0</pax-tiny-bundle-version>
     <qpid-version>0.5.0</qpid-version>



Mime
View raw message