You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2013/10/26 20:54:32 UTC
svn commit: r1536019 - in /karaf/trunk/itests: ./
src/test/java/org/apache/karaf/itests/features/
Author: cschneider
Date: Sat Oct 26 18:54:32 2013
New Revision: 1536019
URL: http://svn.apache.org/r1536019
Log:
KARAF-2533 Use PerClass for feature tests
Modified:
karaf/trunk/itests/pom.xml
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
Modified: karaf/trunk/itests/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/pom.xml?rev=1536019&r1=1536018&r2=1536019&view=diff
==============================================================================
--- karaf/trunk/itests/pom.xml (original)
+++ karaf/trunk/itests/pom.xml Sat Oct 26 18:54:32 2013
@@ -38,29 +38,16 @@
</properties>
<dependencies>
-
- <dependency>
- <groupId>org.apache.karaf</groupId>
- <artifactId>apache-karaf</artifactId>
- <scope>test</scope>
- <type>zip</type>
- <exclusions>
- <exclusion>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.client</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<scope>test</scope>
<type>tar.gz</type>
<exclusions>
- <exclusion>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.client</artifactId>
- </exclusion>
+ <exclusion>
+ <artifactId>org.apache.karaf.client</artifactId>
+ <groupId>org.apache.karaf</groupId>
+ </exclusion>
</exclusions>
</dependency>
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java?rev=1536019&r1=1536018&r2=1536019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java Sat Oct 26 18:54:32 2013
@@ -18,30 +18,30 @@ 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.PerMethod;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
+@ExamReactorStrategy(PerClass.class)
public class EnterpriseFeaturesTest extends KarafTestSupport {
@Test
public void installTransactionFeature() throws Exception {
- installAndAssertFeature("transaction");
+ installAssertAndUninstallFeature("transaction");
}
@Test
public void installJpaFeature() throws Exception {
- installAndAssertFeature("jpa");
+ installAssertAndUninstallFeature("jpa");
}
@Test
public void installJndiFeature() throws Exception {
- installAndAssertFeature("jndi");
+ installAssertAndUninstallFeature("jndi");
}
@Test
public void installApplicationWithoutIsolationFeature() throws Exception {
- installAndAssertFeature("application-without-isolation");
+ installAssertAndUninstallFeature("application-without-isolation");
}
}
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java?rev=1536019&r1=1536018&r2=1536019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java Sat Oct 26 18:54:32 2013
@@ -19,87 +19,87 @@ 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.PerMethod;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
+@ExamReactorStrategy(PerClass.class)
public class SpringFeaturesTest extends KarafTestSupport {
@Test
public void installSpringFeature() throws Exception {
- installAndAssertFeature("spring");
+ installAssertAndUninstallFeature("spring");
}
@Test
public void installSpringAspectsFeature() throws Exception {
- installAndAssertFeature("spring-aspects");
+ installAssertAndUninstallFeature("spring-aspects");
}
@Test
public void installSpringDmFeature() throws Exception {
- installAndAssertFeature("spring-dm");
+ installAssertAndUninstallFeature("spring-dm");
}
@Test
public void installSpringDmWebFeature() throws Exception {
- installAndAssertFeature("spring-dm-web");
+ installAssertAndUninstallFeature("spring-dm-web");
}
@Test
public void installSpringInstrumentFeature() throws Exception {
- installAndAssertFeature("spring-instrument");
+ installAssertAndUninstallFeature("spring-instrument");
}
@Test
public void installSpringJdbcFeature() throws Exception {
- installAndAssertFeature("spring-jdbc");
+ installAssertAndUninstallFeature("spring-jdbc");
}
@Test
public void installSpringJmsFeature() throws Exception {
- installAndAssertFeature("spring-jms");
+ installAssertAndUninstallFeature("spring-jms");
}
@Test
public void installSpringStrutsFeature() throws Exception {
- installAndAssertFeature("spring-struts");
+ installAssertAndUninstallFeature("spring-struts");
}
@Test
public void installSpringTestFeature() throws Exception {
- installAndAssertFeature("spring-test");
+ installAssertAndUninstallFeature("spring-test");
}
@Test
public void installSpringOrmFeature() throws Exception {
- installAndAssertFeature("spring-orm");
+ installAssertAndUninstallFeature("spring-orm");
}
@Test
public void installSpringOxmFeature() throws Exception {
- installAndAssertFeature("spring-oxm");
+ installAssertAndUninstallFeature("spring-oxm");
}
@Test
public void installSpringTxFeature() throws Exception {
- installAndAssertFeature("spring-tx");
+ installAssertAndUninstallFeature("spring-tx");
}
@Test
public void installSpringWebFeature() throws Exception {
- installAndAssertFeature("spring-web");
+ installAssertAndUninstallFeature("spring-web");
}
@Test
@Ignore
public void installSpringWebPortletFeature() throws Exception {
- installAndAssertFeature("spring-web-portlet");
+ installAssertAndUninstallFeature("spring-web-portlet");
}
@Test
@Ignore
public void installGeminiBlueprintFeature() throws Exception {
- installAndAssertFeature("gemini-blueprint");
+ installAssertAndUninstallFeature("gemini-blueprint");
}
}
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java?rev=1536019&r1=1536018&r2=1536019&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java Sat Oct 26 18:54:32 2013
@@ -18,95 +18,95 @@ 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.PerMethod;
+import org.ops4j.pax.exam.spi.reactors.PerClass;
@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
+@ExamReactorStrategy(PerClass.class)
public class StandardFeaturesTest extends KarafTestSupport {
@Test
public void installAriesAnnotationFeature() throws Exception {
- installAndAssertFeature("aries-annotation");
+ installAssertAndUninstallFeature("aries-annotation");
}
@Test
public void installWrapperFeature() throws Exception {
- installAndAssertFeature("wrapper");
+ installAssertAndUninstallFeature("wrapper");
}
@Test
public void installObrFeature() throws Exception {
- installAndAssertFeature("obr");
+ installAssertAndUninstallFeature("obr");
}
@Test
public void installConfigFeature() throws Exception {
- installAndAssertFeature("config");
+ installAssertAndUninstallFeature("config");
}
@Test
public void installRegionFeature() throws Exception {
- installAndAssertFeature("region");
+ installAssertAndUninstallFeature("region");
}
@Test
public void installPackageFeature() throws Exception {
- installAndAssertFeature("package");
+ installAssertAndUninstallFeature("package");
}
@Test
public void installHttpFeature() throws Exception {
- installAndAssertFeature("http");
+ installAssertAndUninstallFeature("http");
}
@Test
public void installHttpWhiteboardFeature() throws Exception {
- installAndAssertFeature("http-whiteboard");
+ installAssertAndUninstallFeature("http-whiteboard");
}
@Test
public void installWarFeature() throws Exception {
- installAndAssertFeature("war");
+ installAssertAndUninstallFeature("war");
}
@Test
public void installKarFeature() throws Exception {
- installAndAssertFeature("kar");
+ installAssertAndUninstallFeature("kar");
}
@Test
public void installWebConsoleFeature() throws Exception {
- installAndAssertFeature("webconsole");
+ installAssertAndUninstallFeature("webconsole");
}
@Test
public void installSSHFeature() throws Exception {
- installAndAssertFeature("ssh");
+ installAssertAndUninstallFeature("ssh");
}
@Test
public void installManagementFeature() throws Exception {
- installAndAssertFeature("management");
+ installAssertAndUninstallFeature("management");
}
@Test
public void installSchedulerFeature() throws Exception {
- installAndAssertFeature("scheduler");
+ installAssertAndUninstallFeature("scheduler");
}
@Test
public void installEventAdminFeature() throws Exception {
- installAndAssertFeature("eventadmin");
+ installAssertAndUninstallFeature("eventadmin");
}
@Test
public void installJasyptEncryptionFeature() throws Exception {
- installAndAssertFeature("jasypt-encryption");
+ installAssertAndUninstallFeature("jasypt-encryption");
}
@Test
public void installScrFeature() throws Exception {
- installAndAssertFeature("scr");
+ installAssertAndUninstallFeature("scr");
}
}