You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2009/08/21 14:12:06 UTC
svn commit: r806524 -
/sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/BundleStatePreservedTest.java
Author: bdelacretaz
Date: Fri Aug 21 12:12:06 2009
New Revision: 806524
URL: http://svn.apache.org/viewvc?rev=806524&view=rev
Log:
SLING-1078 - Avoid timing dependencies in test
Modified:
sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/BundleStatePreservedTest.java
Modified: sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/BundleStatePreservedTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/BundleStatePreservedTest.java?rev=806524&r1=806523&r2=806524&view=diff
==============================================================================
--- sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/BundleStatePreservedTest.java (original)
+++ sling/trunk/installer/osgi/it/src/test/java/org/apache/sling/osgi/installer/it/BundleStatePreservedTest.java Fri Aug 21 12:12:06 2009
@@ -80,11 +80,18 @@
assertCounter(OsgiInstaller.REGISTERED_RESOURCES_COUNTER, 5);
assertCounter(OsgiInstaller.REGISTERED_GROUPS_COUNTER, 3);
+ resetCounters();
installer.removeResource(getInstallableResource(getTestBundle(BUNDLE_BASE_NAME + "-testbundle-1.0.jar")));
+ waitForInstallerAction(OsgiInstaller.WORKER_THREAD_BECOMES_IDLE_COUNTER, 1);
+
+ resetCounters();
installer.removeResource(getInstallableResource(getTestBundle(BUNDLE_BASE_NAME + "-testbundle-1.1.jar")));
+ waitForInstallerAction(OsgiInstaller.WORKER_THREAD_BECOMES_IDLE_COUNTER, 1);
+
resetCounters();
installer.removeResource(getInstallableResource(getTestBundle(BUNDLE_BASE_NAME + "-testbundle-1.2.jar")));
- waitForInstallerAction(OsgiInstaller.OSGI_TASKS_COUNTER, 1);
+ waitForInstallerAction(OsgiInstaller.WORKER_THREAD_BECOMES_IDLE_COUNTER, 1);
+
assertNull("testbundle must be gone at end of test", findBundle("osgi-installer-testbundle"));
// Now check that bundles A and B have kept their states