Author: jwross
Date: Fri Oct 5 11:59:50 2012
New Revision: 1394463
URL: http://svn.apache.org/viewvc?rev=1394463&view=rev
Log:
ARIES-931: Applications iTests now run against Equinox 3.8 for the Aries build
in order to avoid an intermittent NPE due to an embedded
ConcurrentModificationException. The ability to run against 3.5 and 3.7 remains
but would need to be enabled and run locally if necessary.
Added:
aries/trunk/application/application-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20120529-1548.xml
Modified:
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
aries/trunk/application/application-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
aries/trunk/application/application-itests/src/test/resources/ss-runner.properties
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=1394463&r1=1394462&r2=1394463&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
Fri Oct 5 11:59:50 2012
@@ -174,7 +174,11 @@ public class BasicAppManagerTest extends
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -183,7 +187,11 @@ public class BasicAppManagerTest extends
);
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -192,5 +200,15 @@ public class BasicAppManagerTest extends
equinox().version("3.7.0.v20110613")
);
}
+
+ @org.ops4j.pax.exam.junit.Configuration
+ public static Option[] equinox38Options()
+ {
+ return testOptions(
+ generalConfiguration(),
+ PaxRunnerOptions.rawPaxRunnerOption("config",
"classpath:ss-runner.properties"),
+ equinox().version("3.8.0.V20120529-1548")
+ );
+ }
}
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=1394463&r1=1394462&r2=1394463&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
Fri Oct 5 11:59:50 2012
@@ -148,7 +148,11 @@ public class BasicNoOpResolverTest exten
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -157,7 +161,11 @@ public class BasicNoOpResolverTest exten
);
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -166,5 +174,15 @@ public class BasicNoOpResolverTest exten
equinox().version("3.7.0.v20110613")
);
}
+
+ @org.ops4j.pax.exam.junit.Configuration
+ public static Option[] equinox38Options()
+ {
+ return testOptions(
+ generalConfiguration(),
+ PaxRunnerOptions.rawPaxRunnerOption("config",
"classpath:ss-runner.properties"),
+ equinox().version("3.8.0.V20120529-1548")
+ );
+ }
}
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=1394463&r1=1394462&r2=1394463&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
Fri Oct 5 11:59:50 2012
@@ -388,7 +388,11 @@ public class IsolatedCfgAdminRuntimeTest
//vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"),
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -397,7 +401,11 @@ public class IsolatedCfgAdminRuntimeTest
);
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -406,6 +414,16 @@ public class IsolatedCfgAdminRuntimeTest
equinox().version("3.7.0.v20110613")
);
}
+
+ @org.ops4j.pax.exam.junit.Configuration
+ public static Option[] equinox38Options() throws Exception
+ {
+ return testOptions(
+ generalConfiguration(),
+ PaxRunnerOptions.rawPaxRunnerOption("config",
"classpath:ss-runner.properties"),
+ equinox().version("3.8.0.V20120529-1548")
+ );
+ }
/**
* High level interface for executing a unit of work
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=1394463&r1=1394462&r2=1394463&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
Fri Oct 5 11:59:50 2012
@@ -346,7 +346,11 @@ public class IsolatedRuntimeTest extends
);
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -355,7 +359,11 @@ public class IsolatedRuntimeTest extends
);
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -364,5 +372,15 @@ public class IsolatedRuntimeTest extends
equinox().version("3.7.0.v20110613")
);
}
+
+ @org.ops4j.pax.exam.junit.Configuration
+ public static Option[] equinox38Options()
+ {
+ return testOptions(
+ generalConfiguration(),
+ PaxRunnerOptions.rawPaxRunnerOption("config",
"classpath:ss-runner.properties"),
+ equinox().version("3.8.0.V20120529-1548")
+ );
+ }
}
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=1394463&r1=1394462&r2=1394463&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
Fri Oct 5 11:59:50 2012
@@ -198,7 +198,11 @@ public class MinimumImportsTest extends
);
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -207,7 +211,11 @@ public class MinimumImportsTest extends
);
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -216,5 +224,15 @@ public class MinimumImportsTest extends
equinox().version("3.7.0.v20110613")
);
}
+
+ @org.ops4j.pax.exam.junit.Configuration
+ public static Option[] equinox38Options()
+ {
+ return testOptions(
+ generalConfiguration(),
+ PaxRunnerOptions.rawPaxRunnerOption("config",
"classpath:ss-runner.properties"),
+ equinox().version("3.8.0.V20120529-1548")
+ );
+ }
}
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=1394463&r1=1394462&r2=1394463&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
Fri Oct 5 11:59:50 2012
@@ -182,7 +182,11 @@ public class OBRAppManagerTest extends A
);
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -191,7 +195,11 @@ public class OBRAppManagerTest extends A
);
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -200,5 +208,15 @@ public class OBRAppManagerTest extends A
equinox().version("3.7.0.v20110613")
);
}
+
+ @org.ops4j.pax.exam.junit.Configuration
+ public static Option[] equinox38Options()
+ {
+ return testOptions(
+ generalConfiguration(),
+ PaxRunnerOptions.rawPaxRunnerOption("config",
"classpath:ss-runner.properties"),
+ equinox().version("3.8.0.V20120529-1548")
+ );
+ }
}
\ No newline at end of file
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=1394463&r1=1394462&r2=1394463&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
Fri Oct 5 11:59:50 2012
@@ -563,7 +563,11 @@ public class OBRResolverAdvancedTest ext
);
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -572,7 +576,11 @@ public class OBRResolverAdvancedTest ext
);
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -581,5 +589,15 @@ public class OBRResolverAdvancedTest ext
equinox().version("3.7.0.v20110613")
);
}
+
+ @org.ops4j.pax.exam.junit.Configuration
+ public static Option[] equinox38Options()
+ {
+ return testOptions(
+ generalConfiguration(),
+ PaxRunnerOptions.rawPaxRunnerOption("config",
"classpath:ss-runner.properties"),
+ equinox().version("3.8.0.V20120529-1548")
+ );
+ }
}
\ No newline at end of file
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=1394463&r1=1394462&r2=1394463&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
Fri Oct 5 11:59:50 2012
@@ -348,7 +348,11 @@ public class OBRResolverTest extends Abs
);
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -357,7 +361,11 @@ public class OBRResolverTest extends Abs
);
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -366,5 +374,15 @@ public class OBRResolverTest extends Abs
equinox().version("3.7.0.v20110613")
);
}
+
+ @org.ops4j.pax.exam.junit.Configuration
+ public static Option[] equinox38Options()
+ {
+ return testOptions(
+ generalConfiguration(),
+ PaxRunnerOptions.rawPaxRunnerOption("config",
"classpath:ss-runner.properties"),
+ equinox().version("3.8.0.V20120529-1548")
+ );
+ }
}
\ No newline at end of file
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=1394463&r1=1394462&r2=1394463&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
Fri Oct 5 11:59:50 2012
@@ -285,7 +285,11 @@ public class UpdateAppTest extends Abstr
);
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -294,7 +298,11 @@ public class UpdateAppTest extends Abstr
);
}
- @org.ops4j.pax.exam.junit.Configuration
+ /*
+ * 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(
@@ -303,5 +311,15 @@ public class UpdateAppTest extends Abstr
equinox().version("3.7.0.v20110613")
);
}
+
+ @org.ops4j.pax.exam.junit.Configuration
+ public static Option[] equinox38Options()
+ {
+ return testOptions(
+ generalConfiguration(),
+ PaxRunnerOptions.rawPaxRunnerOption("config",
"classpath:ss-runner.properties"),
+ equinox().version("3.8.0.V20120529-1548")
+ );
+ }
}
Modified:
aries/trunk/application/application-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
URL:
http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java?rev=1394463&r1=1394462&r2=1394463&view=diff
==============================================================================
---
aries/trunk/application/application-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
(original)
+++
aries/trunk/application/application-itests/src/test/java/org/ops4j/pax/runner/platform/equinox/internal/SsActivator.java
Fri Oct 5 11:59:50 2012
@@ -43,6 +43,7 @@ public class SsActivator extends Abstrac
new EquinoxPlatformBuilder( bundleContext, "3.5.1" ),
new EquinoxPlatformBuilder( bundleContext, "3.6.0" ),
new EquinoxPlatformBuilder( bundleContext, "3.7.0.V20110613" ),
+ new EquinoxPlatformBuilder( bundleContext, "3.8.0.V20120529-1548"),
new EquinoxPlatformBuilderSnapshot( bundleContext )
};
}
Added:
aries/trunk/application/application-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20120529-1548.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20120529-1548.xml?rev=1394463&view=auto
==============================================================================
---
aries/trunk/application/application-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20120529-1548.xml
(added)
+++
aries/trunk/application/application-itests/src/test/resources/META-INF/platform-equinox/definition-3.8.0.V20120529-1548.xml
Fri Oct 5 11:59:50 2012
@@ -0,0 +1,26 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<platform>
+
+ <name>Equinox 3.8.0</name>
+ <system>mvn:org.eclipse/org.eclipse.osgi/3.8.0.v20120529-1548</system>
+
+ <profile name="minimal" default="true"/>
+
+</platform>
Modified:
aries/trunk/application/application-itests/src/test/resources/ss-runner.properties
URL:
http://svn.apache.org/viewvc/aries/trunk/application/application-itests/src/test/resources/ss-runner.properties?rev=1394463&r1=1394462&r2=1394463&view=diff
==============================================================================
---
aries/trunk/application/application-itests/src/test/resources/ss-runner.properties
(original)
+++
aries/trunk/application/application-itests/src/test/resources/ss-runner.properties
Fri Oct 5 11:59:50 2012
@@ -84,6 +84,7 @@ platform.equinox.3.6.0=org.ops4j.pax.run
platform.equinox.SNAPSHOT=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
platform.equinox.V43PROTOTYPE-3.6.0.201003231329=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
platform.equinox.3.7.0.V20110613=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
+platform.equinox.3.8.0.V20120529-1548=org.ops4j.pax.runner.platform.equinox.internal.SsActivator
# Felix
platform.felix.1.0.0=org.ops4j.pax.runner.platform.felix.internal.Activator
platform.felix.1.0.1=org.ops4j.pax.runner.platform.felix.internal.Activator
