You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/01/05 16:28:26 UTC
svn commit: r1649546 - in
/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it:
BundleInstallStressTest.java ConfigInstallTest.java
ConfigPrioritiesTest.java OsgiInstallerTestBase.java
Author: cziegeler
Date: Mon Jan 5 15:28:26 2015
New Revision: 1649546
URL: http://svn.apache.org/r1649546
Log:
Remove timeout parameter from methods, we use the same timeout across the board anyway
Modified:
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleInstallStressTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigInstallTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigPrioritiesTest.java
sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleInstallStressTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleInstallStressTest.java?rev=1649546&r1=1649545&r2=1649546&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleInstallStressTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/BundleInstallStressTest.java Mon Jan 5 15:28:26 2015
@@ -74,7 +74,7 @@ public class BundleInstallStressTest ext
public Option[] config() {
return defaultConfiguration();
}
-
+
@Before
public void setUp() {
setupInstaller();
@@ -124,6 +124,7 @@ public class BundleInstallStressTest ext
eventsDetector = new EventsDetector(bundleContext);
}
+ @Override
@After
public void tearDown() {
super.tearDown();
@@ -217,7 +218,8 @@ public class BundleInstallStressTest ext
log(LogService.LOG_INFO,"Expecting " + nBundles + " bundles to be installed");
final Condition c = new Condition() {
int actualCount = 0;
- public boolean isTrue() throws Exception {
+ @Override
+ public boolean isTrue() throws Exception {
actualCount = bundleContext.getBundles().length;
return actualCount == nBundles;
}
@@ -238,7 +240,7 @@ public class BundleInstallStressTest ext
return 1000L;
}
};
- waitForCondition(info, expectBundlesTimeoutMsec, c);
+ waitForCondition(info, c, expectBundlesTimeoutMsec);
}
private List<File> selectRandomBundles() {
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigInstallTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigInstallTest.java?rev=1649546&r1=1649545&r2=1649546&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigInstallTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigInstallTest.java Mon Jan 5 15:28:26 2015
@@ -48,7 +48,6 @@ import org.osgi.service.cm.Configuration
public class ConfigInstallTest extends OsgiInstallerTestBase implements ConfigurationListener {
- private final static long TIMEOUT = 5000L;
private final List<ConfigurationEvent> events = new LinkedList<ConfigurationEvent>();
private final List<ServiceRegistration<?>> serviceRegistrations = new ArrayList<ServiceRegistration<?>>();
private volatile int installationEvents = 0;
@@ -114,12 +113,12 @@ public class ConfigInstallTest extends O
final InstallableResource[] rsrc = new InstallableResource[] {result};
installer.updateResources(URL_SCHEME, rsrc, null);
- Configuration cfg = waitForConfiguration("After installing", cfgPid, TIMEOUT, true);
+ Configuration cfg = waitForConfiguration("After installing", cfgPid, true);
assertEquals("Config value must match", "bar", cfg.getProperties().get("foo"));
// remove again
installer.updateResources(URL_SCHEME, null, new String[] {rsrc[0].getId()});
- waitForConfiguration("After removing for the second time", cfgPid, TIMEOUT, false);
+ waitForConfiguration("After removing for the second time", cfgPid, false);
}
@Test
@@ -133,21 +132,21 @@ public class ConfigInstallTest extends O
final InstallableResource[] rsrc = getInstallableResource(cfgPid, cfgData);
installer.updateResources(URL_SCHEME, rsrc, null);
- Configuration cfg = waitForConfiguration("After installing", cfgPid, TIMEOUT, true);
+ Configuration cfg = waitForConfiguration("After installing", cfgPid, true);
assertEquals("Config value must match", "bar", cfg.getProperties().get("foo"));
// remove resource
installer.updateResources(URL_SCHEME, null, new String[] {rsrc[0].getId()});
- waitForConfiguration("After removing", cfgPid, TIMEOUT, false);
+ waitForConfiguration("After removing", cfgPid, false);
// Reinstalling with same digest must work
installer.updateResources(URL_SCHEME, rsrc, null);
- cfg = waitForConfiguration("After reinstalling", cfgPid, TIMEOUT, true);
+ cfg = waitForConfiguration("After reinstalling", cfgPid, true);
assertEquals("Config value must match", "bar", cfg.getProperties().get("foo"));
// remove again
installer.updateResources(URL_SCHEME, null, new String[] {rsrc[0].getId()});
- waitForConfiguration("After removing for the second time", cfgPid, TIMEOUT, false);
+ waitForConfiguration("After removing for the second time", cfgPid, false);
}
@Test
@@ -162,7 +161,7 @@ public class ConfigInstallTest extends O
installer.updateResources(URL_SCHEME, new InstallableResource[] {rsrc}, null);
// get config
- waitForConfigValue("After installing", cfgPid, TIMEOUT, "foo", "bar");
+ waitForConfigValue("After installing", cfgPid, "foo", "bar");
// create second configuration
final Dictionary<String, Object> secondData = new Hashtable<String, Object>();
@@ -172,12 +171,12 @@ public class ConfigInstallTest extends O
installer.updateResources(URL_SCHEME, new InstallableResource[] {rsrc2}, null);
// get updated config
- waitForConfigValue("After updating", cfgPid, TIMEOUT, "foo", "bla");
+ waitForConfigValue("After updating", cfgPid, "foo", "bla");
// remove config
installer.updateResources(URL_SCHEME, null, new String[] {"/configB/" + cfgPid});
- waitForConfigValue("After deleting", cfgPid, TIMEOUT, "foo", "bar");
+ waitForConfigValue("After deleting", cfgPid, "foo", "bar");
}
@Test
@@ -193,7 +192,7 @@ public class ConfigInstallTest extends O
installer.updateResources(URL_SCHEME, new InstallableResource[] {rsrc}, null);
// get config
- waitForConfigValue("After installing", cfgPid, TIMEOUT, "foo", "bar");
+ waitForConfigValue("After installing", cfgPid, "foo", "bar");
// create second configuration
final Dictionary<String, Object> secondData = new Hashtable<String, Object>();
@@ -203,12 +202,12 @@ public class ConfigInstallTest extends O
installer.updateResources(URL_SCHEME, new InstallableResource[] {rsrc2}, null);
// get updated config
- waitForConfigValue("After updating", cfgPid, TIMEOUT, "foo", "bla");
+ waitForConfigValue("After updating", cfgPid, "foo", "bla");
// remove config
installer.updateResources(URL_SCHEME, null, new String[] {"/configB/" + cfgPid});
- waitForConfiguration("After deleting", cfgPid, TIMEOUT, false);
+ waitForConfiguration("After deleting", cfgPid, false);
}
@Test
@@ -224,7 +223,7 @@ public class ConfigInstallTest extends O
installer.updateResources(URL_SCHEME, new InstallableResource[] {rsrc}, null);
// get factory config
- waitForFactoryConfigValue("After installing", cfgFactoryPid, TIMEOUT, "foo", "bar");
+ waitForFactoryConfigValue("After installing", cfgFactoryPid, "foo", "bar");
// create second factory configuration with same alias
final Dictionary<String, Object> secondData = new Hashtable<String, Object>();
@@ -234,12 +233,12 @@ public class ConfigInstallTest extends O
installer.updateResources(URL_SCHEME, new InstallableResource[] {rsrc2}, null);
// get updated factory config
- waitForFactoryConfigValue("After updating", cfgFactoryPid, TIMEOUT, "foo", "bla");
+ waitForFactoryConfigValue("After updating", cfgFactoryPid, "foo", "bla");
// remove factory config
installer.updateResources(URL_SCHEME, null, new String[] {"/configB/" + cfgFactoryPid + "-" + alias});
- waitForFactoryConfigValue("After updating", cfgFactoryPid, TIMEOUT, "foo", "bar");
+ waitForFactoryConfigValue("After updating", cfgFactoryPid, "foo", "bar");
}
@Test
@@ -256,7 +255,7 @@ public class ConfigInstallTest extends O
installer.updateResources(URL_SCHEME, new InstallableResource[] {rsrc}, null);
// get factory config
- waitForFactoryConfigValue("After installing", cfgFactoryPid, TIMEOUT, "foo", "bar");
+ waitForFactoryConfigValue("After installing", cfgFactoryPid, "foo", "bar");
// create second factory configuration
final Dictionary<String, Object> secondData = new Hashtable<String, Object>();
@@ -266,12 +265,12 @@ public class ConfigInstallTest extends O
installer.updateResources(URL_SCHEME, new InstallableResource[] {rsrc2}, null);
// get updated factory config
- waitForFactoryConfigValue("After updating", cfgFactoryPid, TIMEOUT, "foo", "bla");
+ waitForFactoryConfigValue("After updating", cfgFactoryPid, "foo", "bla");
// remove config
installer.updateResources(URL_SCHEME, null, new String[] {"/configB/" + cfgFactoryPid + "-" + alias});
- waitForFactoryConfiguration("After deleting", cfgFactoryPid, TIMEOUT, false);
+ waitForFactoryConfiguration("After deleting", cfgFactoryPid, false);
}
@Test
@@ -286,24 +285,24 @@ public class ConfigInstallTest extends O
installer.updateResources(URL_SCHEME, new InstallableResource[] {rsrc}, null);
// get config
- final Configuration cfg = waitForConfigValue("After installing", cfgPid, TIMEOUT, "foo", "bar");
+ final Configuration cfg = waitForConfigValue("After installing", cfgPid, "foo", "bar");
// update configuration
final Dictionary<String, Object> secondData = new Hashtable<String, Object>();
secondData.put("foo", "bla");
cfg.update(secondData);
- waitForResource(URL_SCHEME + ":/configA/" + cfgPid, ResourceState.IGNORED, TIMEOUT);
+ waitForResource(URL_SCHEME + ":/configA/" + cfgPid, ResourceState.IGNORED);
// get updated config
- final Configuration secondCfg = waitForConfigValue("After updating", cfgPid, TIMEOUT, "foo", "bla");
+ final Configuration secondCfg = waitForConfigValue("After updating", cfgPid, "foo", "bla");
// remove config
secondCfg.delete();
- waitForResource(URL_SCHEME + ":/configA/" + cfgPid, ResourceState.INSTALLED, TIMEOUT);
+ waitForResource(URL_SCHEME + ":/configA/" + cfgPid, ResourceState.INSTALLED);
- waitForConfigValue("After deleting", cfgPid, TIMEOUT, "foo", "bar");
+ waitForConfigValue("After deleting", cfgPid, "foo", "bar");
}
@Test
@@ -319,25 +318,25 @@ public class ConfigInstallTest extends O
installer.updateResources(URL_SCHEME, new InstallableResource[] {rsrc}, null);
// get config
- final Configuration cfg = waitForConfigValue("After installing", cfgPid, TIMEOUT, "foo", "bar");
+ final Configuration cfg = waitForConfigValue("After installing", cfgPid, "foo", "bar");
// update configuration
final Dictionary<String, Object> secondData = new Hashtable<String, Object>();
secondData.put("foo", "bla");
cfg.update(secondData);
- waitForResource(URL_SCHEME + ":/configA/" + cfgPid, ResourceState.IGNORED, TIMEOUT);
+ waitForResource(URL_SCHEME + ":/configA/" + cfgPid, ResourceState.IGNORED);
// get updated config
- final Configuration secondCfg = waitForConfigValue("After updating", cfgPid, TIMEOUT, "foo", "bla");
+ final Configuration secondCfg = waitForConfigValue("After updating", cfgPid, "foo", "bla");
// remove config
secondCfg.delete();
sleep(200); // we have to wait here as no state change is happening
- waitForResource(URL_SCHEME + ":/configA/" + cfgPid, ResourceState.IGNORED, TIMEOUT);
+ waitForResource(URL_SCHEME + ":/configA/" + cfgPid, ResourceState.IGNORED);
- waitForConfiguration("After deleting", cfgPid, TIMEOUT, false);
+ waitForConfiguration("After deleting", cfgPid, false);
}
@Test
@@ -353,23 +352,23 @@ public class ConfigInstallTest extends O
installer.updateResources(URL_SCHEME, new InstallableResource[] {rsrc}, null);
// get factory config
- final Configuration cfg = waitForFactoryConfigValue("After installing", cfgFactoryPid, TIMEOUT, "foo", "bar");
+ final Configuration cfg = waitForFactoryConfigValue("After installing", cfgFactoryPid, "foo", "bar");
// update configuration
final Dictionary<String, Object> secondData = new Hashtable<String, Object>();
secondData.put("foo", "bla");
cfg.update(secondData);
- waitForResource(URL_SCHEME + ":/configA/" + cfgFactoryPid + "-" + alias, ResourceState.IGNORED, TIMEOUT);
+ waitForResource(URL_SCHEME + ":/configA/" + cfgFactoryPid + "-" + alias, ResourceState.IGNORED);
// get updated factory config
- final Configuration secondCfg = waitForFactoryConfigValue("After updating", cfgFactoryPid, TIMEOUT, "foo", "bla");
+ final Configuration secondCfg = waitForFactoryConfigValue("After updating", cfgFactoryPid, "foo", "bla");
// remove factory config
secondCfg.delete();
- waitForResource(URL_SCHEME + ":/configA/" + cfgFactoryPid + "-" + alias, ResourceState.INSTALLED, TIMEOUT);
+ waitForResource(URL_SCHEME + ":/configA/" + cfgFactoryPid + "-" + alias, ResourceState.INSTALLED);
- waitForFactoryConfigValue("After deleting", cfgFactoryPid, TIMEOUT, "foo", "bar");
+ waitForFactoryConfigValue("After deleting", cfgFactoryPid, "foo", "bar");
}
@Test
@@ -386,24 +385,24 @@ public class ConfigInstallTest extends O
installer.updateResources(URL_SCHEME, new InstallableResource[] {rsrc}, null);
// get factory config
- final Configuration cfg = waitForFactoryConfigValue("After installing", cfgFactoryPid, TIMEOUT, "foo", "bar");
+ final Configuration cfg = waitForFactoryConfigValue("After installing", cfgFactoryPid, "foo", "bar");
// update configuration
final Dictionary<String, Object> secondData = new Hashtable<String, Object>();
secondData.put("foo", "bla");
cfg.update(secondData);
- waitForResource(URL_SCHEME + ":/configA/" + cfgFactoryPid + "-" + alias, ResourceState.IGNORED, TIMEOUT);
+ waitForResource(URL_SCHEME + ":/configA/" + cfgFactoryPid + "-" + alias, ResourceState.IGNORED);
// get updated factory config
- final Configuration secondCfg = waitForFactoryConfigValue("After updating", cfgFactoryPid, TIMEOUT, "foo", "bla");
+ final Configuration secondCfg = waitForFactoryConfigValue("After updating", cfgFactoryPid, "foo", "bla");
// remove config
secondCfg.delete();
sleep(200); // we have to wait here as no state change is happening
- waitForResource(URL_SCHEME + ":/configA/" + cfgFactoryPid + "-" + alias, ResourceState.IGNORED, TIMEOUT);
- waitForFactoryConfiguration("After deleting", cfgFactoryPid, TIMEOUT, false);
+ waitForResource(URL_SCHEME + ":/configA/" + cfgFactoryPid + "-" + alias, ResourceState.IGNORED);
+ waitForFactoryConfiguration("After deleting", cfgFactoryPid, false);
}
@Test
@@ -432,12 +431,12 @@ public class ConfigInstallTest extends O
configAdmin.start();
waitForConfigAdmin(true);
waitForConfiguration("Config must be installed once ConfigurationAdmin restarts",
- cfgPid, TIMEOUT, true);
+ cfgPid, true);
// Remove config and check
installer.updateResources(URL_SCHEME, null, new String[] {rsrc[0].getId()});
waitForConfiguration("Config must be removed once ConfigurationAdmin restarts",
- cfgPid, TIMEOUT, false);
+ cfgPid, false);
}
@Test
@@ -459,7 +458,7 @@ public class ConfigInstallTest extends O
installer.updateResources(URL_SCHEME, rsrc, null);
waitForInstallationEvents(2);
waitForConfiguration("Config must be installed before stopping ConfigurationAdmin",
- cfgPid, TIMEOUT, true);
+ cfgPid, true);
// Configuration uninstalls must be deferred if ConfigAdmin service is stopped
configAdmin.stop();
@@ -472,7 +471,7 @@ public class ConfigInstallTest extends O
configAdmin.start();
waitForConfigAdmin(true);
waitForConfiguration("Config must be removed once ConfigurationAdmin restarts",
- cfgPid, TIMEOUT, false);
+ cfgPid, false);
}
@Test
@@ -486,16 +485,16 @@ public class ConfigInstallTest extends O
ConfigurationAdmin ca = waitForConfigAdmin(true);
final Configuration c = ca.getConfiguration(cfgPid);
c.update(cfgData);
- waitForConfigValue("After manual installation", cfgPid, TIMEOUT, "foo", "bar");
- waitForCondition("Expected one ConfigurationEvents since beginning of test", TIMEOUT, new ConfigCondition(cfgPid, 1));
+ waitForConfigValue("After manual installation", cfgPid, "foo", "bar");
+ waitForCondition("Expected one ConfigurationEvents since beginning of test", new ConfigCondition(cfgPid, 1));
installer.updateResources(URL_SCHEME, getInstallableResource(cfgPid, cfgData), null);
// Reinstalling with a change must be executed
cfgData.put("foo", "changed");
installer.updateResources(URL_SCHEME, getInstallableResource(cfgPid, cfgData), null);
- waitForConfigValue("After changing value", cfgPid, TIMEOUT, "foo", "changed");
- waitForCondition("Expected two ConfigurationEvents since beginning of test", TIMEOUT, new ConfigCondition(cfgPid, 2));
+ waitForConfigValue("After changing value", cfgPid, "foo", "changed");
+ waitForCondition("Expected two ConfigurationEvents since beginning of test", new ConfigCondition(cfgPid, 2));
}
protected final class ConfigCondition extends Condition {
@@ -553,6 +552,6 @@ public class ConfigInstallTest extends O
return installationEvents >= howMany;
}
};
- waitForCondition("Wait for " + howMany + " installation events", TIMEOUT, c);
+ waitForCondition("Wait for " + howMany + " installation events", c);
}
}
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigPrioritiesTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigPrioritiesTest.java?rev=1649546&r1=1649545&r2=1649546&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigPrioritiesTest.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/ConfigPrioritiesTest.java Mon Jan 5 15:28:26 2015
@@ -30,8 +30,6 @@ import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
public class ConfigPrioritiesTest extends OsgiInstallerTestBase {
- private final static long TIMEOUT = 5000L;
-
@org.ops4j.pax.exam.Configuration
public Option[] config() {
return defaultConfiguration();
@@ -62,24 +60,24 @@ public class ConfigPrioritiesTest extend
// c has more priority than b which has more than a
installer.updateResources(URL_SCHEME, new InstallableResource[] {b}, null);
- waitForConfigValue(null, pid, TIMEOUT, "foo", "b");
+ waitForConfigValue(null, pid, "foo", "b");
installer.updateResources(URL_SCHEME, new InstallableResource[] {c}, null);
- waitForConfigValue(null, pid, TIMEOUT, "foo", "c");
+ waitForConfigValue(null, pid, "foo", "c");
installer.updateResources(URL_SCHEME, new InstallableResource[] {a}, null);
// highest prio should be active (c)
- waitForConfigValue(null, pid, TIMEOUT, "foo", "c");
+ waitForConfigValue(null, pid, "foo", "c");
// removing c, second highest prio should be active (b)
installer.updateResources(URL_SCHEME, null, new String[] {c.getId()});
- waitForConfigValue(null, pid, TIMEOUT, "foo", "b");
+ waitForConfigValue(null, pid, "foo", "b");
// removing b, a should be active
installer.updateResources(URL_SCHEME, null, new String[] {b.getId()});
- waitForConfigValue(null, pid, TIMEOUT, "foo", "a");
+ waitForConfigValue(null, pid, "foo", "a");
// and config should be gone only after removing everything
installer.updateResources(URL_SCHEME, null, new String[] {a.getId()});
- waitForConfiguration("After removing all resources", pid, TIMEOUT, false);
+ waitForConfiguration("After removing all resources", pid, false);
}
}
Modified: sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java?rev=1649546&r1=1649545&r2=1649546&view=diff
==============================================================================
--- sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java (original)
+++ sling/trunk/installer/it/src/test/java/org/apache/sling/installer/it/OsgiInstallerTestBase.java Mon Jan 5 15:28:26 2015
@@ -81,6 +81,8 @@ public class OsgiInstallerTestBase imple
protected volatile InfoProvider infoProvider;
+ private final static long WAIT_FOR_CHANGE_TIMEOUT = 5000L;
+
public static final long WAIT_FOR_ACTION_TIMEOUT_MSEC = 6000;
public static final String BUNDLE_BASE_NAME = "org.apache.sling.installer.it-" + POM_VERSION;
@@ -244,17 +246,21 @@ public class OsgiInstallerTestBase imple
return null;
}
- protected void waitForCondition(String info, long timeoutMsec, Condition c) throws Exception {
- final long end = System.currentTimeMillis() + timeoutMsec;
+ protected void waitForCondition(String info, Condition c) throws Exception {
+ this.waitForCondition(info, c, WAIT_FOR_CHANGE_TIMEOUT);
+ }
+
+ protected void waitForCondition(String info, Condition c, final long timeOut) throws Exception {
+ final long end = System.currentTimeMillis() + timeOut;
do {
- if(c.isTrue()) {
- return;
- }
- sleep(c.getMsecBetweenEvaluations());
+ if(c.isTrue()) {
+ return;
+ }
+ sleep(c.getMsecBetweenEvaluations());
} while(System.currentTimeMillis() < end);
if(c.additionalInfo() != null) {
- info += " " + c.additionalInfo();
+ info += " " + c.additionalInfo();
}
c.onFailure();
@@ -263,13 +269,12 @@ public class OsgiInstallerTestBase imple
protected Configuration waitForFactoryConfigValue(final String info,
final String factoryPid,
- final long timeoutMsec,
final String key,
final String value)
throws Exception {
- final long end = System.currentTimeMillis() + timeoutMsec;
+ final long end = System.currentTimeMillis() + WAIT_FOR_CHANGE_TIMEOUT;
do {
- final Configuration c = waitForFactoryConfiguration(info, factoryPid, timeoutMsec, true);
+ final Configuration c = waitForFactoryConfiguration(info, factoryPid, true);
if (value.equals(c.getProperties().get(key))) {
return c;
}
@@ -281,13 +286,12 @@ public class OsgiInstallerTestBase imple
protected Configuration waitForConfigValue(final String info,
final String pid,
- final long timeoutMsec,
final String key,
final String value)
throws Exception {
- final long end = System.currentTimeMillis() + timeoutMsec;
+ final long end = System.currentTimeMillis() + WAIT_FOR_CHANGE_TIMEOUT;
do {
- final Configuration c = waitForConfiguration(info, pid, timeoutMsec, true);
+ final Configuration c = waitForConfiguration(info, pid, true);
if (value.equals(c.getProperties().get(key))) {
return c;
}
@@ -302,10 +306,9 @@ public class OsgiInstallerTestBase imple
*/
protected Configuration waitForConfiguration(final String info,
final String pid,
- final long timeoutMsec,
final boolean shouldBePresent)
throws Exception {
- return this.waitForConfiguration(info, pid, null, timeoutMsec, shouldBePresent);
+ return this.waitForConfiguration(info, pid, null, shouldBePresent);
}
/**
@@ -313,10 +316,9 @@ public class OsgiInstallerTestBase imple
*/
protected Configuration waitForFactoryConfiguration(final String info,
final String factoryPid,
- final long timeoutMsec,
final boolean shouldBePresent)
throws Exception {
- return this.waitForConfiguration(info, null, factoryPid, timeoutMsec, shouldBePresent);
+ return this.waitForConfiguration(info, null, factoryPid, shouldBePresent);
}
/**
@@ -325,7 +327,6 @@ public class OsgiInstallerTestBase imple
private Configuration waitForConfiguration(final String info,
final String pid,
final String factoryPid,
- final long timeoutMsec,
final boolean shouldBePresent)
throws Exception {
final String logKey = factoryPid == null ? "config" : "factory config";
@@ -338,7 +339,7 @@ public class OsgiInstallerTestBase imple
Configuration result = null;
final long start = System.currentTimeMillis();
- final long end = start + timeoutMsec;
+ final long end = start + WAIT_FOR_CHANGE_TIMEOUT;
log(LogService.LOG_DEBUG, "Starting " + logKey + " check at " + start + "; ending by " + end);
do {
if ( factoryPid != null ) {
@@ -592,10 +593,9 @@ public class OsgiInstallerTestBase imple
}
protected Resource waitForResource(final String url,
- final ResourceState state,
- final long timeout) {
+ final ResourceState state) {
final long start = System.currentTimeMillis();
- final long end = start + timeout;
+ final long end = start + WAIT_FOR_CHANGE_TIMEOUT;
do {
final InstallationState is = this.infoProvider.getInstallationState();