Author: raulk
Date: Sat Oct 6 00:15:19 2012
New Revision: 1394865
URL: http://svn.apache.org/viewvc?rev=1394865&view=rev
Log:
camel-mongodb tests: PropertiesComponent was being added inside the configure()
method, and this did not play well with changes introduced in r1373402.
Modified:
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConversionsTest.java
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbDynamicityTest.java
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbExceptionHandlingTest.java
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbFindOperationTest.java
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOperationsTest.java
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbWriteConcernsTest.java
Modified:
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java?rev=1394865&r1=1394864&r2=1394865&view=diff
==============================================================================
---
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java
(original)
+++
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java
Sat Oct 6 00:15:19 2012
@@ -29,14 +29,19 @@ import com.mongodb.MongoURI;
import com.mongodb.WriteConcern;
import com.mongodb.util.JSON;
+import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
+import org.apache.camel.component.properties.PropertiesComponent;
+import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.ObjectHelper;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Test;
import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
public abstract class AbstractMongoDbTest extends CamelTestSupport {
@@ -97,6 +102,15 @@ public abstract class AbstractMongoDbTes
dynamicCollection.drop();
}
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ applicationContext = new
ClassPathXmlApplicationContext("org/apache/camel/component/mongodb/mongoComponentTest.xml");
+ CamelContext ctx =
SpringCamelContext.springCamelContext(applicationContext);
+ PropertiesComponent pc = new
PropertiesComponent("classpath:mongodb.test.properties");
+ ctx.addComponent("properties", pc);
+ return ctx;
+ }
+
protected void pumpDataIntoTestCollection() {
// there should be 100 of each
String[] scientists = {"Einstein", "Darwin", "Copernicus", "Pasteur",
"Curie", "Faraday", "Newton", "Bohr", "Galilei", "Maxwell"};
Modified:
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConversionsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConversionsTest.java?rev=1394865&r1=1394864&r2=1394865&view=diff
==============================================================================
---
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConversionsTest.java
(original)
+++
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbConversionsTest.java
Sat Oct 6 00:15:19 2012
@@ -70,21 +70,12 @@ public class MongoDbConversionsTest exte
DBObject b = testCollection.findOne("testInsertJsonString");
assertNotNull("No record with 'testInsertJsonString' _id", b);
}
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- applicationContext = new
ClassPathXmlApplicationContext("org/apache/camel/component/mongodb/mongoComponentTest.xml");
- return SpringCamelContext.springCamelContext(applicationContext);
- }
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
- PropertiesComponent pc = new
PropertiesComponent("classpath:mongodb.test.properties");
- context.addComponent("properties", pc);
-
from("direct:insertMap").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
from("direct:insertPojo").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
from("direct:insertJsonString").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
Modified:
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbDynamicityTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbDynamicityTest.java?rev=1394865&r1=1394864&r2=1394865&view=diff
==============================================================================
---
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbDynamicityTest.java
(original)
+++
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbDynamicityTest.java
Sat Oct 6 00:15:19 2012
@@ -25,18 +25,9 @@ import com.mongodb.WriteResult;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.properties.PropertiesComponent;
-import org.apache.camel.spring.SpringCamelContext;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class MongoDbDynamicityTest extends AbstractMongoDbTest {
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- applicationContext = new
ClassPathXmlApplicationContext("org/apache/camel/component/mongodb/mongoComponentTest.xml");
- return SpringCamelContext.springCamelContext(applicationContext);
- }
@Test
public void testInsertDynamicityDisabled() {
@@ -143,9 +134,6 @@ public class MongoDbDynamicityTest exten
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
-
- PropertiesComponent pc = new
PropertiesComponent("classpath:mongodb.test.properties");
- context.addComponent("properties", pc);
from("direct:noDynamicity").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
from("direct:noDynamicityExplicit").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert&dynamicity=false");
Modified:
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbExceptionHandlingTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbExceptionHandlingTest.java?rev=1394865&r1=1394864&r2=1394865&view=diff
==============================================================================
---
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbExceptionHandlingTest.java
(original)
+++
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbExceptionHandlingTest.java
Sat Oct 6 00:15:19 2012
@@ -52,21 +52,12 @@ public class MongoDbExceptionHandlingTes
}
}
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- applicationContext = new
ClassPathXmlApplicationContext("org/apache/camel/component/mongodb/mongoComponentTest.xml");
- return SpringCamelContext.springCamelContext(applicationContext);
- }
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
- PropertiesComponent pc = new
PropertiesComponent("classpath:mongodb.test.properties");
- context.addComponent("properties", pc);
-
from("direct:findAll")
.to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findAll&dynamicity=true")
.to("mock:resultFindAll");
Modified:
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbFindOperationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbFindOperationTest.java?rev=1394865&r1=1394864&r2=1394865&view=diff
==============================================================================
---
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbFindOperationTest.java
(original)
+++
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbFindOperationTest.java
Sat Oct 6 00:15:19 2012
@@ -26,10 +26,7 @@ import com.mongodb.DBObject;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.properties.PropertiesComponent;
-import org.apache.camel.spring.SpringCamelContext;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class MongoDbFindOperationTest extends AbstractMongoDbTest {
@@ -162,19 +159,10 @@ public class MongoDbFindOperationTest ex
}
@Override
- protected CamelContext createCamelContext() throws Exception {
- applicationContext = new
ClassPathXmlApplicationContext("org/apache/camel/component/mongodb/mongoComponentTest.xml");
- return SpringCamelContext.springCamelContext(applicationContext);
- }
-
- @Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
-
- PropertiesComponent pc = new
PropertiesComponent("classpath:mongodb.test.properties");
- context.addComponent("properties", pc);
-
+
from("direct:findAll")
.to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=findAll&dynamicity=true")
.to("mock:resultFindAll");
Modified:
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOperationsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOperationsTest.java?rev=1394865&r1=1394864&r2=1394865&view=diff
==============================================================================
---
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOperationsTest.java
(original)
+++
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbOperationsTest.java
Sat Oct 6 00:15:19 2012
@@ -25,10 +25,7 @@ import com.mongodb.util.JSON;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.properties.PropertiesComponent;
-import org.apache.camel.spring.SpringCamelContext;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class MongoDbOperationsTest extends AbstractMongoDbTest {
@@ -200,26 +197,17 @@ public class MongoDbOperationsTest exten
assertEquals("Test collection should not contain any records", 0L,
result);
}
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- applicationContext = new
ClassPathXmlApplicationContext("org/apache/camel/component/mongodb/mongoComponentTest.xml");
- return SpringCamelContext.springCamelContext(applicationContext);
- }
-
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
- PropertiesComponent pc = new
PropertiesComponent("classpath:mongodb.test.properties");
- context.addComponent("properties", pc);
-
from("direct:count").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=count&dynamicity=true");
-
from("direct:insert").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert");
-
from("direct:save").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=save");
-
from("direct:update").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=update");
-
from("direct:remove").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=remove");
+
from("direct:insert").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=insert&writeConcern=SAFE");
+
from("direct:save").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=save&writeConcern=SAFE");
+
from("direct:update").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=update&writeConcern=SAFE");
+
from("direct:remove").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=remove&writeConcern=SAFE");
from("direct:getDbStats").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=getDbStats");
from("direct:getColStats").to("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.testCollection}}&operation=getColStats");
Modified:
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java?rev=1394865&r1=1394864&r2=1394865&view=diff
==============================================================================
---
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
(original)
+++
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbTailableCursorConsumerTest.java
Sat Oct 6 00:15:19 2012
@@ -28,10 +28,7 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.properties.PropertiesComponent;
-import org.apache.camel.spring.SpringCamelContext;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class MongoDbTailableCursorConsumerTest extends AbstractMongoDbTest {
@@ -384,20 +381,11 @@ public class MongoDbTailableCursorConsum
cappedTestCollection.drop();
}
- @Override
- protected CamelContext createCamelContext() throws Exception {
-
- applicationContext = new
ClassPathXmlApplicationContext("org/apache/camel/component/mongodb/mongoComponentTest.xml");
- return SpringCamelContext.springCamelContext(applicationContext);
- }
-
protected void addTestRoutes() throws Exception {
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- PropertiesComponent pc = new
PropertiesComponent("classpath:mongodb.test.properties");
- context.addComponent("properties", pc);
from("mongodb:myDb?database={{mongodb.testDb}}&collection={{mongodb.cappedTestCollection}}&tailTrackIncreasingField=increasing")
.id("tailableCursorConsumer1")
Modified:
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbWriteConcernsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbWriteConcernsTest.java?rev=1394865&r1=1394864&r2=1394865&view=diff
==============================================================================
---
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbWriteConcernsTest.java
(original)
+++
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbWriteConcernsTest.java
Sat Oct 6 00:15:19 2012
@@ -22,9 +22,7 @@ import com.mongodb.WriteResult;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.spring.SpringCamelContext;
import org.junit.Test;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
public class MongoDbWriteConcernsTest extends AbstractMongoDbTest {
@@ -80,13 +78,6 @@ public class MongoDbWriteConcernsTest ex
extractAndAssertCamelMongoDbException(e, "WriteConcern specified
in the " + MongoDbConstants.WRITECONCERN + " header");
}
}
-
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- applicationContext = new
ClassPathXmlApplicationContext("org/apache/camel/component/mongodb/mongoComponentTest.xml");
- return SpringCamelContext.springCamelContext(applicationContext);
- }
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
