Author: gnodet
Date: Tue Jun 3 15:36:28 2014
New Revision: 1599613
URL: http://svn.apache.org/r1599613
Log:
Additional blueprint tests fixes
Modified:
aries/trunk/blueprint/blueprint-cm/pom.xml
aries/trunk/blueprint/blueprint-core/pom.xml
aries/trunk/blueprint/blueprint-itests/pom.xml
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ASMMultiBundleTest.java
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BaseBlueprintContainerBTCustomizerTest.java
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/DeadLockTest.java
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/FragmentTest.java
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiInterfacesTest.java
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
Modified: aries/trunk/blueprint/blueprint-cm/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/pom.xml?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-cm/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-cm/pom.xml Tue Jun 3 15:36:28 2014
@@ -65,7 +65,7 @@
<id>dev</id>
<properties>
<blueprint.api.version>1.0.1-SNAPSHOT</blueprint.api.version>
- <blueprint.core.version>1.3.0-SNAPSHOT</blueprint.core.version>
+ <blueprint.core.version>1.4.1-SNAPSHOT</blueprint.core.version>
<blueprint.parser.version>1.1.1-SNAPSHOT</blueprint.parser.version>
</properties>
</profile>
Modified: aries/trunk/blueprint/blueprint-core/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-core/pom.xml?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-core/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-core/pom.xml Tue Jun 3 15:36:28 2014
@@ -104,11 +104,11 @@
<properties>
<blueprint.annotation.api.version>1.0.1-SNAPSHOT</blueprint.annotation.api.version>
<blueprint.api.version>1.0.1-SNAPSHOT</blueprint.api.version>
-
<blueprint.parser.version>1.1.0-SNAPSHOT</blueprint.parser.version>
- <proxy.api.version>1.0.1-SNAPSHOT</proxy.api.version>
- <proxy.impl.version>1.0.1-SNAPSHOT</proxy.impl.version>
- <quiesce.api.version>1.0.1-SNAPSHOT</quiesce.api.version>
- <util.version>1.0.1-SNAPSHOT</util.version>
+
<blueprint.parser.version>1.2.1-SNAPSHOT</blueprint.parser.version>
+ <proxy.api.version>1.0.0</proxy.api.version>
+ <proxy.impl.version>1.0.0</proxy.impl.version>
+ <quiesce.api.version>1.0.0</quiesce.api.version>
+ <util.version>1.0.0</util.version>
</properties>
</profile>
</profiles>
Modified: aries/trunk/blueprint/blueprint-itests/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/pom.xml?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-itests/pom.xml Tue Jun 3 15:36:28 2014
@@ -136,7 +136,12 @@
<scope>test</scope>
<version>1.0.2-SNAPSHOT</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+
<artifactId>org.apache.aries.blueprint.testquiescebundle</artifactId>
+ <version>1.0.1-SNAPSHOT</version>
+ </dependency>
+
<!-- pax exam -->
<dependency>
<groupId>org.slf4j</groupId>
@@ -174,18 +179,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- <version>0.9.29</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>0.9.29</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.ops4j.pax.tinybundles</groupId>
<artifactId>tinybundles</artifactId>
<version>2.0.0</version>
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ASMMultiBundleTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ASMMultiBundleTest.java?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ASMMultiBundleTest.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ASMMultiBundleTest.java
Tue Jun 3 15:36:28 2014
@@ -18,11 +18,11 @@
*/
package org.apache.aries.blueprint.itests;
+import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import java.util.ArrayList;
import java.util.List;
@@ -199,8 +199,8 @@ public class ASMMultiBundleTest extends
return new Option[] {
baseOptions(),
Helper.blueprintBundles(),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundlea").versionAsInProject().noStart(),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundleb").versionAsInProject().noStart()
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundlea", false),
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundleb", false)
};
}
}
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
Tue Jun 3 15:36:28 2014
@@ -18,10 +18,10 @@
*/
package org.apache.aries.blueprint.itests;
+import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
import static org.junit.Assert.assertNotNull;
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;
@@ -64,8 +64,9 @@ public abstract class AbstractBlueprintI
junitBundles(),
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
when(localRepo !=
null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" +
localRepo)),
- mavenBundle("org.ops4j.pax.logging",
"pax-logging-api").versionAsInProject(),
- mavenBundle("org.ops4j.pax.logging",
"pax-logging-service").versionAsInProject()
+
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
+ mvnBundle("org.ops4j.pax.logging", "pax-logging-api"),
+ mvnBundle("org.ops4j.pax.logging", "pax-logging-service")
);
}
}
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BaseBlueprintContainerBTCustomizerTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BaseBlueprintContainerBTCustomizerTest.java?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BaseBlueprintContainerBTCustomizerTest.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BaseBlueprintContainerBTCustomizerTest.java
Tue Jun 3 15:36:28 2014
@@ -63,7 +63,7 @@ public abstract class BaseBlueprintConta
tracker.close();
if (cfgAdminService == null) {
- MavenArtifactProvisionOption cfgAdminOption =
CoreOptions.mavenBundle("org.apache.felix", "org.apache.felix.configadmin");
+ MavenArtifactProvisionOption cfgAdminOption =
CoreOptions.mavenBundle("org.apache.felix",
"org.apache.felix.configadmin").versionAsInProject();
InputStream cfgAdminStream = new
URL(cfgAdminOption.getURL()).openStream();
configAdminBundle = ctx.installBundle(cfgAdminOption.getURL(),
cfgAdminStream);
@@ -82,7 +82,7 @@ public abstract class BaseBlueprintConta
protected Bundle installTestBundle(BundleContext compositeBundleContext)
throws IOException, MalformedURLException, BundleException {
// install the blueprint sample onto the framework associated with the
composite bundle
- MavenArtifactProvisionOption mapo =
CoreOptions.mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample");
+ MavenArtifactProvisionOption mapo =
CoreOptions.mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample").versionAsInProject();
// let's use input stream to avoid invoking mvn url handler which
isn't avail in the child framework.
InputStream is = new URL(mapo.getURL()).openStream();
return compositeBundleContext.installBundle(mapo.getURL(), is);
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintAnnotationTest.java
Tue Jun 3 15:36:28 2014
@@ -18,12 +18,12 @@
*/
package org.apache.aries.blueprint.itests;
+import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import java.text.SimpleDateFormat;
import java.util.Currency;
@@ -83,8 +83,8 @@ public class BlueprintAnnotationTest ext
return new Option[] {
baseOptions(),
Helper.blueprintBundles(),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample-annotation").versionAsInProject(),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample-fragment").versionAsInProject().noStart(),
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample-annotation"),
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample-fragment", false),
};
}
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2Test.java
Tue Jun 3 15:36:28 2014
@@ -18,7 +18,7 @@
*/
package org.apache.aries.blueprint.itests;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
import java.util.Hashtable;
@@ -65,7 +65,7 @@ public class BlueprintContainer2Test ext
return new Option[] {
baseOptions(),
Helper.blueprintBundles(false),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample").noStart()
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample", false)
};
}
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerTest.java
Tue Jun 3 15:36:28 2014
@@ -18,8 +18,8 @@
*/
package org.apache.aries.blueprint.itests;
+import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import java.util.Hashtable;
@@ -54,7 +54,7 @@ public class BlueprintContainerTest exte
return new Option[] {
baseOptions(),
Helper.blueprintBundles(),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample").noStart(),
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample", false),
};
}
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/DeadLockTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/DeadLockTest.java?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/DeadLockTest.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/DeadLockTest.java
Tue Jun 3 15:36:28 2014
@@ -18,9 +18,9 @@
*/
package org.apache.aries.blueprint.itests;
+import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
import static org.junit.Assert.assertNotNull;
import static org.ops4j.pax.exam.CoreOptions.composite;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
@@ -118,7 +118,7 @@ public class DeadLockTest extends Abstra
return new Option[] {
baseOptions(),
Helper.blueprintBundles(),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample").noStart(),
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample", false),
composite(getRefTestBundles()),
};
}
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/FragmentTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/FragmentTest.java?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/FragmentTest.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/FragmentTest.java
Tue Jun 3 15:36:28 2014
@@ -18,7 +18,7 @@
*/
package org.apache.aries.blueprint.itests;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
import static org.ops4j.pax.exam.CoreOptions.streamBundle;
import java.io.InputStream;
@@ -64,7 +64,7 @@ public class FragmentTest extends Abstra
Helper.blueprintBundles(),
streamBundle(fragmentJar).noStart(),
streamBundle(hostJar),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample").noStart()
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample", false)
};
}
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/Helper.java
Tue Jun 3 15:36:28 2014
@@ -57,23 +57,23 @@ public class Helper {
}
public static Option debug(int port) {
- return
CoreOptions.vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address="
+ port);
+ return
CoreOptions.vmOption("-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address="
+ port);
}
public static Option blueprintBundles(boolean startBlueprint) {
return composite(
- mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(),
- mavenBundle("org.apache.felix",
"org.apache.felix.configadmin").versionAsInProject(),
- mavenBundle("org.ops4j.pax.url",
"pax-url-aether").versionAsInProject(),
- mavenBundle("org.apache.aries.testsupport",
"org.apache.aries.testsupport.unit").versionAsInProject(),
- mavenBundle("org.apache.aries",
"org.apache.aries.util").versionAsInProject(),
- mavenBundle("org.apache.aries.proxy",
"org.apache.aries.proxy.api").versionAsInProject(),
- mavenBundle("org.apache.aries.proxy",
"org.apache.aries.proxy.impl").versionAsInProject(),
- mavenBundle("org.apache.commons",
"commons-jexl").versionAsInProject(),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.jexl.evaluator").versionAsInProject(),
- mavenBundle("org.apache.xbean",
"xbean-asm4-shaded").versionAsInProject(),
- mavenBundle("org.apache.xbean",
"xbean-bundleutils").versionAsInProject(),
- mavenBundle("org.apache.xbean",
"xbean-finder-shaded").versionAsInProject(),
+ mvnBundle("org.ow2.asm", "asm-all"),
+ mvnBundle("org.apache.felix", "org.apache.felix.configadmin"),
+ mvnBundle("org.ops4j.pax.url", "pax-url-aether"),
+ mvnBundle("org.apache.aries.testsupport",
"org.apache.aries.testsupport.unit"),
+ mvnBundle("org.apache.aries", "org.apache.aries.util"),
+ mvnBundle("org.apache.aries.proxy",
"org.apache.aries.proxy.api"),
+ mvnBundle("org.apache.aries.proxy",
"org.apache.aries.proxy.impl"),
+ mvnBundle("org.apache.commons", "commons-jexl"),
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.jexl.evaluator"),
+ mvnBundle("org.apache.xbean", "xbean-asm4-shaded"),
+ mvnBundle("org.apache.xbean", "xbean-bundleutils"),
+ mvnBundle("org.apache.xbean", "xbean-finder-shaded"),
mvnBundle("org.apache.aries.quiesce",
"org.apache.aries.quiesce.api", startBlueprint),
mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.api", startBlueprint),
mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.core", startBlueprint),
@@ -82,11 +82,15 @@ public class Helper {
mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.annotation.impl", startBlueprint)
);
}
-
+
+ public static Option mvnBundle(String groupId, String artifactId) {
+ return mavenBundle(groupId, artifactId).versionAsInProject();
+ }
+
public static Option mvnBundle(String groupId, String artifactId, boolean
start) {
- return mavenBundle(groupId,
artifactId).versionAsInProject().start(start);
+ return mavenBundle(groupId,
artifactId).versionAsInProject().start(start);
}
-
+
public static void testBlueprintContainer(RichBundleContext context,
Bundle bundle) throws Exception {
BlueprintContainer blueprintContainer =
getBlueprintContainerForBundle(context, SAMPLE_SYM_NAME);
assertNotNull(blueprintContainer);
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiInterfacesTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiInterfacesTest.java?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiInterfacesTest.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiInterfacesTest.java
Tue Jun 3 15:36:28 2014
@@ -18,11 +18,11 @@
*/
package org.apache.aries.blueprint.itests;
+import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import org.apache.aries.blueprint.testbundlea.multi.InterfaceA;
import org.apache.aries.blueprint.testbundlea.multi.InterfaceB;
@@ -77,8 +77,8 @@ public class MultiInterfacesTest extends
return new Option[] {
baseOptions(),
Helper.blueprintBundles(),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundlea").versionAsInProject(),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundleb").versionAsInProject()
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundlea"),
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundleb")
};
}
}
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/QuiesceBlueprintTest.java
Tue Jun 3 15:36:28 2014
@@ -15,6 +15,7 @@
*/
package org.apache.aries.blueprint.itests;
+import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
import static org.junit.Assert.assertNotNull;
import static org.ops4j.pax.exam.CoreOptions.bootDelegationPackages;
@@ -35,7 +36,6 @@ import org.ops4j.pax.exam.CoreOptions;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.options.BootDelegationOption;
-import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerMethod;
import org.osgi.framework.Bundle;
@@ -84,11 +84,11 @@ private QuiesceParticipant getParticipan
bootDelegationPackages("javax.transaction", "javax.transaction.*"),
CoreOptions.vmOption("-Dorg.osgi.framework.system.packages=javax.accessibility,javax.activation,javax.activity,javax.annotation,javax.annotation.processing,javax.crypto,javax.crypto.interfaces,javax.crypto.spec,javax.imageio,javax.imageio.event,javax.imageio.metadata,javax.imageio.plugins.bmp,javax.imageio.plugins.jpeg,javax.imageio.spi,javax.imageio.stream,javax.jws,javax.jws.soap,javax.lang.model,javax.lang.model.element,javax.lang.model.type,javax.lang.model.util,javax.management,javax.management.loading,javax.management.modelmbean,javax.management.monitor,javax.management.openmbean,javax.management.relation,javax.management.remote,javax.management.remote.rmi,javax.management.timer,javax.naming,javax.naming.directory,javax.naming.event,javax.naming.ldap,javax.naming.spi,javax.net,javax.net.ssl,javax.print,javax.print.attribute,javax.print.attribute.standard,javax.print.event,javax.rmi,javax.rmi.CORBA,javax.rmi.ssl,javax.script,javax.security.auth,javax.security.auth.c
allback,javax.security.auth.kerberos,javax.security.auth.login,javax.security.auth.spi,javax.security.auth.x500,javax.security.cert,javax.security.sasl,javax.sound.midi,javax.sound.midi.spi,javax.sound.sampled,javax.sound.sampled.spi,javax.sql,javax.sql.rowset,javax.sql.rowset.serial,javax.sql.rowset.spi,javax.swing,javax.swing.border,javax.swing.colorchooser,javax.swing.event,javax.swing.filechooser,javax.swing.plaf,javax.swing.plaf.basic,javax.swing.plaf.metal,javax.swing.plaf.multi,javax.swing.plaf.synth,javax.swing.table,javax.swing.text,javax.swing.text.html,javax.swing.text.html.parser,javax.swing.text.rtf,javax.swing.tree,javax.swing.undo,javax.tools,javax.xml,javax.xml.bind,javax.xml.bind.annotation,javax.xml.bind.annotation.adapters,javax.xml.bind.attachment,javax.xml.bind.helpers,javax.xml.bind.util,javax.xml.crypto,javax.xml.crypto.dom,javax.xml.crypto.dsig,javax.xml.crypto.dsig.dom,javax.xml.crypto.dsig.keyinfo,javax.xml.crypto.dsig.spec,javax.xml.datatype,javax.xml.name
space,javax.xml.parsers,javax.xml.soap,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xml.transform.dom,javax.xml.transform.sax,javax.xml.transform.stax,javax.xml.transform.stream,javax.xml.validation,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.handler.soap,javax.xml.ws.http,javax.xml.ws.soap,javax.xml.ws.spi,javax.xml.xpath,org.ietf.jgss,org.omg.CORBA,org.omg.CORBA.DynAnyPackage,org.omg.CORBA.ORBPackage,org.omg.CORBA.TypeCodePackage,org.omg.CORBA.portable,org.omg.CORBA_2_3,org.omg.CORBA_2_3.portable,org.omg.CosNaming,org.omg.CosNaming.NamingContextExtPackage,org.omg.CosNaming.NamingContextPackage,org.omg.Dynamic,org.omg.DynamicAny,org.omg.DynamicAny.DynAnyFactoryPackage,org.omg.DynamicAny.DynAnyPackage,org.omg.IOP,org.omg.IOP.CodecFactoryPackage,org.omg.IOP.CodecPackage,org.omg.Messaging,org.omg.PortableInterceptor,org.omg.PortableInterceptor.ORBInitInfoPackage,org.omg.PortableServer,org.omg.PortableServer.CurrentPackage,org.omg.Portable
Server.POAManagerPackage,org.omg.PortableServer.POAPackage,org.omg.PortableServer.ServantLocatorPackage,org.omg.PortableServer.portable,org.omg.SendingContext,org.omg.stub.java.rmi,org.w3c.dom,org.w3c.dom.bootstrap,org.w3c.dom.css,org.w3c.dom.events,org.w3c.dom.html,org.w3c.dom.ls,org.w3c.dom.ranges,org.w3c.dom.stylesheets,org.w3c.dom.traversal,org.w3c.dom.views,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers,javax.transaction;partial=true;mandatory:=partial,javax.transaction.xa;partial=true;mandatory:=partial"),
Helper.blueprintBundles(),
-
- mavenBundle("org.apache.aries.quiesce",
"org.apache.aries.quiesce.api"),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundlea").noStart(),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundleb").noStart(),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testquiescebundle")
+
+ mvnBundle("org.apache.aries.quiesce",
"org.apache.aries.quiesce.api"),
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundlea", false),
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundleb", false),
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testquiescebundle")
};
}
@@ -115,12 +115,6 @@ private QuiesceParticipant getParticipan
return new BootDelegationOption("org.apache.aries.unittest.fixture");
}
- public static MavenArtifactProvisionOption mavenBundle(String groupId,
- String artifactId) {
- return CoreOptions.mavenBundle().groupId(groupId).artifactId(artifactId)
- .versionAsInProject();
- }
-
@Test
public void testBasicQuieseEmptyCounter() throws Exception
{
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
Tue Jun 3 15:36:28 2014
@@ -34,10 +34,10 @@ import org.osgi.service.blueprint.contai
import org.osgi.service.cm.Configuration;
import org.osgi.service.cm.ConfigurationAdmin;
+import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerMethod.class)
@@ -184,7 +184,7 @@ public class TestConfigAdmin extends Abs
return new Option[] {
junitBundles(),
Helper.blueprintBundles(),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample").noStart()
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample", false)
};
}
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestReferences.java
Tue Jun 3 15:36:28 2014
@@ -18,6 +18,7 @@
*/
package org.apache.aries.blueprint.itests;
+import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
@@ -221,7 +222,7 @@ public class TestReferences extends Abst
return new Option[] {
CoreOptions.junitBundles(),
Helper.blueprintBundles(),
- CoreOptions.mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample")
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample")
};
}
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java?rev=1599613&r1=1599612&r2=1599613&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestRegistrationListener.java
Tue Jun 3 15:36:28 2014
@@ -18,6 +18,7 @@
*/
package org.apache.aries.blueprint.itests;
+import static org.apache.aries.blueprint.itests.Helper.mvnBundle;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -72,7 +73,7 @@ public class TestRegistrationListener ex
return new Option[] {
baseOptions(),
Helper.blueprintBundles(),
- CoreOptions.mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample")
+ mvnBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.sample")
};
}
