Cleaned MongoDB tests.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7fb5c584 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7fb5c584 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7fb5c584 Branch: refs/heads/master Commit: 7fb5c5843f342dfc72101a6295c8bfb611d25514 Parents: 8016d55 Author: Henryk Konsek <hekon...@gmail.com> Authored: Mon Nov 10 18:01:22 2014 +0100 Committer: Henryk Konsek <hekon...@gmail.com> Committed: Mon Nov 10 18:01:22 2014 +0100 ---------------------------------------------------------------------- .../component/mongodb/AbstractMongoDbTest.java | 2 +- .../MongoComponentTestConfiguration.java | 27 -------------------- .../component/mongodb/mongoComponentTest.xml | 27 -------------------- 3 files changed, 1 insertion(+), 55 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7fb5c584/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java ---------------------------------------------------------------------- diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java index 2e7d77d..bf9e892 100644 --- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java +++ b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/AbstractMongoDbTest.java @@ -77,7 +77,7 @@ public abstract class AbstractMongoDbTest extends CamelTestSupport { @Override protected CamelContext createCamelContext() throws Exception { - applicationContext = new AnnotationConfigApplicationContext(MongoComponentTestConfiguration.class); + applicationContext = new AnnotationConfigApplicationContext(EmbedMongoConfiguration.class); CamelContext ctx = SpringCamelContext.springCamelContext(applicationContext); PropertiesComponent pc = new PropertiesComponent("classpath:mongodb.test.properties"); ctx.addComponent("properties", pc); http://git-wip-us.apache.org/repos/asf/camel/blob/7fb5c584/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoComponentTestConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoComponentTestConfiguration.java b/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoComponentTestConfiguration.java deleted file mode 100644 index e628043..0000000 --- a/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoComponentTestConfiguration.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.component.mongodb; - -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.ImportResource; - -@Configuration -@Import(EmbedMongoConfiguration.class) -@ImportResource("org/apache/camel/component/mongodb/mongoComponentTest.xml") -public class MongoComponentTestConfiguration { -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/7fb5c584/components/camel-mongodb/src/test/resources/org/apache/camel/component/mongodb/mongoComponentTest.xml ---------------------------------------------------------------------- diff --git a/components/camel-mongodb/src/test/resources/org/apache/camel/component/mongodb/mongoComponentTest.xml b/components/camel-mongodb/src/test/resources/org/apache/camel/component/mongodb/mongoComponentTest.xml deleted file mode 100644 index 7fef29b..0000000 --- a/components/camel-mongodb/src/test/resources/org/apache/camel/component/mongodb/mongoComponentTest.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<beans xmlns="http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> - - <!-- <bean id="customWriteConcern" class="com.mongodb.WriteConcern"> - <constructor-arg index="0" value="true" /> - </bean> --> - -</beans>
