Revert "bug 421935 & bug 422054 - comment out failing windows tests until I will get windows machine."

This reverts commit d5fd1c250f0945d5801d29dff1948bdc11515546.

2 files changed, 4 insertions, 8 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/AbstractSharedInstallTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/AbstractSharedInstallTest.java
index 7455efc79..e0efd9a6a 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/AbstractSharedInstallTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/sharedinstall/AbstractSharedInstallTest.java
@@ -193,7 +193,7 @@ public abstract class AbstractSharedInstallTest extends AbstractReconcilerTest {
 		realExecuteVerifier(verificationProperties, true);
 	}
 
-	public static void reallyReadOnly(File folder) {
+	protected void reallyReadOnly(File folder) {
 		if (!Platform.getOS().equals(Platform.OS_WIN32))
 			return;
 
@@ -210,7 +210,7 @@ public abstract class AbstractSharedInstallTest extends AbstractReconcilerTest {
 		}
 	}
 
-	public static void removeReallyReadOnly(File folder) {
+	protected void removeReallyReadOnly(File folder) {
 		if (!Platform.getOS().equals(Platform.OS_WIN32))
 			return;
 
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
index b95a8143a..fea2aa386 100644
--- 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
@@ -20,15 +20,11 @@ import junit.framework.*;
  * -Dorg.eclipse.equinox.p2.reconciler.tests.platform.archive=c:/tmp/eclipse-platform-3.4-win32.zip
  */
 public class AllTests extends TestCase {
-	protected static final boolean WINDOWS = java.io.File.separatorChar == '\\';
-
 	public static Test suite() {
 		TestSuite suite = new TestSuite(AllTests.class.getName());
 		suite.addTest(BaseChange.suite());
-		if (!WINDOWS) { //don't run on windows until I will get windows machine.
-			suite.addTest(BaseChangeExtendedConfigured.suite());
-			suite.addTest(BaseChangeExtendedConflicts.suite());
-		}
+		suite.addTest(BaseChangeExtendedConfigured.suite());
+		suite.addTest(BaseChangeExtendedConflicts.suite());
 		suite.addTest(BaseChangeWithoutUserChange.suite());
 		suite.addTest(Cancellation.suite());
 		suite.addTest(DoubleBaseChange.suite());