Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2012-08-24 15:50:22 +0000
committerChristopher Frost2012-08-24 15:50:22 +0000
commita78d34ca28f42cc9c49422a4d53dbc7dfc3a9961 (patch)
treeab611cd5b6973058a440290b195ca0222b8ab8a8 /org.eclipse.virgo.kernel.deployer.test/src/test
parentfcc1a09a8c2748d7de85a402e0a6a28b8e073476 (diff)
downloadorg.eclipse.virgo.kernel-a78d34ca28f42cc9c49422a4d53dbc7dfc3a9961.tar.gz
org.eclipse.virgo.kernel-a78d34ca28f42cc9c49422a4d53dbc7dfc3a9961.tar.xz
org.eclipse.virgo.kernel-a78d34ca28f42cc9c49422a4d53dbc7dfc3a9961.zip
Fixing up some test fails
Diffstat (limited to 'org.eclipse.virgo.kernel.deployer.test/src/test')
-rw-r--r--org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/HotDeploymentTests.java12
1 files changed, 10 insertions, 2 deletions
diff --git a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/HotDeploymentTests.java b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/HotDeploymentTests.java
index 0553382e..3cbfd0ea 100644
--- a/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/HotDeploymentTests.java
+++ b/org.eclipse.virgo.kernel.deployer.test/src/test/java/org/eclipse/virgo/kernel/deployer/test/HotDeploymentTests.java
@@ -32,8 +32,12 @@ import org.eclipse.virgo.util.io.PathReference;
/**
*/
public class HotDeploymentTests extends AbstractDeployerIntegrationTest {
+
+ private static final String ORG_ECLIPSE_VIRGO_REGION_USER = "org.eclipse.virgo.region.user";
- private static final long TIMEOUT = 10000;
+ private static final String GLOBAL_REGION = "global";
+
+ private static final long TIMEOUT = 10000;
private final MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer();
@@ -78,8 +82,12 @@ public class HotDeploymentTests extends AbstractDeployerIntegrationTest {
}
private void awaitActive(String type, String name, String version) {
+ String region = ORG_ECLIPSE_VIRGO_REGION_USER;
+ if(type=="configuration"){
+ region = GLOBAL_REGION;
+ }
try {
- ObjectName objectName = new ObjectName("org.eclipse.virgo.kernel:type=ArtifactModel,artifact-type=" + type + ",name=" + name + ",version=" + version);
+ ObjectName objectName = new ObjectName("org.eclipse.virgo.kernel:type=ArtifactModel,artifact-type=" + type + ",name=" + name + ",version=" + version + ",region=" + region);
ManageableArtifact artifact = JMX.newMXBeanProxy(this.mBeanServer, objectName, ManageableArtifact.class);
long startTime = System.currentTimeMillis();

Back to the top