diff options
3 files changed, 10 insertions, 6 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/AllTests.java index bf180dfd4..88e3bb8f8 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/AllTests.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/AllTests.java @@ -20,16 +20,18 @@ public class AllTests extends TestCase { public static Test suite() { TestSuite suite = new TestSuite(AllTests.class.getName()); + /* suite.addTestSuite(End2EndTest35.class); suite.addTestSuite(End2EndTest36.class); suite.addTestSuite(End2EndTest37.class); - //suite.addTest(From35to36.suite()); + suite.addTest(From35to36.suite()); suite.addTest(From36to37.suite()); - //suite.addTest(From37to38.suite()); + suite.addTest(From37to38.suite()); + */ //suite.addTest(Install36from35.suite()); - suite.addTest(Install37from36.suite()); + //suite.addTest(Install37from36.suite()); //suite.addTest(Install38from37.suite()); return suite; } 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 c13e0bebf..85bc81367 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 @@ -23,7 +23,7 @@ public class Install37from36 extends AbstractReconcilerTest { } public static Test suite() { - TestSuite suite = new ReconcilerTestSuite("org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive"); + TestSuite suite = new ReconcilerTestSuite("org.eclipse.equinox.p2.reconciler.tests.36.platform.archive"); suite.addTest(new Install37from36("install37From36")); return suite; } @@ -32,7 +32,7 @@ public class Install37from36 extends AbstractReconcilerTest { assertInitialized(); //Create a new installation of 3.7 using 3.6 File installFolder = getTestFolder("install37From36"); - int result = runDirectorToInstall("Installing 3.7 from 3.6", new File(installFolder, "eclipse"), "http://download.eclipse.org/eclipse/updates/3.7-I-builds", "org.eclipse.platform.ide"); + int result = runDirectorToInstall("Installing 3.7 from 3.6", new File(installFolder, "eclipse"), "http://download.eclipse.org/eclipse/updates/3.7", "org.eclipse.platform.ide"); if (result != 0) { File logFile = new File(installFolder, "log.log"); if (logFile.exists()) { diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/Install38from37.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/Install38from37.java index 0a7060143..4f3820f8b 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/Install38from37.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/Install38from37.java @@ -23,7 +23,7 @@ public class Install38from37 extends AbstractReconcilerTest { } public static Test suite() { - TestSuite suite = new ReconcilerTestSuite("org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive"); + TestSuite suite = new ReconcilerTestSuite("org.eclipse.equinox.p2.reconciler.tests.37.platform.archive"); suite.addTest(new Install38from37("install38From37")); return suite; } @@ -32,6 +32,8 @@ public class Install38from37 extends AbstractReconcilerTest { assertInitialized(); //Create a new installation of 3.8 using 3.7 File installFolder = getTestFolder("install38From37"); + // TODO this URL will change once Juno is released. + // http://download.eclipse.org/eclipse/updates/3.8 int result = runDirectorToInstall("Installing 3.8 from 3.7", new File(installFolder, "eclipse"), "http://download.eclipse.org/eclipse/updates/3.8-I-builds", "org.eclipse.platform.ide"); if (result != 0) { File logFile = new File(installFolder, "log.log"); |