Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2014-10-31 16:05:35 +0000
committerThomas Watson2014-10-31 16:05:35 +0000
commit973cce5ef912b1f205c919ccc500a26684446578 (patch)
tree39c845d6d2c4b1de137b817a67afee651ac5cbeb
parent59936a92e77ef787c060f0b9ef55e15985ecfafa (diff)
downloadrt.equinox.framework-973cce5ef912b1f205c919ccc500a26684446578.tar.gz
rt.equinox.framework-973cce5ef912b1f205c919ccc500a26684446578.tar.xz
rt.equinox.framework-973cce5ef912b1f205c919ccc500a26684446578.zip
Bug 449465 - Compile error in org.eclipse.osgi.tests/plugin.xml
-rw-r--r--bundles/org.eclipse.osgi.tests/plugin.xml2
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java10
2 files changed, 8 insertions, 4 deletions
diff --git a/bundles/org.eclipse.osgi.tests/plugin.xml b/bundles/org.eclipse.osgi.tests/plugin.xml
index 69e6db358..b27d6ae5d 100644
--- a/bundles/org.eclipse.osgi.tests/plugin.xml
+++ b/bundles/org.eclipse.osgi.tests/plugin.xml
@@ -27,7 +27,7 @@
id="testCardinality01"
point="org.eclipse.core.runtime.applications">
<application
- cardinality="10"
+ cardinality="5"
thread="any"
visible="true">
<run
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java
index 4a595d4b8..63d84b7eb 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/appadmin/ApplicationAdminTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2013 IBM Corporation and others.
+ * Copyright (c) 2007, 2014 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -665,8 +665,12 @@ public class ApplicationAdminTest extends OSGiTest {
ArrayList instances = new ArrayList();
int i = 0;
try {
- for (; i <= cardinality; i++)
+ for (; i <= cardinality; i++) {
instances.add(app.launch(null));
+ if (i == cardinality && hasMax) {
+ fail("Expected an ApplicationException.");
+ }
+ }
} catch (ApplicationException e) {
if (!hasMax || i != cardinality)
fail("Unexpected ApplicationException", e); //$NON-NLS-1$
@@ -680,7 +684,7 @@ public class ApplicationAdminTest extends OSGiTest {
}
public void testCardinality01() {
- doTestCardinality01(PI_OSGI_TESTS + ".testCardinality01", 10, true); //$NON-NLS-1$
+ doTestCardinality01(PI_OSGI_TESTS + ".testCardinality01", 5, true); //$NON-NLS-1$
}
public void testCardinality02() {

Back to the top