Author: hadrian
Date: Thu Dec 1 05:07:50 2011
New Revision: 1208953
URL: http://svn.apache.org/viewvc?rev=1208953&view=rev
Log:
Minor test fixes
Modified:
camel/trunk/tests/camel-itest/pom.xml
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/hawtdb/JmsToHawtDBAggregateTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/hawtdb/JmsToHawtDBRoute.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/idempotent/JdbcIdempotentRepository.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/idempotent/JdbcTableService.java
camel/trunk/tests/camel-itest/src/test/resources/users.properties
Modified: camel/trunk/tests/camel-itest/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/pom.xml?rev=1208953&r1=1208952&r2=1208953&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/pom.xml (original)
+++ camel/trunk/tests/camel-itest/pom.xml Thu Dec 1 05:07:50 2011
@@ -378,19 +378,7 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
-
<directory>${basedir}/res</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- </plugins>
+ </plugins>
</build>
</project>
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java?rev=1208953&r1=1208952&r2=1208953&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java
Thu Dec 1 05:07:50 2011
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.SynchronizationAdapter;
+import org.apache.camel.support.SynchronizationAdapter;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -34,6 +34,7 @@ public class HttpAsyncCallbackTest exten
@Test
public void testAsyncAndSyncAtSameTimeWithHttp() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(3);
mock.expectedBodiesReceivedInAnyOrder("Hello Claus", "Hello Hadrian",
"Hello Willem");
// START SNIPPET: e3
@@ -45,12 +46,13 @@ public class HttpAsyncCallbackTest exten
template.asyncCallbackRequestBody("http://localhost:9080/myservice";,
"Hadrian", callback);
template.asyncCallbackRequestBody("http://localhost:9080/myservice";,
"Willem", callback);
+ // give on completion time to complete properly before we do
assertions on its size
+ // TODO: improve MockEndpoint.assertIsSatisfied(long) to make this
sleep unnecessary
+ Thread.sleep(1200);
+
// END SNIPPET: e3
assertMockEndpointsSatisfied();
- // give on completion time to complete properly before we do
assertions on its size
- Thread.sleep(1000);
-
// assert that we got all the correct data in our callback
assertEquals(3, callback.getData().size());
assertTrue("Claus is missing", callback.getData().contains("Hello
Claus"));
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java?rev=1208953&r1=1208952&r2=1208953&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/ftp/FtpAndHttpRecipientListInterceptSendToEndpointIssueTest.java
Thu Dec 1 05:07:50 2011
@@ -99,5 +99,4 @@ public class FtpAndHttpRecipientListInte
ftpServer = serverFactory.createServer();
}
-
}
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/hawtdb/JmsToHawtDBAggregateTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/hawtdb/JmsToHawtDBAggregateTest.java?rev=1208953&r1=1208952&r2=1208953&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/hawtdb/JmsToHawtDBAggregateTest.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/hawtdb/JmsToHawtDBAggregateTest.java
Thu Dec 1 05:07:50 2011
@@ -38,7 +38,7 @@ public class JmsToHawtDBAggregateTest ex
@Override
public void setUp() throws Exception {
// you can disable this to keep the data file on next test
- deleteDirectory("data");
+ deleteDirectory("target/data");
super.setUp();
}
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/hawtdb/JmsToHawtDBRoute.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/hawtdb/JmsToHawtDBRoute.java?rev=1208953&r1=1208952&r2=1208953&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/hawtdb/JmsToHawtDBRoute.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/hawtdb/JmsToHawtDBRoute.java
Thu Dec 1 05:07:50 2011
@@ -31,7 +31,7 @@ public class JmsToHawtDBRoute extends Ro
.to("mock:input")
//.log("Incoming ${header.group} with body ${body}")
.aggregate(header("group"), new
MyConcatAggregatationStrategy())
- .aggregationRepository(new
HawtDBAggregationRepository("events", "data/hawtdb.dat"))
+ .aggregationRepository(new
HawtDBAggregationRepository("events", "target/data/hawtdb.dat"))
.completionSize(10)
.log("Aggregated #${header.counter} ${header.group} with
body ${body}")
.to("activemq:queue:out")
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/idempotent/JdbcIdempotentRepository.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/idempotent/JdbcIdempotentRepository.java?rev=1208953&r1=1208952&r2=1208953&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/idempotent/JdbcIdempotentRepository.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/idempotent/JdbcIdempotentRepository.java
Thu Dec 1 05:07:50 2011
@@ -59,12 +59,10 @@ public class JdbcIdempotentRepository im
public void start() throws Exception {
// noop
-
}
public void stop() throws Exception {
// noop
-
}
}
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/idempotent/JdbcTableService.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/idempotent/JdbcTableService.java?rev=1208953&r1=1208952&r2=1208953&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/idempotent/JdbcTableService.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/idempotent/JdbcTableService.java
Thu Dec 1 05:07:50 2011
@@ -39,7 +39,7 @@ public class JdbcTableService implements
} catch (Exception e) {
// ignore
}
- jdbc.execute("create table ProcessedPayments (paymentIdentifier
varchar)");
+ jdbc.execute("create table ProcessedPayments (paymentIdentifier
varchar(24))");
}
public void dropTable() {
Modified: camel/trunk/tests/camel-itest/src/test/resources/users.properties
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/resources/users.properties?rev=1208953&r1=1208952&r2=1208953&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/resources/users.properties (original)
+++ camel/trunk/tests/camel-itest/src/test/resources/users.properties Thu Dec
1 05:07:50 2011
@@ -1,12 +1,12 @@
ftpserver.user.admin
ftpserver.user.admin.userpassword=admin
-ftpserver.user.admin.homedirectory=./res/home
+ftpserver.user.admin.homedirectory=./target/res/home
ftpserver.user.admin.writepermission=true
ftpserver.user.scott
ftpserver.user.scott.userpassword=tiger
-ftpserver.user.scott.homedirectory=./res/home
+ftpserver.user.scott.homedirectory=./target/res/home
ftpserver.user.scott.writepermission=true
ftpserver.user.dummy
ftpserver.user.dummy.userpassword=foo
-ftpserver.user.dummy.homedirectory=./res/home
+ftpserver.user.dummy.homedirectory=./target/res/home
ftpserver.user.dummy.writepermission=false
