diff options
3 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/From36to37.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/From36to37.java index 2bb43d744..30093f327 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/From36to37.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/From36to37.java @@ -30,6 +30,7 @@ public class From36to37 extends AbstractReconcilerTest { } public void from36To37() { + assertInitialized(); String currentBuildRepo = System.getProperty("org.eclipse.equinox.p2.tests.current.build.repo"); if (currentBuildRepo == null) currentBuildRepo = "http://download.eclipse.org/eclipse/updates/3.7-I-builds"; diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/Install37from36.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/Install37from36.java index f0fa72e21..1253a193b 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/Install37from36.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/Install37from36.java @@ -51,6 +51,7 @@ public class Install37from36 extends AbstractReconcilerTest { } public void install37From36() throws IOException { + assertInitialized(); //Create a new installation of 3.7 using 3.6 File installFolder = getTestFolder("install37From36"); System.out.println(installFolder); diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java index b33a9c516..048509289 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java @@ -63,7 +63,8 @@ public class AbstractReconcilerTest extends AbstractProvisioningTest { /* * Set up the platform binary download and get it ready to run the tests. * This method is not intended to be called by clients, it will be called - * automatically when the clients use a ReconcilerTestSuite. + * automatically when the clients use a ReconcilerTestSuite. If the executable isn't + * found on the file-system after the call, then we fail. */ public void initialize() throws Exception { initialized = false; @@ -80,6 +81,8 @@ public class AbstractReconcilerTest extends AbstractProvisioningTest { } else { untar("1.0", file); } + File exe = new File(output, "eclipse/eclipse"); + assertTrue("Executable not found after initialization.", exe.exists()); initialized = true; } |