Author: davsclaus
Date: Sat Mar 23 08:28:30 2013
New Revision: 1460118
URL: http://svn.apache.org/r1460118
Log:
Fixed test on slower boxes
Modified:
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java
Modified:
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java?rev=1460118&r1=1460117&r2=1460118&view=diff
==============================================================================
---
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java
(original)
+++
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java
Sat Mar 23 08:28:30 2013
@@ -59,9 +59,15 @@ public class SqlConsumerDeleteBatchCompl
assertMockEndpointsSatisfied();
- // give it a little tine to delete
- Thread.sleep(1000);
-
+ // some servers may be a bit slow for this
+ for (int i = 0; i < 5; i++) {
+ // give it a little tine to delete
+ Thread.sleep(1000);
+ int rows = jdbcTemplate.queryForInt("select count(*) from
projects");
+ if (rows == 0) {
+ break;
+ }
+ }
assertEquals("Should have deleted all 3 rows", 0,
jdbcTemplate.queryForInt("select count(*) from projects"));
}
Modified:
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java?rev=1460118&r1=1460117&r2=1460118&view=diff
==============================================================================
---
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java
(original)
+++
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java
Sat Mar 23 08:28:30 2013
@@ -73,7 +73,7 @@ public class SqlConsumerDeleteFailedTest
assertEquals("Linux",
exchanges.get(1).getIn().getBody(Map.class).get("PROJECT"));
// give it a little tine to delete
- Thread.sleep(1000);
+ Thread.sleep(2000);
assertEquals("Should have deleted 2 rows", 1,
jdbcTemplate.queryForInt("select count(*) from projects"));
assertEquals("Should be AMQ project that is BAD", "AMQ",
jdbcTemplate.queryForObject("select PROJECT from projects where license =
'BAD'", String.class));
Modified:
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java?rev=1460118&r1=1460117&r2=1460118&view=diff
==============================================================================
---
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java
(original)
+++
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java
Sat Mar 23 08:28:30 2013
@@ -73,9 +73,15 @@ public class SqlConsumerDeleteTest exten
assertEquals(3, exchanges.get(2).getIn().getBody(Map.class).get("ID"));
assertEquals("Linux",
exchanges.get(2).getIn().getBody(Map.class).get("PROJECT"));
- // give it a little tine to delete
- Thread.sleep(1000);
-
+ // some servers may be a bit slow for this
+ for (int i = 0; i < 5; i++) {
+ // give it a little tine to delete
+ Thread.sleep(1000);
+ int rows = jdbcTemplate.queryForInt("select count(*) from
projects");
+ if (rows == 0) {
+ break;
+ }
+ }
assertEquals("Should have deleted all 3 rows", 0,
jdbcTemplate.queryForInt("select count(*) from projects"));
}
Modified:
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java?rev=1460118&r1=1460117&r2=1460118&view=diff
==============================================================================
---
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java
(original)
+++
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java
Sat Mar 23 08:28:30 2013
@@ -59,9 +59,15 @@ public class SqlConsumerDeleteTransformT
assertMockEndpointsSatisfied();
- // give it a little tine to delete
- Thread.sleep(1000);
-
+ // some servers may be a bit slow for this
+ for (int i = 0; i < 5; i++) {
+ // give it a little tine to delete
+ Thread.sleep(1000);
+ int rows = jdbcTemplate.queryForInt("select count(*) from
projects");
+ if (rows == 0) {
+ break;
+ }
+ }
assertEquals("Should have deleted all 3 rows", 0,
jdbcTemplate.queryForInt("select count(*) from projects"));
}
