Author: akarpe Date: Fri Sep 3 18:13:51 2010 New Revision: 992399 URL: http://svn.apache.org/viewvc?rev=992399&view=rev Log: Removed duplication of code
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java?rev=992399&r1=992398&r2=992399&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesEnvironmentVariableOverrideTest.java Fri Sep 3 18:13:51 2010 @@ -71,149 +71,3 @@ public class PropertiesEnvironmentVariab } } -/** - * 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.properties; - -import org.apache.camel.CamelContext; -import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.RouteBuilder; - -/** - * @version $Revision: 930255 $ - */ -public class PropertiesEnvironmentVariableOverrideTest extends ContextTestSupport { - - - @Override - public boolean isUseRouteBuilder() { - return false; - } - - public void testPropertiesComponentCacheDisabled() throws Exception { - PropertiesComponent pc = context.getComponent("properties", PropertiesComponent.class); - pc.setCache(false); - - System.setProperty("cool.end", "mock:override"); - System.setProperty("cool.result", "override"); - - context.addRoutes(new RouteBuilder() { - @Override - public void configure() throws Exception { - from("direct:start").to("properties:cool.end"); - from("direct:foo").to("properties:mock:{{cool.result}}"); - } - }); - context.start(); - - getMockEndpoint("mock:override").expectedMessageCount(2); - - template.sendBody("direct:start", "Hello World"); - template.sendBody("direct:foo", "Hello Foo"); - - System.clearProperty("cool.end"); - System.clearProperty("cool.result"); - - assertMockEndpointsSatisfied(); - } - - @Override - protected CamelContext createCamelContext() throws Exception { - CamelContext context = super.createCamelContext(); - - PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); - pc.setLocations(new String[]{"classpath:org/apache/camel/component/properties/myproperties.properties"}); - context.addComponent("properties", pc); - - return context; - } - -} -/** - * 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.properties; - -import org.apache.camel.CamelContext; -import org.apache.camel.ContextTestSupport; -import org.apache.camel.builder.RouteBuilder; - -/** - * @version $Revision: 930255 $ - */ -public class PropertiesEnvironmentVariableOverrideTest extends ContextTestSupport { - - - @Override - public boolean isUseRouteBuilder() { - return false; - } - - public void testPropertiesComponentCacheDisabled() throws Exception { - PropertiesComponent pc = context.getComponent("properties", PropertiesComponent.class); - pc.setCache(false); - - System.setProperty("cool.end", "mock:override"); - System.setProperty("cool.result", "override"); - - context.addRoutes(new RouteBuilder() { - @Override - public void configure() throws Exception { - from("direct:start").to("properties:cool.end"); - from("direct:foo").to("properties:mock:{{cool.result}}"); - } - }); - context.start(); - - getMockEndpoint("mock:override").expectedMessageCount(2); - - template.sendBody("direct:start", "Hello World"); - template.sendBody("direct:foo", "Hello Foo"); - - System.clearProperty("cool.end"); - System.clearProperty("cool.result"); - - assertMockEndpointsSatisfied(); - } - - @Override - protected CamelContext createCamelContext() throws Exception { - CamelContext context = super.createCamelContext(); - - PropertiesComponent pc = new PropertiesComponent(); - pc.setCamelContext(context); - pc.setLocations(new String[]{"classpath:org/apache/camel/component/properties/myproperties.properties"}); - context.addComponent("properties", pc); - - return context; - } - -}