Author: davsclaus Date: Sat Apr 10 08:36:15 2010 New Revision: 932676 URL: http://svn.apache.org/viewvc?rev=932676&view=rev Log: Fixed test on other boxes.
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockLockFileTest.java camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockNoneTest.java camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockRenameTest.java camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressTest.java camel/trunk/camel-core/src/test/java/org/apache/camel/util/StopWatchTest.java camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosConfiguraitonRefTest.java camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockLockFileTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockLockFileTest.java?rev=932676&r1=932675&r2=932676&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockLockFileTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockLockFileTest.java Sat Apr 10 08:36:15 2010 @@ -41,7 +41,7 @@ public class FileAsyncStressReadLockLock public void process(Exchange exchange) throws Exception { // simulate some work with random time to complete Random ran = new Random(); - int delay = ran.nextInt(500) + 10; + int delay = ran.nextInt(250) + 10; Thread.sleep(delay); } }).to("mock:result"); Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockNoneTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockNoneTest.java?rev=932676&r1=932675&r2=932676&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockNoneTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockNoneTest.java Sat Apr 10 08:36:15 2010 @@ -41,7 +41,7 @@ public class FileAsyncStressReadLockNone public void process(Exchange exchange) throws Exception { // simulate some work with random time to complete Random ran = new Random(); - int delay = ran.nextInt(500) + 10; + int delay = ran.nextInt(250) + 10; Thread.sleep(delay); } }).to("mock:result"); Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockRenameTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockRenameTest.java?rev=932676&r1=932675&r2=932676&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockRenameTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressReadLockRenameTest.java Sat Apr 10 08:36:15 2010 @@ -41,7 +41,7 @@ public class FileAsyncStressReadLockRena public void process(Exchange exchange) throws Exception { // simulate some work with random time to complete Random ran = new Random(); - int delay = ran.nextInt(500) + 10; + int delay = ran.nextInt(250) + 10; Thread.sleep(delay); } }).to("mock:result"); Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressTest.java?rev=932676&r1=932675&r2=932676&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/stress/FileAsyncStressTest.java Sat Apr 10 08:36:15 2010 @@ -61,7 +61,7 @@ public class FileAsyncStressTest extends public void process(Exchange exchange) throws Exception { // simulate some work with random time to complete Random ran = new Random(); - int delay = ran.nextInt(500) + 10; + int delay = ran.nextInt(250) + 10; Thread.sleep(delay); } }).to("mock:result"); Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/util/StopWatchTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/StopWatchTest.java?rev=932676&r1=932675&r2=932676&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/util/StopWatchTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/util/StopWatchTest.java Sat Apr 10 08:36:15 2010 @@ -29,7 +29,7 @@ public class StopWatchTest extends TestC long taken = watch.stop(); assertEquals(taken, watch.taken()); - assertTrue("Should take approx 200 millis, was: " + taken, taken > 190); + assertTrue("Should take approx 200 millis, was: " + taken, taken > 150); } public void testStopWatchNotStarted() throws Exception { @@ -42,7 +42,7 @@ public class StopWatchTest extends TestC taken = watch.stop(); assertEquals(taken, watch.taken()); - assertTrue("Should take approx 200 millis, was: " + taken, taken > 190); + assertTrue("Should take approx 200 millis, was: " + taken, taken > 150); } public void testStopWatchRestart() throws Exception { @@ -51,14 +51,14 @@ public class StopWatchTest extends TestC long taken = watch.stop(); assertEquals(taken, watch.taken()); - assertTrue("Should take approx 200 millis, was: " + taken, taken > 190); + assertTrue("Should take approx 200 millis, was: " + taken, taken > 150); watch.restart(); Thread.sleep(100); taken = watch.stop(); assertEquals(taken, watch.taken()); - assertTrue("Should take approx 100 millis, was: " + taken, taken > 90); + assertTrue("Should take approx 100 millis, was: " + taken, taken > 50); } public void testStopWatchTaken() throws Exception { Modified: camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosConfiguraitonRefTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosConfiguraitonRefTest.java?rev=932676&r1=932675&r2=932676&view=diff ============================================================================== --- camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosConfiguraitonRefTest.java (original) +++ camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosConfiguraitonRefTest.java Sat Apr 10 08:36:15 2010 @@ -37,7 +37,7 @@ public class NagiosConfiguraitonRefTest @Before @Override public void setUp() throws Exception { - nagios = new NagiosNscaStub(25667, "secret"); + nagios = new NagiosNscaStub(25668, "secret"); nagios.start(); super.setUp(); @@ -55,7 +55,7 @@ public class NagiosConfiguraitonRefTest NagiosConfiguration config = new NagiosConfiguration(); config.setPassword("secret"); config.setHost("127.0.0.1"); - config.setPort(25667); + config.setPort(25668); JndiRegistry jndi = super.createRegistry(); jndi.bind("nagiosConf", config); Modified: camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java?rev=932676&r1=932675&r2=932676&view=diff ============================================================================== --- camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java (original) +++ camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java Sat Apr 10 08:36:15 2010 @@ -42,7 +42,7 @@ public class NagiosEventNotifierTest ext @Before @Override public void setUp() throws Exception { - nagios = new NagiosNscaStub(25667, "password"); + nagios = new NagiosNscaStub(25669, "password"); nagios.start(); super.setUp(); @@ -59,7 +59,7 @@ public class NagiosEventNotifierTest ext protected CamelContext createCamelContext() throws Exception { NagiosEventNotifier notifier = new NagiosEventNotifier(); notifier.getConfiguration().setHost("localhost"); - notifier.getConfiguration().setPort(25667); + notifier.getConfiguration().setPort(25669); notifier.getConfiguration().setPassword("password"); CamelContext context = super.createCamelContext(); @@ -78,7 +78,7 @@ public class NagiosEventNotifierTest ext context.stop(); List<MessagePayload> events = nagios.getMessagePayloadList(); - assertTrue("Should be 12+ events, was: " + events.size(), events.size() >= 12); + assertTrue("Should be 11+ events, was: " + events.size(), events.size() >= 11); } @Test @@ -92,7 +92,7 @@ public class NagiosEventNotifierTest ext context.stop(); List<MessagePayload> events = nagios.getMessagePayloadList(); - assertTrue("Should be 10+ events, was: " + events.size(), events.size() >= 10); + assertTrue("Should be 9+ events, was: " + events.size(), events.size() >= 9); } @Override