aries-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwr...@apache.org
Subject svn commit: r1396011 - in /aries/trunk/application/application-itests: ./ src/test/java/org/apache/aries/application/runtime/itests/
Date Tue, 09 Oct 2012 13:00:47 GMT
Author: jwross
Date: Tue Oct  9 13:00:46 2012
New Revision: 1396011

URL: http://svn.apache.org/viewvc?rev=1396011&view=rev
Log:
Three new profiles have been defined in the POM: equinox38, equinox37, and equinox35. Each
profile configures the maven-paxexam-plugin to generate a META-INF/maven/paxexam-config.args
file pointing to the corresponding framework runtime environment, which is used to execute
the tests. By default, the equinox38 profile is active and will be used to run the tests unless
overridden. To override the default profile, simply specify the desired profile on the command
line. For example, "mvn test -P equinox37" or "mvn install -P equinox35".

Modified:
    aries/trunk/application/application-itests/pom.xml
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
    aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java

Modified: aries/trunk/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/pom.xml?rev=1396011&r1=1396010&r2=1396011&view=diff
==============================================================================
--- aries/trunk/application/application-itests/pom.xml (original)
+++ aries/trunk/application/application-itests/pom.xml Tue Oct  9 13:00:46 2012
@@ -294,5 +294,89 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <id>equinox35</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+            	<plugins>
+		            <plugin>
+		        		<groupId>org.ops4j.pax.exam</groupId>
+		        		<artifactId>maven-paxexam-plugin</artifactId>
+		        		<executions>
+		         	 		<execution>
+		            			<id>generate-config</id>
+		            			<goals>
+		              				<goal>generate-config</goal>
+		            			</goals>
+		          			</execution>
+		        		</executions>
+		        		<configuration>
+		          			<options>
+		            			<platform>equinox</platform>
+		            			<version>3.5.0</version>
+		          			</options>
+		        		</configuration>
+		      		</plugin>
+	      		</plugins>
+      		</build>
+        </profile>
+        <profile>
+            <id>equinox37</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+            	<plugins>
+		            <plugin>
+		        		<groupId>org.ops4j.pax.exam</groupId>
+		        		<artifactId>maven-paxexam-plugin</artifactId>
+		        		<executions>
+		         	 		<execution>
+		            			<id>generate-config</id>
+		            			<goals>
+		              				<goal>generate-config</goal>
+		            			</goals>
+		          			</execution>
+		        		</executions>
+		        		<configuration>
+		          			<options>
+		            			<platform>equinox</platform>
+		            			<version>3.7.0.v20110613</version>
+		          			</options>
+		        		</configuration>
+		      		</plugin>
+	      		</plugins>
+      		</build>
+        </profile>
+        <profile>
+            <id>equinox38</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+            	<plugins>
+		            <plugin>
+		        		<groupId>org.ops4j.pax.exam</groupId>
+		        		<artifactId>maven-paxexam-plugin</artifactId>
+		        		<executions>
+		         	 		<execution>
+		            			<id>generate-config</id>
+		            			<goals>
+		              				<goal>generate-config</goal>
+		            			</goals>
+		          			</execution>
+		        		</executions>
+		        		<configuration>
+		          			<options>
+		            			<platform>equinox</platform>
+		            			<version>3.8.0.V20120529-1548</version>
+		          			</options>
+		        		</configuration>
+		      		</plugin>
+	      		</plugins>
+      		</build>
+        </profile>
     </profiles>
 </project>

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java?rev=1396011&r1=1396010&r2=1396011&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java
Tue Oct  9 13:00:46 2012
@@ -18,11 +18,11 @@
  */
 package org.apache.aries.application.runtime.itests;
 
+import static org.apache.aries.itest.ExtraOptions.mavenBundle;
+import static org.apache.aries.itest.ExtraOptions.paxLogging;
+import static org.apache.aries.itest.ExtraOptions.testOptions;
 import static org.junit.Assert.assertEquals;
 
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.apache.aries.itest.ExtraOptions.*;
-
 import java.io.File;
 import java.io.FileOutputStream;
 
@@ -39,9 +39,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
 
-@RunWith(JUnit4TestRunner.class)
+@RunWith(MavenConfiguredJUnit4TestRunner.class)
 public class BasicAppManagerTest extends AbstractIntegrationTest {
   
   /* Use @Before not @BeforeClass so as to ensure that these resources
@@ -173,41 +173,13 @@ public class BasicAppManagerTest extends
         */
 
   }
-
-  /*
-   * Commented out to avoid an NPE due to a ConcurrentModificationException in
-   * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-   */
-  //@org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox35Options()
-  {
-	  return testOptions(
-			  generalConfiguration(),
-	          equinox().version("3.5.0")
-	          );
-  }
-
-  /*
-   * Commented out to avoid an NPE due to a ConcurrentModificationException in
-   * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-   */
-  //@org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox37Options()
-  {
-	  return testOptions(
-			  generalConfiguration(),
-			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),   
      
-	          equinox().version("3.7.0.v20110613")
-	          );
-  }
   
   @org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox38Options()
+  public static Option[] configuration()
   {
 	  return testOptions(
 			  generalConfiguration(),
-			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),   
      
-	          equinox().version("3.8.0.V20120529-1548")
+			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties")    
   
 	          );
   }
 

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java?rev=1396011&r1=1396010&r2=1396011&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java
Tue Oct  9 13:00:46 2012
@@ -18,9 +18,10 @@
  */
 package org.apache.aries.application.runtime.itests;
 
+import static org.apache.aries.itest.ExtraOptions.mavenBundle;
+import static org.apache.aries.itest.ExtraOptions.paxLogging;
+import static org.apache.aries.itest.ExtraOptions.testOptions;
 import static org.junit.Assert.assertEquals;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.apache.aries.itest.ExtraOptions.*;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -38,9 +39,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
 
-@RunWith(JUnit4TestRunner.class)
+@RunWith(MavenConfiguredJUnit4TestRunner.class)
 public class BasicNoOpResolverTest extends AbstractIntegrationTest {
   
   /* Use @Before not @BeforeClass so as to ensure that these resources
@@ -148,40 +149,12 @@ public class BasicNoOpResolverTest exten
 
   }
 
-  /*
-   * Commented out to avoid an NPE due to a ConcurrentModificationException in
-   * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-   */
-  //@org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox35Options()
-  {
-	  return testOptions(
-			  generalConfiguration(),
-	          equinox().version("3.5.0")
-	          );
-  }
-
-  /*
-   * Commented out to avoid an NPE due to a ConcurrentModificationException in
-   * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-   */
-  //@org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox37Options()
-  {
-	  return testOptions(
-			  generalConfiguration(),
-			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),   
      
-	          equinox().version("3.7.0.v20110613")
-	          );
-  }
-  
   @org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox38Options()
+  public static Option[] configuration()
   {
 	  return testOptions(
 			  generalConfiguration(),
-			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),   
      
-	          equinox().version("3.8.0.V20120529-1548")
+			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties")    
   
 	          );
   }
 

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java?rev=1396011&r1=1396010&r2=1396011&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java
Tue Oct  9 13:00:46 2012
@@ -24,7 +24,6 @@ import static org.apache.aries.itest.Ext
 import static org.apache.aries.itest.ExtraOptions.mavenBundleInTest;
 import static org.apache.aries.itest.ExtraOptions.paxLogging;
 import static org.apache.aries.itest.ExtraOptions.testOptions;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.repository;
 
 import java.io.File;
@@ -58,7 +57,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
 import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
@@ -96,7 +95,7 @@ import org.osgi.util.tracker.ServiceTrac
  *
  * @version $Rev$ $Date$
  */
-@RunWith(JUnit4TestRunner.class)
+@RunWith(MavenConfiguredJUnit4TestRunner.class)
 public class IsolatedCfgAdminRuntimeTest extends AbstractIntegrationTest {
     
     private static final String APP_HWBP = "helloworld-bp.eba";
@@ -388,40 +387,12 @@ public class IsolatedCfgAdminRuntimeTest
                 //vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"),

     }
 
-    /*
-     * Commented out to avoid an NPE due to a ConcurrentModificationException in
-     * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-     */
-    //@org.ops4j.pax.exam.junit.Configuration
-    public static Option[] equinox35Options() throws Exception
-    {
-  	  return testOptions(
-  			  generalConfiguration(),
-  	          equinox().version("3.5.0")
-  	          );
-    }
-
-    /*
-     * Commented out to avoid an NPE due to a ConcurrentModificationException in
-     * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-     */
-    //@org.ops4j.pax.exam.junit.Configuration
-    public static Option[] equinox37Options() throws Exception
-    {
-  	  return testOptions(
-  			  generalConfiguration(),
-  			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"), 
        
-  	          equinox().version("3.7.0.v20110613")
-  	          );
-    }
-    
     @org.ops4j.pax.exam.junit.Configuration
-    public static Option[] equinox38Options() throws Exception
+    public static Option[] configuration() throws Exception
     {
   	  return testOptions(
   			  generalConfiguration(),
-  			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"), 
        
-  	          equinox().version("3.8.0.V20120529-1548")
+  			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties")  
     
   	          );
     }
 

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java?rev=1396011&r1=1396010&r2=1396011&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java
Tue Oct  9 13:00:46 2012
@@ -18,15 +18,16 @@
  */
 package org.apache.aries.application.runtime.itests;
 
+import static org.apache.aries.itest.ExtraOptions.flatOptions;
+import static org.apache.aries.itest.ExtraOptions.mavenBundle;
+import static org.apache.aries.itest.ExtraOptions.paxLogging;
+import static org.apache.aries.itest.ExtraOptions.testOptions;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.repository;
 
-import static org.apache.aries.itest.ExtraOptions.*;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -51,13 +52,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleEvent;
 import org.osgi.framework.SynchronousBundleListener;
 import org.osgi.service.framework.CompositeBundle;
 
-@RunWith(JUnit4TestRunner.class)
+@RunWith(MavenConfiguredJUnit4TestRunner.class)
 public class IsolatedRuntimeTest extends AbstractIntegrationTest {
   
   /* Use @Before not @BeforeClass so as to ensure that these resources
@@ -346,40 +347,12 @@ public class IsolatedRuntimeTest extends
           );
   }
   
-  /*
-   * Commented out to avoid an NPE due to a ConcurrentModificationException in
-   * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-   */
-  //@org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox35Options()
-  {
-	  return testOptions(
-			  generalConfiguration(),
-	          equinox().version("3.5.0")
-	          );
-  }
-
-  /*
-   * Commented out to avoid an NPE due to a ConcurrentModificationException in
-   * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-   */
-  //@org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox37Options()
-  {
-	  return testOptions(
-			  generalConfiguration(),
-			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),   
      
-	          equinox().version("3.7.0.v20110613")
-	          );
-  }
-  
   @org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox38Options()
+  public static Option[] configuration()
   {
 	  return testOptions(
 			  generalConfiguration(),
-			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),   
      
-	          equinox().version("3.8.0.V20120529-1548")
+			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties")    
   
 	          );
   }
 

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java?rev=1396011&r1=1396010&r2=1396011&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java
Tue Oct  9 13:00:46 2012
@@ -18,10 +18,11 @@
  */
 package org.apache.aries.application.runtime.itests;
 
+import static org.apache.aries.itest.ExtraOptions.mavenBundle;
+import static org.apache.aries.itest.ExtraOptions.paxLogging;
+import static org.apache.aries.itest.ExtraOptions.testOptions;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.apache.aries.itest.ExtraOptions.*;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -44,13 +45,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.blueprint.container.BlueprintEvent;
 import org.osgi.service.blueprint.container.BlueprintListener;
 
-@RunWith(JUnit4TestRunner.class)
+@RunWith(MavenConfiguredJUnit4TestRunner.class)
 public class MinimumImportsTest extends AbstractIntegrationTest {
 
   /* Use @Before not @BeforeClass so as to ensure that these resources
@@ -198,40 +199,12 @@ public class MinimumImportsTest extends 
         );
   }
   
-  /*
-   * Commented out to avoid an NPE due to a ConcurrentModificationException in
-   * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-   */
-  //@org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox35Options()
-  {
-	  return testOptions(
-			  generalConfiguration(),
-	          equinox().version("3.5.0")
-	          );
-  }
-
-  /*
-   * Commented out to avoid an NPE due to a ConcurrentModificationException in
-   * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-   */
-  //@org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox37Options()
-  {
-	  return testOptions(
-			  generalConfiguration(),
-			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),   
      
-	          equinox().version("3.7.0.v20110613")
-	          );
-  }
-  
   @org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox38Options()
+  public static Option[] configuration()
   {
 	  return testOptions(
 			  generalConfiguration(),
-			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),   
      
-	          equinox().version("3.8.0.V20120529-1548")
+			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties")    
   
 	          );
   }
 

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java?rev=1396011&r1=1396010&r2=1396011&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
Tue Oct  9 13:00:46 2012
@@ -18,9 +18,10 @@
  */
 package org.apache.aries.application.runtime.itests;
 
+import static org.apache.aries.itest.ExtraOptions.mavenBundle;
+import static org.apache.aries.itest.ExtraOptions.paxLogging;
+import static org.apache.aries.itest.ExtraOptions.testOptions;
 import static org.junit.Assert.assertEquals;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.apache.aries.itest.ExtraOptions.*;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -45,9 +46,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
 
-@RunWith(JUnit4TestRunner.class)
+@RunWith(MavenConfiguredJUnit4TestRunner.class)
 public class OBRAppManagerTest extends AbstractIntegrationTest {
 
   /* Use @Before not @BeforeClass so as to ensure that these resources
@@ -182,40 +183,12 @@ public class OBRAppManagerTest extends A
         );
   }
   
-  /*
-   * Commented out to avoid an NPE due to a ConcurrentModificationException in
-   * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-   */
-  //@org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox35Options()
-  {
-	  return testOptions(
-			  generalConfiguration(),
-	          equinox().version("3.5.0")
-	          );
-  }
-
-  /*
-   * Commented out to avoid an NPE due to a ConcurrentModificationException in
-   * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-   */
-  //@org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox37Options()
-  {
-	  return testOptions(
-			  generalConfiguration(),
-			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),   
      
-	          equinox().version("3.7.0.v20110613")
-	          );
-  }
-  
   @org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox38Options()
+  public static Option[] configuration()
   {
 	  return testOptions(
 			  generalConfiguration(),
-			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),   
      
-	          equinox().version("3.8.0.V20120529-1548")
+			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties")    
   
 	          );
   }
 

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java?rev=1396011&r1=1396010&r2=1396011&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
Tue Oct  9 13:00:46 2012
@@ -23,7 +23,6 @@ import static org.apache.aries.itest.Ext
 import static org.apache.aries.itest.ExtraOptions.paxLogging;
 import static org.apache.aries.itest.ExtraOptions.testOptions;
 import static org.junit.Assert.assertTrue;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -67,7 +66,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.w3c.dom.Document;
@@ -75,7 +74,7 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-@RunWith(JUnit4TestRunner.class)
+@RunWith(MavenConfiguredJUnit4TestRunner.class)
 public class OBRResolverAdvancedTest extends AbstractIntegrationTest 
 {
   public static final String CORE_BUNDLE_BY_VALUE = "core.bundle.by.value";
@@ -563,40 +562,12 @@ public class OBRResolverAdvancedTest ext
         );
   }
   
-  /*
-   * Commented out to avoid an NPE due to a ConcurrentModificationException in
-   * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-   */
-  //@org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox35Options()
-  {
-	  return testOptions(
-			  generalConfiguration(),
-	          equinox().version("3.5.0")
-	          );
-  }
-
-  /*
-   * Commented out to avoid an NPE due to a ConcurrentModificationException in
-   * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-   */
-  //@org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox37Options()
-  {
-	  return testOptions(
-			  generalConfiguration(),
-			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),   
      
-	          equinox().version("3.7.0.v20110613")
-	          );
-  }
-  
   @org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox38Options()
+  public static Option[] configuration()
   {
 	  return testOptions(
 			  generalConfiguration(),
-			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),   
      
-	          equinox().version("3.8.0.V20120529-1548")
+			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties")    
   
 	          );
   }
 

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java?rev=1396011&r1=1396010&r2=1396011&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java
Tue Oct  9 13:00:46 2012
@@ -23,7 +23,6 @@ import static org.apache.aries.itest.Ext
 import static org.apache.aries.itest.ExtraOptions.testOptions;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
 import static org.osgi.framework.Constants.BUNDLE_MANIFESTVERSION;
 import static org.osgi.framework.Constants.BUNDLE_SYMBOLICNAME;
 import static org.osgi.framework.Constants.BUNDLE_VERSION;
@@ -66,10 +65,10 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
 import org.osgi.framework.Bundle;
 
-@RunWith(JUnit4TestRunner.class)
+@RunWith(MavenConfiguredJUnit4TestRunner.class)
 public class OBRResolverTest extends AbstractIntegrationTest 
 {
   public static final String CORE_BUNDLE_BY_VALUE = "core.bundle.by.value";
@@ -348,40 +347,12 @@ public class OBRResolverTest extends Abs
         );
   }
   
-  /*
-   * Commented out to avoid an NPE due to a ConcurrentModificationException in
-   * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-   */
-  //@org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox35Options()
-  {
-	  return testOptions(
-			  generalConfiguration(),
-	          equinox().version("3.5.0")
-	          );
-  }
-
-  /*
-   * Commented out to avoid an NPE due to a ConcurrentModificationException in
-   * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-   */
-  //@org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox37Options()
-  {
-	  return testOptions(
-			  generalConfiguration(),
-			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),   
      
-	          equinox().version("3.7.0.v20110613")
-	          );
-  }
-  
   @org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox38Options()
+  public static Option[] configuration()
   {
 	  return testOptions(
 			  generalConfiguration(),
-			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),   
      
-	          equinox().version("3.8.0.V20120529-1548")
+			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties")    
   
 	          );
   }
 

Modified: aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java?rev=1396011&r1=1396010&r2=1396011&view=diff
==============================================================================
--- aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
(original)
+++ aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java
Tue Oct  9 13:00:46 2012
@@ -18,15 +18,15 @@
  */
 package org.apache.aries.application.runtime.itests;
 
+import static org.apache.aries.itest.ExtraOptions.mavenBundle;
+import static org.apache.aries.itest.ExtraOptions.paxLogging;
+import static org.apache.aries.itest.ExtraOptions.testOptions;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 
-import static org.apache.aries.itest.ExtraOptions.*;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.Hashtable;
@@ -40,8 +40,8 @@ import org.apache.aries.application.mana
 import org.apache.aries.application.management.ResolveConstraint;
 import org.apache.aries.application.management.UpdateException;
 import org.apache.aries.application.management.spi.framework.BundleFramework;
-import org.apache.aries.application.management.spi.repository.RepositoryGenerator;
 import org.apache.aries.application.management.spi.repository.BundleRepository.BundleSuggestion;
+import org.apache.aries.application.management.spi.repository.RepositoryGenerator;
 import org.apache.aries.application.management.spi.update.UpdateStrategy;
 import org.apache.aries.application.modelling.ModellingManager;
 import org.apache.aries.application.runtime.itests.util.IsolationTestUtils;
@@ -59,11 +59,11 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.container.def.PaxRunnerOptions;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.ops4j.pax.exam.junit.MavenConfiguredJUnit4TestRunner;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 
-@RunWith(JUnit4TestRunner.class)
+@RunWith(MavenConfiguredJUnit4TestRunner.class)
 public class UpdateAppTest extends AbstractIntegrationTest {
   private static final String SAMPLE_APP_NAME = "org.apache.aries.sample2";
   /* Use @Before not @BeforeClass so as to ensure that these resources
@@ -285,40 +285,12 @@ public class UpdateAppTest extends Abstr
         );
   }
   
-  /*
-   * Commented out to avoid an NPE due to a ConcurrentModificationException in
-   * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-   */
-  //@org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox35Options()
-  {
-	  return testOptions(
-			  generalConfiguration(),
-	          equinox().version("3.5.0")
-	          );
-  }
-
-  /*
-   * Commented out to avoid an NPE due to a ConcurrentModificationException in
-   * the Aries build. See https://issues.apache.org/jira/browse/ARIES-931.
-   */
-  //@org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox37Options()
-  {
-	  return testOptions(
-			  generalConfiguration(),
-			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),   
      
-	          equinox().version("3.7.0.v20110613")
-	          );
-  }
-  
   @org.ops4j.pax.exam.junit.Configuration
-  public static Option[] equinox38Options()
+  public static Option[] configuration()
   {
 	  return testOptions(
 			  generalConfiguration(),
-			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties"),   
      
-	          equinox().version("3.8.0.V20120529-1548")
+			  PaxRunnerOptions.rawPaxRunnerOption("config", "classpath:ss-runner.properties")    
   
 	          );
   }
 



Mime
View raw message