summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault (Ericsson)2013-02-04 22:00:02 (EST)
committerPascal Rapicault2013-02-04 22:00:02 (EST)
commitcf85b76d32aec28219087b85fb3b6d41ae928023 (patch)
tree1ac4133b5adff89c28516a692807da1c8ffffe5d
parent01f2d1482ee8afd472d1b65a1dcd8d6b87ff46f5 (diff)
downloadrt.equinox.p2-cf85b76d32aec28219087b85fb3b6d41ae928023.zip
rt.equinox.p2-cf85b76d32aec28219087b85fb3b6d41ae928023.tar.gz
rt.equinox.p2-cf85b76d32aec28219087b85fb3b6d41ae928023.tar.bz2
Move shared install tests in new package and clean up test suitev20130205-030002I20130205-0800
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java16
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sat4j/smoke/SmokeTestSAT4J.java11
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/AbstractSharedInstallTest.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractSharedInstallTest.java)4
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/AllTests.java27
-rw-r--r--bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/SharedInstallEnd2End.java (renamed from bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/SharedInstallEnd2End.java)4
5 files changed, 47 insertions, 15 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java
index 861b1c7..292cfa6 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/AutomatedTests.java
@@ -17,11 +17,14 @@ import junit.framework.*;
* This is the master test suite for all automated provisioning tests. It runs every test
* that is suitable for running in an automated fashion as part of a build. Some
* tests may be excluded if they require special setup (such as generating metadata).
+ *
+ * PLEASE ADD SUITES IN THE PACKAGE NAME ORDER.
*/
public class AutomatedTests extends TestCase {
public static Test suite() {
TestSuite suite = new TestSuite(AutomatedTests.class.getName());
suite.addTest(org.eclipse.equinox.frameworkadmin.tests.AllTests.suite());
+
suite.addTest(org.eclipse.equinox.p2.tests.ant.AllTests.suite());
suite.addTest(org.eclipse.equinox.p2.tests.artifact.processors.AllTests.suite());
suite.addTest(org.eclipse.equinox.p2.tests.artifact.repository.AllTests.suite());
@@ -31,6 +34,7 @@ public class AutomatedTests extends TestCase {
suite.addTest(org.eclipse.equinox.p2.tests.directorywatcher.AllTests.suite());
suite.addTest(org.eclipse.equinox.p2.tests.engine.AllTests.suite());
suite.addTest(org.eclipse.equinox.p2.tests.extensionlocation.AllTests.suite());
+ //org.eclipse.equinox.p2.tests.full - Off sequence
suite.addTest(org.eclipse.equinox.p2.tests.gc.AllTests.suite());
suite.addTest(org.eclipse.equinox.p2.tests.generator.AllTests.suite());
suite.addTest(org.eclipse.equinox.p2.tests.installer.AllTests.suite());
@@ -40,17 +44,25 @@ public class AutomatedTests extends TestCase {
suite.addTest(org.eclipse.equinox.p2.tests.metadata.repository.AllTests.suite());
suite.addTest(org.eclipse.equinox.p2.tests.mirror.AllTests.suite());
suite.addTest(org.eclipse.equinox.p2.tests.omniVersion.AllTests.suite());
+ //org.eclipse.equinox.p2.tests.perf -- Executed as part of the
suite.addTest(org.eclipse.equinox.p2.tests.planner.AllTests.suite());
suite.addTest(org.eclipse.equinox.p2.tests.publisher.AllTests.suite());
+ //org.eclipse.equinox.p2.tests.publisher.actions -- The tests found in this package are invoked from the publisher package
suite.addTest(org.eclipse.equinox.p2.tests.ql.AllTests.suite());
+ //org.eclipse.equinox.p2.tests.reconciler.dropins -- Off sequence
suite.addTest(org.eclipse.equinox.p2.tests.repository.AllTests.suite());
+ suite.addTest(org.eclipse.equinox.p2.tests.sat4j.smoke.AllTests.suite());
+ //org.eclipse.equinox.p2.tests.sharedinstall -- Off sequence
suite.addTest(org.eclipse.equinox.p2.tests.simpleconfigurator.SimpleConfiguratorTests.suite());
suite.addTest(org.eclipse.equinox.p2.tests.simpleconfigurator.manipulator.AllTests.suite());
- suite.addTest(org.eclipse.equinox.p2.tests.updatesite.AllTests.suite());
suite.addTest(org.eclipse.equinox.p2.tests.touchpoint.eclipse.AllTests.suite());
suite.addTest(org.eclipse.equinox.p2.tests.touchpoint.natives.AllTests.suite());
- suite.addTest(org.eclipse.equinox.p2.tests.reconciler.dropins.AllTests.suite());
suite.addTest(org.eclipse.equinox.p2.tests.updatechecker.AllTests.suite());
+ suite.addTest(org.eclipse.equinox.p2.tests.updatesite.AllTests.suite());
+
+ //Off sequence
+ suite.addTest(org.eclipse.equinox.p2.tests.reconciler.dropins.AllTests.suite());
+ suite.addTest(org.eclipse.equinox.p2.tests.sharedinstall.AllTests.suite());
suite.addTest(org.eclipse.equinox.p2.tests.full.AllTests.suite());
return suite;
}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sat4j/smoke/SmokeTestSAT4J.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sat4j/smoke/SmokeTestSAT4J.java
index a3810a8..6efc4fc 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sat4j/smoke/SmokeTestSAT4J.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sat4j/smoke/SmokeTestSAT4J.java
@@ -73,15 +73,4 @@ public class SmokeTestSAT4J extends AbstractProvisioningTest {
assertNull(raised);
}
-
- // private void backToIU(IProblem problem) {
- // solution = new ArrayList();
- // for (Iterator allIUs = variables.entrySet().iterator(); allIUs.hasNext();) {
- // Entry entry = (Entry) allIUs.next();
- // int match = Integer.parseInt(((String) entry.getValue()).substring(1));
- // if (problem.model(match)) {
- // solution.add(((IInstallableUnit) entry.getKey()).unresolved());
- // }
- // }
- // }
}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractSharedInstallTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/AbstractSharedInstallTest.java
index 3ad64a7..18cc838 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractSharedInstallTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/AbstractSharedInstallTest.java
@@ -7,7 +7,9 @@
* Contributors:
* Ericsson AB - ongoing development
******************************************************************************/
-package org.eclipse.equinox.p2.tests.reconciler.dropins;
+package org.eclipse.equinox.p2.tests.sharedinstall;
+
+import org.eclipse.equinox.p2.tests.reconciler.dropins.AbstractReconcilerTest;
import java.io.*;
import java.util.Properties;
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/AllTests.java
new file mode 100644
index 0000000..df6e1f8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/AllTests.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2013 Ericsson AB 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 http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Ericsson AB - ongoing development
+ ******************************************************************************/
+package org.eclipse.equinox.p2.tests.sharedinstall;
+
+import junit.framework.*;
+
+/**
+ * To run the shared install tests, you must perform some manual setup steps:
+ * 1) Download the platform runtime binary zip (latest build or the one you want to test).
+ * 2) Set the following system property to the file system path of the binary zip. For example:
+ *
+ * -Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=c:/tmp/eclipse-platform-3.4-win32.zip
+ */
+public class AllTests extends TestCase {
+ public static Test suite() {
+ TestSuite suite = new TestSuite(AllTests.class.getName());
+ suite.addTest(SharedInstallEnd2End.suite());
+ return suite;
+ }
+}
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/SharedInstallEnd2End.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/SharedInstallEnd2End.java
index 5909b27..dba22dd 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/SharedInstallEnd2End.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/SharedInstallEnd2End.java
@@ -7,7 +7,9 @@
* Contributors:
* Ericsson AB - ongoing development
******************************************************************************/
-package org.eclipse.equinox.p2.tests.reconciler.dropins;
+package org.eclipse.equinox.p2.tests.sharedinstall;
+
+import org.eclipse.equinox.p2.tests.reconciler.dropins.ReconcilerTestSuite;
import java.io.File;
import java.io.IOException;