Correctly disable EditorTests.testOpenEditorOnRevisionN20130317-2000N20130316-1500N20130315-2000

3 files changed, 8 insertions, 6 deletions

diff --git a/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF b/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF
index ae6d24ff0..daca7a960 100644
--- a/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.team.tests.cvs.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse CVS Tests Core
 Bundle-SymbolicName: org.eclipse.team.tests.cvs.core; singleton:=true
-Bundle-Version: 3.3.300.qualifier
+Bundle-Version: 3.3.400.qualifier
 Bundle-ClassPath: cvstests.jar
 Bundle-Activator: org.eclipse.team.tests.ccvs.core.TeamCVSTestPlugin
 Bundle-Vendor: Eclipse.org
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/AllUITests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/AllUITests.java
index 20ac7e38c..5379ac095 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/AllUITests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/AllUITests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2013 IBM Corporation 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
@@ -31,7 +31,10 @@ public class AllUITests extends EclipseTest {
 		suite.addTest(CompareOperationTests.suite());
 		suite.addTest(MiscOperationsTests.suite());
 		suite.addTest(ProjectSetImporterTests.suite());
-		suite.addTest(EditorTests.suite());
+
+		//TODO Temporary switched off, see Bug 400540
+//		suite.addTest(EditorTests.suite());
+
 		suite.addTest(PatchWizardRadioButtonGroupTests.suite());
 		suite.addTest(CVSProjectSetImportTest.suite());
 		suite.addTest(CreatePatchTest.suite());
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/EditorTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/EditorTests.java
index 8ad44f1d2..18f511c45 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/EditorTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/EditorTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+ * Copyright (c) 2007, 2013 IBM Corporation 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
@@ -49,8 +49,7 @@ public class EditorTests extends EclipseTest {
 		return new CVSTestSetup(suite);
 	}
 	
-	//TODO Temporary switched off, see Bug 400540
-	public void _testOpenEditorOnRevision() throws CoreException, InvocationTargetException {
+	public void testOpenEditorOnRevision() throws CoreException, InvocationTargetException {
 		IProject project = createProject(new String[] { "file.cvsTest" });
 		IEditorPart localPart = IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(), project.getFile("file.cvsTest"));
 		assertTrue("The proper local editor was not opened", localPart instanceof TestEditor);