You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/01/04 07:46:22 UTC
svn commit: r895569 - in /camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig: ContextConfig.java MainTest.java config/ config/ContextConfig.java

Author: ningjiang
Date: Mon Jan  4 06:46:09 2010
New Revision: 895569

URL: http://svn.apache.org/viewvc?rev=895569&view=rev
Log:
Try to fix the MainTest in camel-spring-javaconfig

Added:
    camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/config/
    camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/config/ContextConfig.java   (contents, props changed)
      - copied, changed from r895335, camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/ContextConfig.java
Removed:
    camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/ContextConfig.java
Modified:
    camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java

Modified: camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java?rev=895569&r1=895568&r2=895569&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java (original)
+++ camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/MainTest.java Mon Jan  4 06:46:09 2010
@@ -21,22 +21,26 @@
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.spring.SpringCamelContext;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.springframework.context.ApplicationContext;
 
 public class MainTest extends Assert {
     @Test
     public void  testOptions() throws Exception {
-        
-        CamelContext context = createCamelContext(new String[] {"-cc", "org.apache.camel.spring.javaconfig.ContextConfig"});
+        CamelContext context = createCamelContext(new String[] {"-cc", "org.apache.camel.spring.javaconfig.config.ContextConfig"});
         context.start();
         runTests(context);
         context.stop();
-        
-        context = createCamelContext(new String[]{"-bp", "org.apache.camel.spring.javaconfig"});
+    }
+    
+    @Test
+    public void testOptionBP() throws Exception {
+        CamelContext context = createCamelContext(new String[]{"-bp", "org.apache.camel.spring.javaconfig.config"});
         context.start();
         runTests(context);
         context.stop();
+        
     }
         
     private CamelContext createCamelContext(String[] options) throws Exception {

Copied: camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/config/ContextConfig.java (from r895335, camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/ContextConfig.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/config/ContextConfig.java?p2=camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/config/ContextConfig.java&p1=camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/ContextConfig.java&r1=895335&r2=895569&rev=895569&view=diff
==============================================================================
--- camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/ContextConfig.java (original)
+++ camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/config/ContextConfig.java Mon Jan  4 06:46:09 2010
@@ -14,9 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.spring.javaconfig;
+package org.apache.camel.spring.javaconfig.config;
 
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 

Propchange: camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/config/ContextConfig.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/config/ContextConfig.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: camel/trunk/components/camel-spring-javaconfig/src/test/java/org/apache/camel/spring/javaconfig/config/ContextConfig.java
------------------------------------------------------------------------------
    svn:mergeinfo =