Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDJ Houghton2011-12-13 08:53:03 -0500
committerDJ Houghton2011-12-13 08:53:03 -0500
commit08640abef48db49389a62fa0044a31b6a71b552b (patch)
tree49ee411fcac31f22e9e2d66b1be72709fb111ac9
parent64938edc458a285b88ba3fbb295d6fbfa8f0126e (diff)
downloadrt.equinox.p2-08640abef48db49389a62fa0044a31b6a71b552b.tar.gz
rt.equinox.p2-08640abef48db49389a62fa0044a31b6a71b552b.tar.xz
rt.equinox.p2-08640abef48db49389a62fa0044a31b6a71b552b.zip
Updated tests. Enable tests.verifier bundle to be run in the workspace.v20111213-1353
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.verifier/.classpath1
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.verifier/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.tests.verifier/build.properties5
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/From35to36.java6
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/From36to37.java8
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/From37to38.java4
6 files changed, 14 insertions, 12 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests.verifier/.classpath b/bundles/org.eclipse.equinox.p2.tests.verifier/.classpath
index 5e4c1fe99..c09e9001d 100644
--- a/bundles/org.eclipse.equinox.p2.tests.verifier/.classpath
+++ b/bundles/org.eclipse.equinox.p2.tests.verifier/.classpath
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry exported="true" kind="lib" path="bin/"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
diff --git a/bundles/org.eclipse.equinox.p2.tests.verifier/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.tests.verifier/META-INF/MANIFEST.MF
index 5a0a01d2d..7287e4242 100644
--- a/bundles/org.eclipse.equinox.p2.tests.verifier/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.tests.verifier/META-INF/MANIFEST.MF
@@ -12,3 +12,5 @@ Import-Package: org.eclipse.equinox.internal.p2.core.helpers,
org.eclipse.equinox.p2.engine;version="[2.0.0,3.0.0)",
org.eclipse.equinox.p2.query;version="[2.0.0,3.0.0)"
Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: bin/,
+ .
diff --git a/bundles/org.eclipse.equinox.p2.tests.verifier/build.properties b/bundles/org.eclipse.equinox.p2.tests.verifier/build.properties
index b4a80b58f..5b7d40c92 100644
--- a/bundles/org.eclipse.equinox.p2.tests.verifier/build.properties
+++ b/bundles/org.eclipse.equinox.p2.tests.verifier/build.properties
@@ -12,5 +12,6 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.xml
-javacWarnings..=-raw,-unchecked,-varargsCast \ No newline at end of file
+ plugin.xml,\
+ bin/
+javacWarnings..=-raw,-unchecked,-varargsCast
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/From35to36.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/From35to36.java
index e88f82736..960aa180f 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/From35to36.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/From35to36.java
@@ -31,15 +31,13 @@ public class From35to36 extends AbstractReconcilerTest {
public void from35To36() {
assertInitialized();
- String currentBuildRepo = System.getProperty("org.eclipse.equinox.p2.tests.current.build.repo");
- if (currentBuildRepo == null)
- currentBuildRepo = "http://download.eclipse.org/eclipse/updates/3.6-I-builds";
+ String repository = "http://download.eclipse.org/eclipse/updates/3.6";
runInitialize("Initializing 3.5 to get the profile paths properly setup.");
SimpleProfileRegistry registry = new SimpleProfileRegistry(getAgent(), new File(output, "eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/"), null, false);
String initialTimestamp = Long.toString(registry.getProfile("PlatformProfile").getTimestamp());
//Take 3.5 archive, unzip, run it to update to 3.6
- assertEquals(0, runDirectorToUpdate("Updating from 3.5 to 3.6", currentBuildRepo, "org.eclipse.platform.ide", "org.eclipse.platform.ide"));
+ assertEquals(0, runDirectorToUpdate("Updating from 3.5 to 3.6", repository, "org.eclipse.platform.ide", "org.eclipse.platform.ide"));
assertEquals(0, installAndRunVerifierBundle(null));
// revert to 3.5
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 782c9265e..9d20493a4 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
@@ -24,22 +24,20 @@ public class From36to37 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 From36to37("from36To37"));
return suite;
}
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";
+ String repository = "http://download.eclipse.org/eclipse/updates/3.7";
runInitialize("Initializing 3.6 to get the profile paths properly setup.");
SimpleProfileRegistry registry = new SimpleProfileRegistry(getAgent(), new File(output, "eclipse/p2/org.eclipse.equinox.p2.engine/profileRegistry/"), null, false);
String initialTimestamp = Long.toString(registry.getProfile("PlatformProfile").getTimestamp());
//Take 3.6 archive, unzip, run it to update to 3.7
- assertEquals(0, runDirectorToUpdate("Updating from 3.6 to 3.7", currentBuildRepo, "org.eclipse.platform.ide", "org.eclipse.platform.ide"));
+ assertEquals(0, runDirectorToUpdate("Updating from 3.6 to 3.7", repository, "org.eclipse.platform.ide", "org.eclipse.platform.ide"));
assertEquals(0, installAndRunVerifierBundle(null));
// revert to 3.6
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/From37to38.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/From37to38.java
index 4077a13ef..d906e32eb 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/From37to38.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/full/From37to38.java
@@ -24,7 +24,7 @@ public class From37to38 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 From37to38("from37To38"));
return suite;
}
@@ -32,6 +32,8 @@ public class From37to38 extends AbstractReconcilerTest {
public void from37To38() {
assertInitialized();
String currentBuildRepo = System.getProperty("org.eclipse.equinox.p2.tests.current.build.repo");
+ // TODO this will change once Juno is released:
+ // http://download.eclipse.org/eclipse/updates/3.8
if (currentBuildRepo == null)
currentBuildRepo = "http://download.eclipse.org/eclipse/updates/3.8-I-builds";
runInitialize("Initializing 3.7 to get the profile paths properly setup.");

Back to the top