Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2013-12-19 03:52:38 -0500
committerDani Megert2013-12-19 03:52:38 -0500
commitc1b67a899025d7c52eb967b57cc7427539758424 (patch)
tree36ca870e29c931e99acba9188b64e2da6d6cd392
parent372b0aacd8f672f982fec7788d338e587c6e3505 (diff)
downloadeclipse.platform.team-c1b67a899025d7c52eb967b57cc7427539758424.tar.gz
eclipse.platform.team-c1b67a899025d7c52eb967b57cc7427539758424.tar.xz
eclipse.platform.team-c1b67a899025d7c52eb967b57cc7427539758424.zip
Disabled unstable tests
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/ResourceMapperTests.java45
1 files changed, 27 insertions, 18 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/ResourceMapperTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/ResourceMapperTests.java
index 5a04d8d69..349a9f440 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/ResourceMapperTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/ResourceMapperTests.java
@@ -24,19 +24,6 @@ import java.util.Set;
import junit.framework.Test;
-import org.eclipse.core.internal.resources.mapping.SimpleResourceMapping;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.mapping.RemoteResourceMappingContext;
-import org.eclipse.core.resources.mapping.ResourceMapping;
-import org.eclipse.core.resources.mapping.ResourceMappingContext;
-import org.eclipse.core.resources.mapping.ResourceTraversal;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.osgi.util.NLS;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.TeamStatus;
@@ -68,6 +55,25 @@ import org.eclipse.team.internal.core.ResourceVariantCache;
import org.eclipse.team.internal.core.ResourceVariantCacheEntry;
import org.eclipse.team.internal.core.mapping.SyncInfoToDiffConverter;
import org.eclipse.team.tests.ccvs.core.EclipseTest;
+import org.eclipse.team.tests.ccvs.core.TeamCVSTestPlugin;
+
+import org.eclipse.core.internal.resources.mapping.SimpleResourceMapping;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.MultiStatus;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.resources.mapping.RemoteResourceMappingContext;
+import org.eclipse.core.resources.mapping.ResourceMapping;
+import org.eclipse.core.resources.mapping.ResourceMappingContext;
+import org.eclipse.core.resources.mapping.ResourceTraversal;
+
+import org.eclipse.jface.util.Util;
/**
* Tests for using CVS operations with deep and shallow resource mappings.
@@ -75,9 +81,6 @@ import org.eclipse.team.tests.ccvs.core.EclipseTest;
public class ResourceMapperTests extends EclipseTest {
- private static final boolean IS_UNSTABLE= true;
-
-
public ResourceMapperTests() {
super();
}
@@ -184,7 +187,7 @@ public class ResourceMapperTests extends EclipseTest {
* Need to ensure that only the resources contained in the mapping
* have the branch tag associated with them.
*/
- private void assertBranched(ResourceMapping mapping, CVSTag branch) throws CoreException, IOException {
+ private void assertBranched(ResourceMapping mapping, CVSTag branch) throws CoreException {
// First, make sure the proper resources are tagged in the repo
assertTagged(mapping, branch);
// Now make sure the proper local files are tagged
@@ -580,6 +583,9 @@ public class ResourceMapperTests extends EclipseTest {
}
public void testCommit() throws Exception {
+ if (TeamCVSTestPlugin.IS_UNSTABLE_TEST && Util.isMac())
+ return;
+
// Create a test project, import it into cvs and check it out
IProject project = createProject("testCommit", new String[] { "changed.txt", "deleted.txt", "folder1/", "folder1/a.txt", "folder1/b.txt", "folder1/subfolder1/c.txt" });
@@ -619,7 +625,7 @@ public class ResourceMapperTests extends EclipseTest {
public void testBranch() throws Exception {
- if (IS_UNSTABLE)
+ if (TeamCVSTestPlugin.IS_UNSTABLE_TEST)
return;
// Create a test project, import it into cvs and check it out
@@ -644,6 +650,9 @@ public class ResourceMapperTests extends EclipseTest {
}
public void testCacheBase() throws TeamException, CoreException {
+ if (TeamCVSTestPlugin.IS_UNSTABLE_TEST && Util.isMac())
+ return;
+
IProject project = createProject("testCacheBase", new String[] { "changed.txt", "deleted.txt", "folder1/", "folder1/a.txt", "folder1/b.txt", "folder1/subfolder1/c.txt" });
IProject copy = checkoutCopy(project, "-copy");

Back to the top