camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r959583 - in /camel/trunk/tests: camel-itest-karaf/ camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/ camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/
Date Thu, 01 Jul 2010 10:03:53 GMT
Author: ningjiang
Date: Thu Jul  1 10:03:53 2010
New Revision: 959583

URL: http://svn.apache.org/viewvc?rev=959583&view=rev
Log:
CAMEL-2882 camel-itest-karaf now supports to run tests with spring2.5 and spring3

Added:
    camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java
  (with props)
Modified:
    camel/trunk/tests/camel-itest-karaf/pom.xml
    camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
    camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java

Modified: camel/trunk/tests/camel-itest-karaf/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/pom.xml?rev=959583&r1=959582&r2=959583&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/pom.xml (original)
+++ camel/trunk/tests/camel-itest-karaf/pom.xml Thu Jul  1 10:03:53 2010
@@ -64,17 +64,25 @@
 		<artifactId>pax-swissbox-tinybundles</artifactId>
 		<scope>test</scope>
 	</dependency>
-	<dependency>
-		<groupId>org.osgi</groupId>
-		<artifactId>org.osgi.compendium</artifactId>
-		<version>4.0.1</version>
-		<scope>compile</scope>
-		<optional>true</optional>
-	</dependency> 
+	 <dependency>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>org.apache.felix.configadmin</artifactId>
+        <scope>test</scope>
+    </dependency> 
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
       <version>4.0.1</version>
+      <scope>test</scope>      
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-spring</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -120,6 +128,10 @@
                  <include>**/*Test.*</include>
               </includes>
               <excludes>
+                  <!-- CXF test will hang with the Spring3, need to check Cxf feature
with karaf later -->
+                  <exclude>**/*Cxf*.*</exclude>
+                  <!-- Scala-lib is not OSGi ready, so we exculde this test -->
+                  <exclude>**/*Scala*.*</exclude>
                   <!--
                   <exclude>**/*Amqp*.*</exclude>
                   <exclude>**/*Bindy*.*</exclude>
@@ -129,6 +141,9 @@
                   <exclude>**/*Jaxb*.*</exclude>
                   -->
               </excludes>
+              <systemPropertyVariables>
+                  <springVersion>${spring-version}</springVersion>
+              </systemPropertyVariables>
           </configuration>
       </plugin>
 
@@ -162,7 +177,10 @@
                         <excludes>
                             <!-- TODO: temporary disable unit test to let TC not hang
-->
                             <exclude>**/*Test.*</exclude>
-                        </excludes>               
+                        </excludes>
+                        <systemPropertyVariables>
+                            <springVersion>${spring-version}</springVersion>
+                        </systemPropertyVariables>               
                     </configuration>
                 </plugin>
             </plugins>

Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java?rev=959583&r1=959582&r2=959583&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
(original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java
Thu Jul  1 10:03:53 2010
@@ -26,14 +26,14 @@ import org.junit.After;
 import org.junit.Before;
 import org.ops4j.pax.exam.Inject;
 import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.options.FrameworkOption;
+import org.ops4j.pax.exam.options.UrlReference;
 import org.osgi.framework.BundleContext;
 
 import static org.junit.Assert.assertNotNull;
-//import static org.ops4j.pax.exam.CoreOptions.equinox;
 import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
-//import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.cleanCaches;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.profile;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
@@ -130,22 +130,47 @@ public abstract class AbstractFeatureTes
         }
         return sb.toString();
     }
-
+    
+    public static UrlReference getCamelKarafFeatureUrl() {
+        String springVersion = System.getProperty("springVersion");
+        System.out.println("*** The spring version is " + springVersion + " ***");
+        String type = "xml/features"; 
+        if (springVersion != null && springVersion.startsWith("3")) {
+            type = "xml/features-spring3";
+        }
+        return mavenBundle().groupId("org.apache.camel.karaf").
+            artifactId("apache-camel").versionAsInProject().type(type);
+    }
+    
+    public static FrameworkOption getFramework() {
+        return felix();
+    }
+    
     public static Option[] configure(String feature) {
+        return configure(feature, getFramework());
+    }
+
+    public static Option[] configure(String feature, FrameworkOption framework) {
         Option[] options = options(
             profile("log").version("1.4"),
             // this is how you set the default log level when using pax logging (logProfile)
             org.ops4j.pax.exam.CoreOptions.systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
 
-            scanFeatures(mavenBundle().groupId("org.apache.camel.karaf").
-                         artifactId("apache-camel").versionAsInProject().type("xml/features"),
+            //need to install some karaf features
+            mavenBundle("org.apache.felix", "org.apache.felix.configadmin").versionAsInProject(),
+            
+            mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxp-ri").version("1.4.2_4-SNAPSHOT"),
+            
+            scanFeatures(getCamelKarafFeatureUrl(),
                           "camel-spring", "camel-" + feature),
-            workingDirectory("target/paxrunner/"),              
+            workingDirectory("target/paxrunner/"),            
 
-            felix());
-            //equinox());
+            framework);
+            
 
         return options;
     }
 
+    
+
 }
\ No newline at end of file

Modified: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java?rev=959583&r1=959582&r2=959583&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java
(original)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelMailTest.java
Thu Jul  1 10:03:53 2010
@@ -21,6 +21,14 @@ import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.junit.Configuration;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.options.FrameworkOption;
+
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.profile;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.workingDirectory;
 
 @RunWith(JUnit4TestRunner.class)
 public class CamelMailTest extends AbstractFeatureTest {
@@ -34,7 +42,11 @@ public class CamelMailTest extends Abstr
 
     @Configuration
     public static Option[] configure() {
-        return configure(COMPONENT);
+        return configure(COMPONENT, getFramework());
+    }
+    
+    public static FrameworkOption getFramework() {
+        return equinox();
     }
 
 }
\ No newline at end of file

Added: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java?rev=959583&view=auto
==============================================================================
--- camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java
(added)
+++ camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java
Thu Jul  1 10:03:53 2010
@@ -0,0 +1,40 @@
+/**
+ * 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.itest.karaf;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Option;
+import org.ops4j.pax.exam.junit.Configuration;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+
+@RunWith(JUnit4TestRunner.class)
+public class CamelNettyTest extends AbstractFeatureTest {
+
+    public static final String COMPONENT = extractName(CamelNettyTest.class);
+
+    @Test
+    public void test() throws Exception {
+        testComponent(COMPONENT);
+    }
+
+    @Configuration
+    public static Option[] configure() {
+        return configure(COMPONENT);
+    }
+
+}
\ No newline at end of file

Propchange: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelNettyTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java?rev=959583&r1=959582&r2=959583&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/MailRouteTest.java
Thu Jul  1 10:03:53 2010
@@ -37,7 +37,6 @@ import org.ops4j.pax.exam.junit.Configur
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 
 import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.felix;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.provision;



Mime
View raw message