karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject git commit: Extend the Spring 3.x features itest coverage
Date Mon, 25 Aug 2014 15:07:13 GMT
Repository: karaf
Updated Branches:
  refs/heads/master 7f49ea8c3 -> 3aa5fef7a


Extend the Spring 3.x features itest coverage


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3aa5fef7
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3aa5fef7
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3aa5fef7

Branch: refs/heads/master
Commit: 3aa5fef7a75c8d86abe1417601223d54def44d7b
Parents: 7f49ea8
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Mon Aug 25 17:03:33 2014 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Mon Aug 25 17:03:33 2014 +0200

----------------------------------------------------------------------
 itests/pom.xml                                  |  1 +
 .../apache/karaf/itests/KarafTestSupport.java   |  1 +
 .../itests/features/Spring3FeaturesTest.java    | 91 +++++++++++++++++---
 3 files changed, 80 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/3aa5fef7/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index fa60a78..5aad907 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -122,6 +122,7 @@
 				<configuration>
 					<systemPropertyVariables>
 						<org.ops4j.pax.logging.DefaultServiceLog.level>INFO</org.ops4j.pax.logging.DefaultServiceLog.level>
+                        <spring31.version>${spring31.version}</spring31.version>
                         <spring32.version>${spring32.version}</spring32.version>
                         <spring40.version>${spring40.version}</spring40.version>
 					</systemPropertyVariables>

http://git-wip-us.apache.org/repos/asf/karaf/blob/3aa5fef7/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
index 5de7524..ebdea09 100644
--- a/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
+++ b/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
@@ -137,6 +137,7 @@ public class KarafTestSupport {
             editConfigurationFilePut("etc/org.ops4j.pax.web.cfg", "org.osgi.service.http.port",
HTTP_PORT),
             editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiRegistryPort",
RMI_REG_PORT),
             editConfigurationFilePut("etc/org.apache.karaf.management.cfg", "rmiServerPort",
RMI_SERVER_PORT),
+            editConfigurationFilePut("etc/system.properties", "spring31.version", System.getProperty("spring31.version")),
             editConfigurationFilePut("etc/system.properties", "spring32.version", System.getProperty("spring32.version")),
             editConfigurationFilePut("etc/system.properties", "spring40.version", System.getProperty("spring40.version"))
         };

http://git-wip-us.apache.org/repos/asf/karaf/blob/3aa5fef7/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
b/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
index 19b6f43..37181c1 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/Spring3FeaturesTest.java
@@ -25,24 +25,90 @@ import org.ops4j.pax.exam.spi.reactors.PerMethod;
 @ExamReactorStrategy(PerMethod.class)
 public class Spring3FeaturesTest extends KarafTestSupport {
 
+    // Spring DM
+
     @Test
-    public void installSpringFeature() throws Exception {
-        installAssertAndUninstallFeature("spring", System.getProperty("spring32.version"));
+    public void installSpringDmFeature() throws Exception {
+        installAssertAndUninstallFeatures("spring-dm");
     }
 
     @Test
-    public void installSpringAspectsFeature() throws Exception {
-        installAssertAndUninstallFeature("spring-aspects", System.getProperty("spring32.version"));
+    public void installSpringDmWebFeature() throws Exception {
+        installAssertAndUninstallFeatures("spring-dm-web");
     }
 
+    // Spring 3.1.x
+
     @Test
-    public void installSpringDmFeature() throws Exception {
-        installAssertAndUninstallFeatures("spring-dm");
+    public void installSpring31Feature() throws Exception {
+        installAssertAndUninstallFeature("spring", System.getProperty("spring31.version"));
     }
 
     @Test
-    public void installSpringDmWebFeature() throws Exception {
-        installAssertAndUninstallFeatures("spring-dm-web");
+    public void installSpringAspects31Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-aspects", System.getProperty("spring31.version"));
+    }
+
+    @Test
+    public void installSpringInstrument31Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-instrument", System.getProperty("spring31.version"));
+    }
+
+    @Test
+    public void installSpringJdbc31Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-jdbc", System.getProperty("spring31.version"));
+    }
+
+    @Test
+    public void installSpringJms31Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-jms", System.getProperty("spring31.version"));
+    }
+
+    @Test
+    public void installSpringStruts31Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-struts", System.getProperty("spring31.version"));
+    }
+
+    @Test
+    public void installSpringTest31Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-test", System.getProperty("spring31.version"));
+    }
+
+    @Test
+    public void installSpringOrm31Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-orm", System.getProperty("spring31.version"));
+    }
+
+    @Test
+    public void installSpringOxm31Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-oxm", System.getProperty("spring31.version"));
+    }
+
+    @Test
+    public void installSpringTx31Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-tx", System.getProperty("spring31.version"));
+    }
+
+    @Test
+    public void installSpringWeb31Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-web", System.getProperty("spring31.version"));
+    }
+
+    @Test
+    public void installSpringWebPortlet31Feature() throws Exception {
+        installAssertAndUninstallFeature("spring-web-portlet", System.getProperty("spring31.version"));
+    }
+
+    // Spring 3.2.x
+
+    @Test
+    public void installSpringFeature() throws Exception {
+        installAssertAndUninstallFeature("spring", System.getProperty("spring32.version"));
+    }
+
+    @Test
+    public void installSpringAspectsFeature() throws Exception {
+        installAssertAndUninstallFeature("spring-aspects", System.getProperty("spring32.version"));
     }
 
     @Test
@@ -71,7 +137,6 @@ public class Spring3FeaturesTest extends KarafTestSupport {
     }
 
     @Test
-    @Ignore
     public void installSpringOrmFeature() throws Exception {
         installAssertAndUninstallFeature("spring-orm", System.getProperty("spring32.version"));
     }
@@ -87,27 +152,27 @@ public class Spring3FeaturesTest extends KarafTestSupport {
     }
 
     @Test
-    @Ignore
     public void installSpringWebFeature() throws Exception {
         installAssertAndUninstallFeature("spring-web", System.getProperty("spring32.version"));
     }
 
     @Test
-    @Ignore
     public void installSpringWebPortletFeature() throws Exception {
         installAssertAndUninstallFeature("spring-web-portlet", System.getProperty("spring32.version"));
     }
 
+    // Spring Security
+
     @Test
     public void installSpringSecurityFeature() throws Exception {
         installAssertAndUninstallFeatures("spring-security");
     }
 
+    // Gemini
+
     @Test
     public void installGeminiBlueprintFeature() throws Exception {
         installAssertAndUninstallFeatures("gemini-blueprint");
     }
 
-    // TODO add combined/all Spring features installation tests
-
 }


Mime
View raw message