diff options
6 files changed, 11 insertions, 8 deletions
diff --git a/tests/org.eclipse.team.tests.core/plugin.xml b/tests/org.eclipse.team.tests.core/plugin.xml index 48dd4ede4..ece1f52bd 100644 --- a/tests/org.eclipse.team.tests.core/plugin.xml +++ b/tests/org.eclipse.team.tests.core/plugin.xml @@ -29,6 +29,7 @@ <import plugin="org.eclipse.compare"/> <import plugin="org.eclipse.ui"/> <import plugin="org.junit"/> + <import plugin="org.eclipse.core.tests.resources"/> </requires> diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/AllTeamTests.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/AllTeamTests.java index 1738eead5..8bd625ec2 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/AllTeamTests.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/AllTeamTests.java @@ -12,9 +12,10 @@ package org.eclipse.team.tests.core; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.tests.harness.EclipseWorkspaceTest; -public class AllTeamTests extends EclipseWorkspaceTest { +import org.eclipse.core.tests.resources.ResourceTest; + +public class AllTeamTests extends ResourceTest { /** * Constructor for CVSClientTest. diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/TeamTest.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/TeamTest.java index 8b5c1bd20..b2c0e709a 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/TeamTest.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/TeamTest.java @@ -18,9 +18,9 @@ import junit.framework.TestSuite; import org.eclipse.core.resources.*; import org.eclipse.core.runtime.*; -import org.eclipse.core.tests.harness.EclipseWorkspaceTest; +import org.eclipse.core.tests.resources.ResourceTest; -public class TeamTest extends EclipseWorkspaceTest { +public class TeamTest extends ResourceTest { protected static IProgressMonitor DEFAULT_MONITOR = new NullProgressMonitor(); protected static final IProgressMonitor DEFAULT_PROGRESS_MONITOR = new NullProgressMonitor(); diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/synchronize/AllTeamSynchronizeTests.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/synchronize/AllTeamSynchronizeTests.java index e5f89a419..7d4206eaa 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/synchronize/AllTeamSynchronizeTests.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/synchronize/AllTeamSynchronizeTests.java @@ -13,9 +13,9 @@ package org.eclipse.team.tests.ui.synchronize; import junit.framework.Test; import junit.framework.TestSuite; -import org.eclipse.core.tests.harness.EclipseWorkspaceTest; +import org.eclipse.core.tests.resources.ResourceTest; -public class AllTeamSynchronizeTests extends EclipseWorkspaceTest { +public class AllTeamSynchronizeTests extends ResourceTest { /** * Constructor for CVSClientTest. diff --git a/tests/org.eclipse.team.tests.cvs.core/plugin.xml b/tests/org.eclipse.team.tests.cvs.core/plugin.xml index ceeef338d..0a7a27d8a 100644 --- a/tests/org.eclipse.team.tests.cvs.core/plugin.xml +++ b/tests/org.eclipse.team.tests.cvs.core/plugin.xml @@ -31,6 +31,7 @@ <import plugin="org.junit"/> <import plugin="org.eclipse.team.tests.core"/> <import plugin="org.eclipse.test.performance"/> + <import plugin="org.eclipse.core.tests.resources"/> </requires> diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java index 3fc78af7c..b4760a0d1 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java @@ -18,7 +18,7 @@ import junit.framework.*; import org.eclipse.core.resources.*; import org.eclipse.core.runtime.*; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.core.tests.harness.EclipseWorkspaceTest; +import org.eclipse.core.tests.resources.ResourceTest; import org.eclipse.swt.widgets.Display; import org.eclipse.team.core.RepositoryProvider; import org.eclipse.team.core.TeamException; @@ -34,7 +34,7 @@ import org.eclipse.team.internal.ccvs.ui.operations.*; import org.eclipse.team.internal.core.subscribers.SubscriberSyncInfoCollector; import org.eclipse.ui.IWorkbenchPart; -public class EclipseTest extends EclipseWorkspaceTest { +public class EclipseTest extends ResourceTest { protected static IProgressMonitor DEFAULT_MONITOR = new NullProgressMonitor(); protected static final int RANDOM_CONTENT_SIZE = 3876; |