You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by gn...@apache.org on 2014/06/10 10:46:27 UTC
svn commit: r1601574 - in /aries/trunk/quiesce/quiesce-manager-itest: pom.xml
src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java
Author: gnodet
Date: Tue Jun 10 08:46:26 2014
New Revision: 1601574
URL: http://svn.apache.org/r1601574
Log:
Upgrade quiesce to pax exam 3.4
Modified:
aries/trunk/quiesce/quiesce-manager-itest/pom.xml
aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java
Modified: aries/trunk/quiesce/quiesce-manager-itest/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/quiesce/quiesce-manager-itest/pom.xml?rev=1601574&r1=1601573&r2=1601574&view=diff
==============================================================================
--- aries/trunk/quiesce/quiesce-manager-itest/pom.xml (original)
+++ aries/trunk/quiesce/quiesce-manager-itest/pom.xml Tue Jun 10 08:46:26 2014
@@ -41,6 +41,11 @@
<dependencies>
<dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.8.0.v20120529-1548</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.quiesce</groupId>
<artifactId>org.apache.aries.quiesce.api</artifactId>
<version>1.0.0</version>
@@ -55,14 +60,16 @@
<dependency>
<groupId>org.apache.aries.testsupport</groupId>
<artifactId>org.apache.aries.testsupport.unit</artifactId>
- <version>1.0.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
+ <!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
</dependency>
+ -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
@@ -85,14 +92,26 @@
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-default</artifactId>
- <version>1.2.4</version>
+ <artifactId>pax-exam</artifactId>
+ <version>3.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit</artifactId>
- <version>1.2.4</version>
+ <artifactId>pax-exam-container-native</artifactId>
+ <version>3.4.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit4</artifactId>
+ <version>3.4.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-link-mvn</artifactId>
+ <version>3.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java?rev=1601574&r1=1601573&r2=1601574&view=diff
==============================================================================
--- aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java (original)
+++ aries/trunk/quiesce/quiesce-manager-itest/src/test/java/org/apache/aries/quiesce/manager/itest/QuiesceManagerTest.java Tue Jun 10 08:46:26 2014
@@ -15,10 +15,6 @@
*/
package org.apache.aries.quiesce.manager.itest;
-import static org.junit.Assert.*;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.apache.aries.itest.ExtraOptions.*;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -33,11 +29,26 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+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;
import org.osgi.framework.Bundle;
-@RunWith(JUnit4TestRunner.class)
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.ops4j.pax.exam.CoreOptions.composite;
+import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.vmOption;
+import static org.ops4j.pax.exam.CoreOptions.when;
+
+@RunWith(PaxExam.class)
+@ExamReactorStrategy(PerMethod.class)
public class QuiesceManagerTest extends AbstractIntegrationTest {
private QuiesceManager manager;
private Bundle b1;
@@ -266,24 +277,35 @@ public class QuiesceManagerTest extends
assertTrue("Bundle "+b3.getSymbolicName()+" should not be in active state", b3.getState() != Bundle.ACTIVE);
}
- @org.ops4j.pax.exam.junit.Configuration
- public static Option[] configuration() {
- return testOptions(
- paxLogging("DEBUG"),
+ public Option baseOptions() {
+ String localRepo = getLocalRepo();
+ return composite(
+ junitBundles(),
+ // this is how you set the default log level when using pax
+ // logging (logProfile)
+ systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
+ when(localRepo != null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" + localRepo))
+ );
+ }
+ @Configuration
+ public Option[] configuration() {
+ return new Option[]{
+ baseOptions(),
// Bundles
- mavenBundle("org.osgi", "org.osgi.compendium"),
- mavenBundle("org.apache.aries", "org.apache.aries.util"),
- mavenBundle("commons-lang", "commons-lang"),
- mavenBundle("commons-collections", "commons-collections"),
- mavenBundle("commons-pool", "commons-pool"),
- mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp"),
- mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api"),
- mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.manager"),
-
+ mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(),
+ mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(),
+ mavenBundle("commons-lang", "commons-lang").versionAsInProject(),
+ mavenBundle("commons-collections", "commons-collections").versionAsInProject(),
+ mavenBundle("commons-pool", "commons-pool").versionAsInProject(),
+ mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp").versionAsInProject(),
+ mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api").versionAsInProject(),
+ mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.manager").versionAsInProject(),
+ mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
+
//new VMOption( "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000" ),
//new TimeoutOption( 0 ),
- equinox().version("3.5.0"));
+ };
}
}