You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2014/08/25 17:14:08 UTC
git commit: Extend the Spring 4 features itest coverage
Repository: karaf
Updated Branches:
refs/heads/master 3aa5fef7a -> 9aa297375
Extend the Spring 4 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/9aa29737
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9aa29737
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9aa29737
Branch: refs/heads/master
Commit: 9aa297375490d32aef8008629204c54543982fc4
Parents: 3aa5fef
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Mon Aug 25 17:13:47 2014 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Mon Aug 25 17:13:47 2014 +0200
----------------------------------------------------------------------
.../karaf/itests/features/EnterpriseFeaturesTest.java | 4 ++--
.../apache/karaf/itests/features/Spring4FeaturesTest.java | 10 +++++++++-
.../karaf/itests/features/StandardFeaturesTest.java | 4 ++--
3 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/9aa29737/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
index b04e802..87533d4 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
@@ -18,10 +18,10 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
+@ExamReactorStrategy(PerMethod.class)
public class EnterpriseFeaturesTest extends KarafTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/karaf/blob/9aa29737/itests/src/test/java/org/apache/karaf/itests/features/Spring4FeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/Spring4FeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/Spring4FeaturesTest.java
index 39ad606..191087c 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/Spring4FeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/Spring4FeaturesTest.java
@@ -74,6 +74,14 @@ public class Spring4FeaturesTest extends KarafTestSupport {
installAssertAndUninstallFeature("spring-web", System.getProperty("spring40.version"));
}
- // TODO add combined/all Spring features installation tests
+ @Test
+ public void installSpringWebPortletFeature() throws Exception {
+ installAssertAndUninstallFeature("spring-web-portlet", System.getProperty("spring40.version"));
+ }
+
+ @Test
+ public void installSpringWebSocketFeature() throws Exception {
+ installAssertAndUninstallFeature("spring-websocket", System.getProperty("spring40.version"));
+ }
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/9aa29737/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
index 97031db..00fdcb9 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
@@ -19,10 +19,10 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
+import org.ops4j.pax.exam.spi.reactors.PerMethod;
@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
+@ExamReactorStrategy(PerMethod.class)
public class StandardFeaturesTest extends KarafTestSupport {
@Test