svn commit: r991848 - in /camel/trunk: camel-core/src/test/java/org/apache/camel/component/file/ components/camel-spring/src/test/java/org/apache/camel/spring/management/

[da...@apache.org]

Author: davsclaus
Date: Thu Sep  2 08:12:52 2010
New Revision: 991848

URL: http://svn.apache.org/viewvc?rev=991848&view=rev
Log:
Fixed test on other boxes.

Modified:
    camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java

Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileTest.java?rev=991848&r1=991847&r2=991848&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumePollEnrichFileTest.java Thu Sep  2 08:12:52 2010
@@ -55,7 +55,7 @@ public class FileConsumePollEnrichFileTe
             public void configure() throws Exception {
                 from("file://target/enrich?move=.done")
                     .to("mock:start")
-                    .pollEnrich("file://target/enrichdata?move=.done")
+                    .pollEnrich("file://target/enrichdata?move=.done", 5000)
                     .to("mock:result");
             }
         };

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java?rev=991848&r1=991847&r2=991848&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedAutoAssignedNameTest.java Thu Sep  2 08:12:52 2010
@@ -48,7 +48,7 @@ public class DualCamelContextManagedAuto
         assertTrue("Route 2 is missing", on1.getCanonicalName().contains("route2") || on2.getCanonicalName().contains("route2"));
 
         set = mbeanServer.queryNames(new ObjectName("*:type=endpoints,*"), null);
-        assertEquals(7, set.size());
+        assertTrue("Size should be 7 or higher, was: " + set.size(), set.size() >= 7);
 
         for (ObjectName on : set) {
             String name = on.getCanonicalName();

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java?rev=991848&r1=991847&r2=991848&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java Thu Sep  2 08:12:52 2010
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.spring.management;
 
-import org.apache.camel.FailedToCreateRouteException;
 import org.apache.camel.ResolveEndpointFailedException;
 import org.apache.camel.spring.SpringTestSupport;
 import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -33,9 +32,8 @@ public class SpringCamelContextStartingF
     }
 
     protected AbstractXmlApplicationContext createApplicationContext() {
-        AbstractXmlApplicationContext answer = null;
         try {
-            answer = new ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.xml");
+            new ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.xml");
             fail("Should thrown an exception");
         } catch (Exception e) {
             assertIsInstanceOf(ResolveEndpointFailedException.class, e.getCause().getCause());
@@ -43,8 +41,7 @@ public class SpringCamelContextStartingF
         }
 
         // fallback to load another file that works
-        answer = new ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringManagedErrorHandlerTest.xml");
-        return answer;
+        return new ClassPathXmlApplicationContext("/org/apache/camel/spring/disableJmxConfig.xml");
     }
 
     public void testReady() {