You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2008/11/06 18:57:38 UTC
svn commit: r711926 - in /activemq/camel/trunk:
camel-core/src/test/java/org/apache/camel/
components/camel-atom/src/test/java/org/apache/camel/component/atom/
components/camel-cxf/src/test/java/org/apache/camel/component/cxf/
components/camel-cxf/src/...
Author: hadrian
Date: Thu Nov 6 09:57:15 2008
New Revision: 711926
URL: http://svn.apache.org/viewvc?rev=711926&view=rev
Log:
Removed deprecated misspelled api.
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapTest.java
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java
activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java
activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java
activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyTest.java
activemq/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java
activemq/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
activemq/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/dataformat/hl7/HL7DataFormatTest.java
activemq/camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisPollingDelayRouteTest.java
activemq/camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisQueueTest.java
activemq/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathFilterTest.java
activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileUdpTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOnlyRouteTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaLoggerOptionTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpUsingTemplateTest.java
activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java
activemq/camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/RubyTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/StringDataFormatTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java
activemq/camel/trunk/components/camel-swing/src/test/java/org/apache/camel/component/swing/UFaceTest.java
activemq/camel/trunk/components/camel-uface/src/test/java/org/apache/camel/component/uface/UFaceTest.java
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java Thu Nov 6 09:57:15 2008
@@ -269,15 +269,6 @@
/**
* Asserts that all the expectations of the Mock endpoints are valid
- *
- * @deprecated use {{@link #assertMockEndpointsSatisfied()} instead. Will be removed in Camel 2.0.
- */
- protected void assertMockEndpointsSatisifed() throws InterruptedException {
- assertMockEndpointsSatisfied();
- }
-
- /**
- * Asserts that all the expectations of the Mock endpoints are valid
*/
protected void assertMockEndpointsSatisfied() throws InterruptedException {
MockEndpoint.assertIsSatisfied(context);
Modified: activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java Thu Nov 6 09:57:15 2008
@@ -36,7 +36,7 @@
MockEndpoint endpoint = getMockEndpoint("mock:results");
endpoint.expectedMessageCount(7);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
List<Exchange> list = endpoint.getReceivedExchanges();
String[] expectedTitles = {"Speaking at the Irish Java Technology Conference on Thursday and Friday",
Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapTest.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSoapTest.java Thu Nov 6 09:57:15 2008
@@ -85,7 +85,7 @@
endpoint.expectedMessageCount(1);
Object result = template.sendBody("direct:producer", source);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
assertFalse("The result should not be changed", source.equals(result));
assertTrue("The result should be the instance of DOMSource", result instanceof DOMSource);
assertEquals("The DOMSource should be equal", XMLUtils.toString(source), XMLUtils.toString((Source)result));
Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfWsdlFirstTest.java Thu Nov 6 09:57:15 2008
@@ -160,7 +160,4 @@
});
return exchange;
}
-
-
-
}
Modified: activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java (original)
+++ activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/transport/CamelConduitTest.java Thu Nov 6 09:57:15 2008
@@ -111,7 +111,7 @@
Message message = new MessageImpl();
// set the isOneWay to be true
sendoutMessage(conduit, message, true, "HelloWorld");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
// verify the endpoint get the response
}
@@ -124,7 +124,7 @@
// set the isOneWay to be false
sendoutMessage(conduit, message, false, "HelloWorld");
// verify the endpoint get the response
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
verifyReceivedMessage("HelloWorld");
}
Modified: activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java (original)
+++ activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackDelimitedDataFormatTest.java Thu Nov 6 09:57:15 2008
@@ -42,7 +42,7 @@
String data = IOConverter.toString(new File("src/test/data/delim/INVENTORY-CommaDelimitedWithQualifier.txt").getAbsoluteFile());
template.sendBody("direct:unmarshal", data);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
DataSetList list = mock.getExchanges().get(0).getIn().getBody(DataSetList.class);
assertEquals(4, list.size());
@@ -71,7 +71,7 @@
data.add(row2);
template.sendBody("direct:marshal", data);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testMarshalNoDefinition() throws Exception {
@@ -95,7 +95,7 @@
data.add(row2);
template.sendBody("direct:marshal2", data);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Modified: activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java (original)
+++ activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthDataFormatTest.java Thu Nov 6 09:57:15 2008
@@ -42,7 +42,7 @@
String data = IOConverter.toString(new File("src/test/data/fixed/PEOPLE-FixedLength.txt").getAbsoluteFile());
template.sendBody("direct:unmarshal", data);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
DataSetList list = mock.getExchanges().get(0).getIn().getBody(DataSetList.class);
assertEquals(4, list.size());
@@ -66,7 +66,7 @@
data.add(row);
template.sendBody("direct:marshal", data);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
String s = mock.getExchanges().get(0).getIn().getBody(String.class);
assertTrue(s.startsWith("JOHN DOE"));
Modified: activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java (original)
+++ activemq/camel/trunk/components/camel-flatpack/src/test/java/org/apache/camel/component/flatpack/FlatpackFixedLengthWithHeaderAndTrailerDataFormatTest.java Thu Nov 6 09:57:15 2008
@@ -39,7 +39,7 @@
String data = IOConverter.toString(new File("src/test/data/headerandtrailer/PEOPLE-HeaderAndTrailer.txt").getAbsoluteFile());
template.sendBody("direct:unmarshal", data);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
DataSetList list = mock.getExchanges().get(0).getIn().getBody(DataSetList.class);
assertEquals(6, list.size());
Modified: activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyTest.java (original)
+++ activemq/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyTest.java Thu Nov 6 09:57:15 2008
@@ -35,7 +35,7 @@
template.sendBodyAndHeader("direct:a", expected, "foo", "bar");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
log.debug("Should have received one exchange: " + resultEndpoint.getReceivedExchanges());
}
@@ -46,7 +46,7 @@
template.sendBodyAndHeader("direct:a", expected, "foo", "123");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
log.debug("Should not have received any messages: " + resultEndpoint.getReceivedExchanges());
}
Modified: activemq/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java (original)
+++ activemq/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7MLLPCodecPlainStringTest.java Thu Nov 6 09:57:15 2008
@@ -48,7 +48,7 @@
// send plain hello world as String
Object out = template.requestBody("mina:tcp://localhost:8888?sync=true&codec=hl7codec", "Hello World");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
// and the response is also just plain String
assertEquals("Bye World", out);
Modified: activemq/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java (original)
+++ activemq/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7RouteTest.java Thu Nov 6 09:57:15 2008
@@ -70,7 +70,7 @@
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADR^A19||||123", lines[0]);
assertEquals("MSA|AA|123", lines[1]);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testSendA01() throws Exception {
@@ -91,7 +91,7 @@
assertEquals("MSH|^~\\&|MYSENDER||||200701011539||ADT^A01||||123", lines[0]);
assertEquals("PID|||123456||Doe^John", lines[1]);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testSendUnknown() throws Exception {
@@ -109,7 +109,7 @@
template.requestBody("mina:tcp://localhost:8888?sync=true&codec=hl7codec", in.toString());
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Modified: activemq/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/dataformat/hl7/HL7DataFormatTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/dataformat/hl7/HL7DataFormatTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/dataformat/hl7/HL7DataFormatTest.java (original)
+++ activemq/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/dataformat/hl7/HL7DataFormatTest.java Thu Nov 6 09:57:15 2008
@@ -40,7 +40,7 @@
Message message = createHL7AsMessage();
template.sendBody("direct:marshal", message);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testUnmarshal() throws Exception {
@@ -65,7 +65,7 @@
String body = createHL7AsString();
template.sendBody("direct:unmarshal", body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
Message msg = mock.getExchanges().get(0).getIn().getBody(Message.class);
assertEquals("2.4", msg.getVersion());
Modified: activemq/camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisPollingDelayRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisPollingDelayRouteTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisPollingDelayRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisPollingDelayRouteTest.java Thu Nov 6 09:57:15 2008
@@ -91,5 +91,4 @@
IBatisEndpoint endpoint = resolveMandatoryEndpoint("ibatis:selectAllAccounts", IBatisEndpoint.class);
return endpoint.getSqlMapClient().getDataSource().getConnection();
}
-
}
\ No newline at end of file
Modified: activemq/camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisQueueTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisQueueTest.java (original)
+++ activemq/camel/trunk/components/camel-ibatis/src/test/java/org/apache/camel/component/ibatis/IBatisQueueTest.java Thu Nov 6 09:57:15 2008
@@ -26,87 +26,75 @@
public class IBatisQueueTest extends ContextTestSupport {
- public void testConsume() throws Exception {
+ public void testConsume() throws Exception {
- MockEndpoint endpoint = getMockEndpoint("mock:results");
- endpoint.expectedMinimumMessageCount(2);
-
-
- Account account = new Account();
- account.setId(1);
- account.setFirstName("Bob");
- account.setLastName("Denver");
- account.setEmailAddress("TryGuessingGilligan@gmail.com");
-
- template.sendBody("direct:start", account);
-
- account = new Account();
- account.setId(2);
- account.setFirstName("Alan");
- account.setLastName("Hale");
- account.setEmailAddress("TryGuessingSkipper@gmail.com");
-
- template.sendBody("direct:start", account);
-
- assertMockEndpointsSatisifed();
-
- // now lets poll that the account has been inserted
- Object answer = template.sendBody("ibatis:selectProcessedAccounts", null);
- List body = assertIsInstanceOf(List.class, answer);
-
- assertEquals("Wrong size: " + body, 2, body.size());
- Account actual = assertIsInstanceOf(Account.class, body.get(0));
-
- assertEquals("Account.getFirstName()", "Bob", actual.getFirstName());
- assertEquals("Account.getLastName()", "Denver", actual.getLastName());
-
- answer = template.sendBody("ibatis:selectUnprocessedAccounts", null);
-
-
-
- body = assertIsInstanceOf(List.class, answer);
- assertEquals("Wrong size: " + body, 0, body.size());
-
-
- }
-
-
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- public void configure() throws Exception {
- from("ibatis:selectUnprocessedAccounts?consumer.onConsume=consumeAccount").to("mock:results");
-
- from("direct:start").to("ibatis:insertAccount");
-
-
- }
- };
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
-
- // lets create the database...
- IBatisEndpoint endpoint = resolveMandatoryEndpoint("ibatis:Account", IBatisEndpoint.class);
- Connection connection = endpoint.getSqlMapClient().getDataSource().getConnection();
- Statement statement = connection.createStatement();
- statement.execute("create table ACCOUNT ( ACC_ID INTEGER , ACC_FIRST_NAME VARCHAR(255), ACC_LAST_NAME VARCHAR(255), ACC_EMAIL VARCHAR(255), PROCESSED BOOLEAN DEFAULT false)");
- connection.close();
- }
-
- @Override
- protected void tearDown() throws Exception{
- super.tearDown();
- IBatisEndpoint endpoint = resolveMandatoryEndpoint("ibatis:Account", IBatisEndpoint.class);
- Connection connection = endpoint.getSqlMapClient().getDataSource().getConnection();
- Statement statement = connection.createStatement();
- statement.execute("drop table ACCOUNT");
- connection.close();
-
-
- }
-
+ MockEndpoint endpoint = getMockEndpoint("mock:results");
+ endpoint.expectedMinimumMessageCount(2);
+
+ Account account = new Account();
+ account.setId(1);
+ account.setFirstName("Bob");
+ account.setLastName("Denver");
+ account.setEmailAddress("TryGuessingGilligan@gmail.com");
+
+ template.sendBody("direct:start", account);
+
+ account = new Account();
+ account.setId(2);
+ account.setFirstName("Alan");
+ account.setLastName("Hale");
+ account.setEmailAddress("TryGuessingSkipper@gmail.com");
+
+ template.sendBody("direct:start", account);
+
+ assertMockEndpointsSatisfied();
+
+ // now lets poll that the account has been inserted
+ Object answer = template.sendBody("ibatis:selectProcessedAccounts", null);
+ List body = assertIsInstanceOf(List.class, answer);
+
+ assertEquals("Wrong size: " + body, 2, body.size());
+ Account actual = assertIsInstanceOf(Account.class, body.get(0));
+
+ assertEquals("Account.getFirstName()", "Bob", actual.getFirstName());
+ assertEquals("Account.getLastName()", "Denver", actual.getLastName());
+
+ answer = template.sendBody("ibatis:selectUnprocessedAccounts", null);
+
+ body = assertIsInstanceOf(List.class, answer);
+ assertEquals("Wrong size: " + body, 0, body.size());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from("ibatis:selectUnprocessedAccounts?consumer.onConsume=consumeAccount").to("mock:results");
+
+ from("direct:start").to("ibatis:insertAccount");
+ }
+ };
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ // lets create the database...
+ IBatisEndpoint endpoint = resolveMandatoryEndpoint("ibatis:Account", IBatisEndpoint.class);
+ Connection connection = endpoint.getSqlMapClient().getDataSource().getConnection();
+ Statement statement = connection.createStatement();
+ statement.execute("create table ACCOUNT ( ACC_ID INTEGER , ACC_FIRST_NAME VARCHAR(255), ACC_LAST_NAME VARCHAR(255), ACC_EMAIL VARCHAR(255), PROCESSED BOOLEAN DEFAULT false)");
+ connection.close();
+ }
+
+ @Override
+ protected void tearDown() throws Exception{
+ super.tearDown();
+ IBatisEndpoint endpoint = resolveMandatoryEndpoint("ibatis:Account", IBatisEndpoint.class);
+ Connection connection = endpoint.getSqlMapClient().getDataSource().getConnection();
+ Statement statement = connection.createStatement();
+ statement.execute("drop table ACCOUNT");
+ connection.close();
+ }
}
Modified: activemq/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathFilterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathFilterTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathFilterTest.java (original)
+++ activemq/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathFilterTest.java Thu Nov 6 09:57:15 2008
@@ -29,7 +29,7 @@
sendBody("direct:start", new PersonBean("James", "London"));
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testSendNotMatchingMessage() throws Exception {
@@ -37,7 +37,7 @@
sendBody("direct:start", new PersonBean("Hiram", "Tampa"));
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testSendNullMessage() throws Exception {
@@ -45,7 +45,7 @@
sendBody("direct:start", new PersonBean(null, "Tampa"));
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java (original)
+++ activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailMultipleRecipientsTest.java Thu Nov 6 09:57:15 2008
@@ -45,7 +45,7 @@
template.sendBodyAndHeaders("smtp://localhost", "Hello World", headers);
// END SNIPPET: e1
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testSendWithMultipleRecipientsPreConfigured() throws Exception {
@@ -60,7 +60,7 @@
template.sendBody("smtp://localhost?To=claus@localhost,willem@localhost&CC=james@localhost", "Hello World");
// END SNIPPET: e2
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
private void assertMailbox(String name) throws Exception {
Modified: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaConsumerTest.java Thu Nov 6 09:57:15 2008
@@ -35,7 +35,7 @@
template.sendBody("mina:tcp://localhost:6200?textline=true", "Hello World");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
// END SNIPPET: e2
}
Modified: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaExchangeTest.java Thu Nov 6 09:57:15 2008
@@ -38,7 +38,7 @@
template.sendBody(uri, body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileTcpTest.java Thu Nov 6 09:57:15 2008
@@ -29,7 +29,7 @@
MockEndpoint endpoint = getMockEndpoint("mock:results");
endpoint.expectedMessageCount(1);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileUdpTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileUdpTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileUdpTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaFileUdpTest.java Thu Nov 6 09:57:15 2008
@@ -29,7 +29,7 @@
MockEndpoint endpoint = getMockEndpoint("mock:results");
endpoint.expectedMessageCount(1);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOnlyRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOnlyRouteTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOnlyRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOnlyRouteTest.java Thu Nov 6 09:57:15 2008
@@ -33,7 +33,7 @@
mock.expectedBodiesReceived("Bye Claus");
mock.setResultWaitTime(5000);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Modified: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java Thu Nov 6 09:57:15 2008
@@ -37,7 +37,7 @@
Object out = template.requestBodyAndHeader("direct:in", "Claus", "city", "Copenhagen");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
assertEquals("Bye Claus", out);
}
Modified: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaLoggerOptionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaLoggerOptionTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaLoggerOptionTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaLoggerOptionTest.java Thu Nov 6 09:57:15 2008
@@ -58,7 +58,7 @@
producer.stop();
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testLoggerOptionFalse() throws Exception {
@@ -88,7 +88,7 @@
producer.stop();
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testNoLoggerOption() throws Exception {
@@ -118,8 +118,6 @@
producer.stop();
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
-
-
}
Modified: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerShutdownMockTest.java Thu Nov 6 09:57:15 2008
@@ -67,7 +67,7 @@
verify(mockConnector);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java Thu Nov 6 09:57:15 2008
@@ -39,7 +39,7 @@
Thread.sleep(1000);
sendUdpMessages();
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected void sendUdpMessages() throws Exception {
Modified: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpUsingTemplateTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpUsingTemplateTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpUsingTemplateTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpUsingTemplateTest.java Thu Nov 6 09:57:15 2008
@@ -39,7 +39,7 @@
// sleeping for while to let the mock endpoint get all the message
Thread.sleep(2000);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected void sendUdpMessages() throws Exception {
@@ -58,7 +58,7 @@
// sleeping for while to let the mock endpoint get all the message
Thread.sleep(2000);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
List<Exchange> list = endpoint.getReceivedExchanges();
byte[] out = list.get(0).getIn().getBody(byte[].class);
Modified: activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java Thu Nov 6 09:57:15 2008
@@ -33,7 +33,7 @@
template.sendBodyAndHeader(uri, body, "cheese", 123);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/RubyTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/RubyTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/RubyTest.java (original)
+++ activemq/camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/RubyTest.java Thu Nov 6 09:57:15 2008
@@ -38,7 +38,7 @@
template.sendBodyAndHeader("direct:a", expected, "foo", "bar");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testSendNotMatchingMessage() throws Exception {
@@ -47,7 +47,7 @@
template.sendBodyAndHeader("direct:a", expected, "foo", "123");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/XsltRouteTest.java Thu Nov 6 09:57:15 2008
@@ -36,7 +36,7 @@
template.sendBody("direct:start",
"<mail><subject>Hey</subject><body>Hello world!</body></mail>");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
List<Exchange> list = endpoint.getReceivedExchanges();
Exchange exchange = list.get(0);
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/StreamCachingInterceptorTest.java Thu Nov 6 09:57:15 2008
@@ -43,7 +43,7 @@
StreamSource message = new StreamSource(new StringReader("<hello>world!</hello>"));
template.sendBody("direct:a", message);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
Exchange exchange = a.getExchanges().get(0);
StreamCache streamCache = Assertions.assertInstanceOf(exchange.getIn().getBody(), StreamCache.class);
//assertTrue(a.assertExchangeReceived(0).getIn().getBody() instanceof StreamCache);
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/StringDataFormatTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/StringDataFormatTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/StringDataFormatTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/StringDataFormatTest.java Thu Nov 6 09:57:15 2008
@@ -38,7 +38,7 @@
mock.expectedMessageCount(1);
byte[] out = (byte[]) template.sendBody("direct:marshal", body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
String result = new String(out, "UTF-8");
assertEquals(body, result);
@@ -52,7 +52,7 @@
mock.expectedMessageCount(1);
String out = (String) template.sendBody("direct:unmarshal", body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
assertEquals(new String(body, "UTF-8"), out);
}
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/TransformWithExpressionTest.java Thu Nov 6 09:57:15 2008
@@ -29,7 +29,7 @@
template.sendBody("direct:start", "Some data plus ...");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Modified: activemq/camel/trunk/components/camel-swing/src/test/java/org/apache/camel/component/swing/UFaceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-swing/src/test/java/org/apache/camel/component/swing/UFaceTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-swing/src/test/java/org/apache/camel/component/swing/UFaceTest.java (original)
+++ activemq/camel/trunk/components/camel-swing/src/test/java/org/apache/camel/component/swing/UFaceTest.java Thu Nov 6 09:57:15 2008
@@ -30,7 +30,7 @@
template.sendBody("swing:a", "<hello>world!</hello>");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified: activemq/camel/trunk/components/camel-uface/src/test/java/org/apache/camel/component/uface/UFaceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-uface/src/test/java/org/apache/camel/component/uface/UFaceTest.java?rev=711926&r1=711925&r2=711926&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-uface/src/test/java/org/apache/camel/component/uface/UFaceTest.java (original)
+++ activemq/camel/trunk/components/camel-uface/src/test/java/org/apache/camel/component/uface/UFaceTest.java Thu Nov 6 09:57:15 2008
@@ -34,7 +34,7 @@
template.sendBody("uface:a", "<hello>world!</hello>");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected RouteBuilder createRouteBuilder() throws Exception {