You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2017/11/10 18:17:34 UTC
[camel] 02/02: camel-sql: speed-up test be reducing consume delays
and sleep times
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 55da3fad43fe48aed6aa9845b0cba82bd99abe83
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Fri Nov 10 19:17:20 2017 +0100
camel-sql: speed-up test be reducing consume delays and sleep times
---
.../camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java | 6 +++---
.../apache/camel/component/sql/SqlConsumerDeleteFailedTest.java | 5 +++--
.../org/apache/camel/component/sql/SqlConsumerDeleteTest.java | 6 +++---
.../camel/component/sql/SqlConsumerDeleteTransformTest.java | 6 +++---
.../camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java | 2 +-
.../camel/component/sql/SqlConsumerOutputTypeSelectListTest.java | 2 +-
.../sql/SqlConsumerOutputTypeSelectListWithClassTest.java | 2 +-
.../camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java | 8 ++++----
.../camel/component/sql/SqlConsumerOutputTypeStreamListTest.java | 6 +++---
.../test/java/org/apache/camel/component/sql/SqlConsumerTest.java | 2 +-
.../sql/SqlProducerAlwaysPopulateStatementFalseTest.java | 2 +-
.../component/sql/SqlProducerAlwaysPopulateStatementTest.java | 2 +-
.../aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java | 8 ++++----
.../jdbc/JdbcAggregateNotLostRemovedWhenConfirmedTest.java | 2 --
.../camel/processor/aggregate/jdbc/JdbcAggregateNotLostTest.java | 2 --
15 files changed, 29 insertions(+), 32 deletions(-)
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java
index 1c67af8..c7d0a63 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteBatchCompleteTest.java
@@ -61,8 +61,8 @@ public class SqlConsumerDeleteBatchCompleteTest extends CamelTestSupport {
// 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);
+ // give it a little time to delete
+ Thread.sleep(200);
int rows = jdbcTemplate.queryForObject("select count(*) from projects", Integer.class);
if (rows == 0) {
break;
@@ -78,7 +78,7 @@ public class SqlConsumerDeleteBatchCompleteTest extends CamelTestSupport {
public void configure() throws Exception {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
- from("sql:select * from projects order by id?consumer.onConsumeBatchComplete=delete from projects")
+ from("sql:select * from projects order by id?consumer.initialDelay=0&consumer.delay=50&consumer.onConsumeBatchComplete=delete from projects")
.to("mock:result");
}
};
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java
index 6798145..224da1a 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteFailedTest.java
@@ -73,7 +73,7 @@ public class SqlConsumerDeleteFailedTest extends CamelTestSupport {
assertEquals("Linux", exchanges.get(1).getIn().getBody(Map.class).get("PROJECT"));
// give it a little tine to delete
- Thread.sleep(2000);
+ Thread.sleep(500);
assertEquals("Should have deleted 2 rows", new Integer(1), jdbcTemplate.queryForObject("select count(*) from projects", Integer.class));
assertEquals("Should be AMQ project that is BAD", "AMQ", jdbcTemplate.queryForObject("select PROJECT from projects where license = 'BAD'", String.class));
@@ -87,7 +87,8 @@ public class SqlConsumerDeleteFailedTest extends CamelTestSupport {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
from("sql:select * from projects where license <> 'BAD' order by id"
- + "?consumer.onConsume=delete from projects where id = :#id"
+ + "?consumer.initialDelay=0&consumer.delay=50"
+ + "&consumer.onConsume=delete from projects where id = :#id"
+ "&consumer.onConsumeFailed=update projects set license = 'BAD' where id = :#id")
.process(new Processor() {
@Override
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java
index 3213556..2b2be89 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTest.java
@@ -75,8 +75,8 @@ public class SqlConsumerDeleteTest extends CamelTestSupport {
// 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);
+ // give it a little time to delete
+ Thread.sleep(200);
int rows = jdbcTemplate.queryForObject("select count(*) from projects", Integer.class);
if (rows == 0) {
break;
@@ -92,7 +92,7 @@ public class SqlConsumerDeleteTest extends CamelTestSupport {
public void configure() throws Exception {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
- from("sql:select * from projects order by id?consumer.onConsume=delete from projects where id = :#id")
+ from("sql:select * from projects order by id?consumer.initialDelay=0&consumer.delay=50&consumer.onConsume=delete from projects where id = :#id")
.to("mock:result");
}
};
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java
index 2660984..6397f5c 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerDeleteTransformTest.java
@@ -61,8 +61,8 @@ public class SqlConsumerDeleteTransformTest extends CamelTestSupport {
// 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);
+ // give it a little time to delete
+ Thread.sleep(200);
int rows = jdbcTemplate.queryForObject("select count(*) from projects", Integer.class);
if (rows == 0) {
break;
@@ -80,7 +80,7 @@ public class SqlConsumerDeleteTransformTest extends CamelTestSupport {
// even if we transform the exchange we can still do onConsume as we have the original data at
// the point when onConsume is executed
- from("sql:select * from projects order by id?consumer.onConsume=delete from projects where id = :#id")
+ from("sql:select * from projects order by id?consumer.initialDelay=0&consumer.delay=50&consumer.onConsume=delete from projects where id = :#id")
.transform().simple("The project is ${body[project]}")
.to("mock:result");
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java
index 51a7bb0..6735137 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerMaxMessagesPerPollTest.java
@@ -92,7 +92,7 @@ public class SqlConsumerMaxMessagesPerPollTest extends CamelTestSupport {
getContext().setTracing(true);
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
- from("sql:select * from projects where processed = false order by id?maxMessagesPerPoll=2")
+ from("sql:select * from projects where processed = false order by id?maxMessagesPerPoll=2&consumer.initialDelay=0&consumer.delay=50")
.to("mock:result")
.to("sql:update projects set processed = true where id = :#id");
}
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java
index b5b451c..ac0c75f 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListTest.java
@@ -83,7 +83,7 @@ public class SqlConsumerOutputTypeSelectListTest extends CamelTestSupport {
public void configure() throws Exception {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
- from("sql:select * from projects order by id?outputType=SelectList")
+ from("sql:select * from projects order by id?outputType=SelectList&consumer.initialDelay=0&consumer.delay=50")
.to("mock:result");
}
};
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java
index 538d237..11d9a0a 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectListWithClassTest.java
@@ -84,7 +84,7 @@ public class SqlConsumerOutputTypeSelectListWithClassTest extends CamelTestSuppo
public void configure() throws Exception {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
- from("sql:select * from projects order by id?outputType=SelectList&outputClass=org.apache.camel.component.sql.ProjectModel")
+ from("sql:select * from projects order by id?outputType=SelectList&outputClass=org.apache.camel.component.sql.ProjectModel&consumer.initialDelay=0&consumer.delay=50")
.to("mock:result");
}
};
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
index a74bf2d..192b39e 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeSelectOneTest.java
@@ -61,7 +61,7 @@ public class SqlConsumerOutputTypeSelectOneTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sql:select * from projects where id=3?outputType=SelectOne&outputClass=org.apache.camel.component.sql.ProjectModel")
+ from("sql:select * from projects where id=3?outputType=SelectOne&outputClass=org.apache.camel.component.sql.ProjectModel&consumer.initialDelay=0&consumer.delay=50")
.to("mock:result");
}
});
@@ -85,7 +85,7 @@ public class SqlConsumerOutputTypeSelectOneTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sql:select * from projects where id=3?outputType=SelectOne")
+ from("sql:select * from projects where id=3?outputType=SelectOne&consumer.initialDelay=0&consumer.delay=50")
.to("mock:result");
}
});
@@ -109,7 +109,7 @@ public class SqlConsumerOutputTypeSelectOneTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sql:select project from projects where id=3?outputType=SelectOne")
+ from("sql:select project from projects where id=3?outputType=SelectOne&consumer.initialDelay=0&consumer.delay=50")
.to("mock:result");
}
});
@@ -131,7 +131,7 @@ public class SqlConsumerOutputTypeSelectOneTest {
camel1.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("sql:select count(*) from projects?outputType=SelectOne")
+ from("sql:select count(*) from projects?outputType=SelectOne&consumer.initialDelay=0&consumer.delay=50")
.to("mock:result");
}
});
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java
index d59d141..e4ba65a 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerOutputTypeStreamListTest.java
@@ -97,18 +97,18 @@ public class SqlConsumerOutputTypeStreamListTest extends CamelTestSupport {
public void configure() {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
- from("sql:select * from projects order by id?outputType=StreamList").routeId("route1").noAutoStartup()
+ from("sql:select * from projects order by id?outputType=StreamList&consumer.initialDelay=0&consumer.delay=50").routeId("route1").noAutoStartup()
.to("log:stream")
.to("mock:result");
- from("sql:select * from projects order by id?outputType=StreamList").routeId("route2").noAutoStartup()
+ from("sql:select * from projects order by id?outputType=StreamList&consumer.initialDelay=0&consumer.delay=50").routeId("route2").noAutoStartup()
.to("log:stream")
.split(body()).streaming()
.to("log:row")
.to("mock:result")
.end();
- from("sql:select * from projects order by id?outputType=StreamList&outputClass=org.apache.camel.component.sql.ProjectModel").routeId("route3").noAutoStartup()
+ from("sql:select * from projects order by id?outputType=StreamList&outputClass=org.apache.camel.component.sql.ProjectModel&consumer.initialDelay=0&consumer.delay=50").routeId("route3").noAutoStartup()
.to("log:stream")
.split(body()).streaming()
.to("log:row")
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java
index 69e23ec..a4eaa4a 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlConsumerTest.java
@@ -77,7 +77,7 @@ public class SqlConsumerTest extends CamelTestSupport {
public void configure() throws Exception {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
- from("sql:select * from projects order by id")
+ from("sql:select * from projects order by id?consumer.initialDelay=0&consumer.delay=50")
.to("mock:result");
}
};
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
index bb7d48b..4a9c5f1 100755
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementFalseTest.java
@@ -99,7 +99,7 @@ public class SqlProducerAlwaysPopulateStatementFalseTest extends CamelTestSuppor
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
from("direct:start")
- .to("sql:select * from projects where license = 'ASF' order by id?alwaysPopulateStatement=false&prepareStatementStrategy=#myStrategy")
+ .to("sql:select * from projects where license = 'ASF' order by id?alwaysPopulateStatement=false&prepareStatementStrategy=#myStrategy&consumer.initialDelay=0&consumer.delay=50")
.to("mock:result");
}
};
diff --git a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
index 0b813a6..0d37d3e 100755
--- a/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerAlwaysPopulateStatementTest.java
@@ -99,7 +99,7 @@ public class SqlProducerAlwaysPopulateStatementTest extends CamelTestSupport {
getContext().getComponent("sql", SqlComponent.class).setDataSource(db);
from("direct:start")
- .to("sql:select * from projects where license = 'ASF' order by id?alwaysPopulateStatement=true&prepareStatementStrategy=#myStrategy")
+ .to("sql:select * from projects where license = 'ASF' order by id?alwaysPopulateStatement=true&prepareStatementStrategy=#myStrategy&consumer.initialDelay=0&consumer.delay=50")
.to("mock:result");
}
};
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java
index 361e271..1cb8a85 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateDiscardOnTimeoutTest.java
@@ -32,8 +32,8 @@ public class JdbcAggregateDiscardOnTimeoutTest extends AbstractJdbcAggregationTe
template.sendBodyAndHeader("direct:start", "A", "id", 123);
template.sendBodyAndHeader("direct:start", "B", "id", 123);
- // wait 4 seconds
- Thread.sleep(4000);
+ // wait 2 seconds
+ Thread.sleep(2000);
mock.assertIsSatisfied();
@@ -57,8 +57,8 @@ public class JdbcAggregateDiscardOnTimeoutTest extends AbstractJdbcAggregationTe
from("direct:start")
.aggregate(header("id"), new MyAggregationStrategy())
.completionSize(3).aggregationRepository(repo)
- // use a 2 second timeout
- .completionTimeout(2000)
+ // use a 1 second timeout
+ .completionTimeout(1000)
// and if timeout occurred then just discard the aggregated message
.discardOnCompletionTimeout()
.to("mock:aggregated");
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostRemovedWhenConfirmedTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostRemovedWhenConfirmedTest.java
index 514357f..d084896 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostRemovedWhenConfirmedTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostRemovedWhenConfirmedTest.java
@@ -36,8 +36,6 @@ public class JdbcAggregateNotLostRemovedWhenConfirmedTest extends AbstractJdbcAg
assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
- Thread.sleep(1000);
-
String exchangeId = getMockEndpoint("mock:result").getReceivedExchanges().get(0).getExchangeId();
// the exchange should NOT be in the completed repo as it was confirmed
diff --git a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostTest.java b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostTest.java
index 35f9645..0c75a88 100644
--- a/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostTest.java
+++ b/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateNotLostTest.java
@@ -37,8 +37,6 @@ public class JdbcAggregateNotLostTest extends AbstractJdbcAggregationTestSupport
assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
- Thread.sleep(1000);
-
String exchangeId = getMockEndpoint("mock:aggregated").getReceivedExchanges().get(0).getExchangeId();
// the exchange should be in the completed repo where we should be able to find it
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.