You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by mn...@apache.org on 2010/08/26 14:41:58 UTC
svn commit: r989645 -
/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
Author: mnuttall
Date: Thu Aug 26 12:41:57 2010
New Revision: 989645
URL: http://svn.apache.org/viewvc?rev=989645&view=rev
Log:
ARIES-361: Provisioning changes required to support application isolation. From a patch submitted by Emily Jiang.
Modified:
incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java?rev=989645&r1=989644&r2=989645&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java Thu Aug 26 12:41:57 2010
@@ -50,7 +50,6 @@ import org.apache.aries.application.util
import org.apache.aries.application.utils.manifest.ManifestHeaderProcessor;
import org.apache.aries.application.utils.manifest.ManifestHeaderProcessor.NameValueMap;
import org.apache.aries.sample.HelloWorld;
-import org.apache.aries.sample.HelloWorldManager;
import org.apache.aries.unittest.fixture.ArchiveFixture;
import org.apache.aries.unittest.fixture.ArchiveFixture.ZipFixture;
import org.apache.felix.bundlerepository.Repository;
@@ -63,6 +62,10 @@ import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
+
+import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
+
@RunWith(JUnit4TestRunner.class)
public class OBRResolverAdvancedTest extends AbstractIntegrationTest
{
@@ -365,6 +368,11 @@ public class OBRResolverAdvancedTest ext
AriesApplicationContext ctx = manager.install(app);
ctx.start();
+ // Wait 5 seconds just to give the blueprint-managed beans a chance to come up
+ try {
+ Thread.sleep(5000);
+ } catch (InterruptedException ix) {}
+
HelloWorld hw = getOsgiService(HelloWorld.class);
String result = hw.getMessage();
assertEquals (result, "hello world");
@@ -445,9 +453,9 @@ public class OBRResolverAdvancedTest ext
mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit"),
/* For debugging, uncomment the next two lines */
- /*vmOption ("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5010"),
+ vmOption ("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5010"),
waitForFrameworkStartup(),
-*/
+
/* For debugging, add these imports:
import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;