Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJean Michel-Lemieux2003-10-29 17:04:17 -0500
committerJean Michel-Lemieux2003-10-29 17:04:17 -0500
commit1acec58795d08858e2b7a14af093c22c16d46a89 (patch)
treea362378002aad60bb392f4b294ae6f5050ae70e6 /tests
parent41b8824b42722a3a9d48ca42390a55009605267b (diff)
downloadeclipse.platform.team-1acec58795d08858e2b7a14af093c22c16d46a89.tar.gz
eclipse.platform.team-1acec58795d08858e2b7a14af093c22c16d46a89.tar.xz
eclipse.platform.team-1acec58795d08858e2b7a14af093c22c16d46a89.zip
Initial release of Synchronize View API.
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.team.tests.core/.project2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS Core Tests.launch17
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS UI Tests.launch (renamed from tests/org.eclipse.team.tests.cvs.core/launchConfigurations/All CVS Tests.launch)18
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllCoreTests.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTeamAndCVSTests.java)28
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTests.java17
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/EclipseTest.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ConcurrencyTests.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/AllTestsTeamSubscriber.java3
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java70
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSSyncSubscriberTest.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncInfoSource.java23
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncSetTests.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestCommitAction.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMarkAsMergedAction.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMergeUpdateAction.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndCommit.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndUpdate.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestUpdateAction.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/AllUITests.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/AllUIUnitTests.java)8
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSOperationTest.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/CVSOperationTest.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CheckoutOperationTests.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/CheckoutOperationTests.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CompareOperationTests.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/CompareOperationTests.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/HeadlessCVSRunnableContext.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/HeadlessCVSRunnableContext.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/MenuEnablementTest.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/MenuEnablementTest.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SynchronizeViewTestAdapter.java135
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/AllTests.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/AllTests.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/ArgumentParser.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/ArgumentParser.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/BenchmarkTestSetup.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkTestSetup.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/CVSUITestCase.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSUITestCase.java)22
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/CaseEntry.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/CaseEntry.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/CommandTests.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/CommandTests.java)16
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/DelimitedValuesWriter.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/DelimitedValuesWriter.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/DummyPromptCondition.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/DummyPromptCondition.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/EclipseUITestHarnessApplication.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/EclipseUITestHarnessApplication.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/EmptyPerspective.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/EmptyPerspective.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/FakeSelectionProvider.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/FakeSelectionProvider.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/GroupEntry.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/GroupEntry.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/ICriteria.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ICriteria.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/ILogEntryVisitor.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/ILogEntryVisitor.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LogEntry.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/LogEntry.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LogEntryContainer.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/LogEntryContainer.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LogFormatterUIMain.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/LogFormatterUIMain.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LoggingTestCase.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/LoggingTestCase.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LoggingTestResult.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/LoggingTestResult.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LoggingTestRunner.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/LoggingTestRunner.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/MergeRunsVisitor.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/MergeRunsVisitor.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PerformanceTimer.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PerformanceTimer.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintCSVDiffVisitor.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintCSVDiffVisitor.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintCSVSummaryVisitor.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintCSVSummaryVisitor.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintDiffMain.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintDiffMain.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintDiffVisitor.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintDiffVisitor.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintSummaryMain.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintSummaryMain.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintTextDiffVisitor.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintTextDiffVisitor.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintTextSummaryVisitor.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintTextSummaryVisitor.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/Result.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/Result.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/RootEntry.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/RootEntry.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/SequenceGenerator.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SequenceGenerator.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/SyncTests.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/SyncTests.java)17
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/TaskEntry.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/TaskEntry.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/Util.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/Util.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/Utils.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/Util.java)6
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/Waiter.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/Waiter.java)2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/WorkflowTests.java (renamed from tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/WorkflowTests.java)51
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/sync/AllTestsSynchronizeView.java48
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/sync/SyncInfoFromSyncSet.java92
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/test.xml9
67 files changed, 329 insertions, 351 deletions
diff --git a/tests/org.eclipse.team.tests.core/.project b/tests/org.eclipse.team.tests.core/.project
index d596c9870..afb169441 100644
--- a/tests/org.eclipse.team.tests.core/.project
+++ b/tests/org.eclipse.team.tests.core/.project
@@ -9,6 +9,8 @@
<project>org.eclipse.core.runtime</project>
<project>org.eclipse.core.tests.harness</project>
<project>org.eclipse.team.core</project>
+ <project>org.eclipse.team.cvs.core</project>
+ <project>org.eclipse.team.cvs.ui</project>
<project>org.eclipse.team.ui</project>
<project>org.eclipse.ui</project>
<project>org.junit</project>
diff --git a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS Core Tests.launch b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS Core Tests.launch
new file mode 100644
index 000000000..568411774
--- /dev/null
+++ b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS Core Tests.launch
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+ <booleanAttribute key="clearws" value="true"/>
+ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.team.tests.ccvs.core.AllCoreTests"/>
+ <booleanAttribute key="default" value="true"/>
+ <stringAttribute key="vmargs" value="-Declipse.cvs.properties=c:\eclipse\repository.properties -Declipse.cvs.testName2=testFileAdditions"/>
+ <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+ <stringAttribute
+ key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+ <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+ <stringAttribute key="progargs" value="-os win32 -ws win32 -arch x86 -nl en_CA"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.team.tests.cvs.core"/>
+ <booleanAttribute key="askclear" value="false"/>
+ <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+ <stringAttribute key="location0" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace"/>
+ <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.debug.ui.javaSourceLocator"/>
+</launchConfiguration>
diff --git a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/All CVS Tests.launch b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS UI Tests.launch
index a66c0bef1..5fbf3cb90 100644
--- a/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/All CVS Tests.launch
+++ b/tests/org.eclipse.team.tests.cvs.core/launchConfigurations/CVS UI Tests.launch
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
- <stringAttribute key="vmargs" value="-Declipse.cvs.properties=c:\eclipse\repository.properties -Declipse.cvs.testName2=testFileConflict"/>
- <booleanAttribute key="askclear" value="false"/>
- <booleanAttribute key="default" value="true"/>
<booleanAttribute key="clearws" value="true"/>
- <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.team.tests.cvs.core"/>
- <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.debug.ui.javaSourceLocator"/>
- <stringAttribute key="location0" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace"/>
+ <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.team.tests.ccvs.core.AllTests"/>
+ <booleanAttribute key="default" value="true"/>
+ <stringAttribute key="vmargs" value="-Declipse.cvs.properties=c:\eclipse\repository.properties -Declipse.cvs.testName2=testFileAdditions"/>
+ <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<stringAttribute
key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
- <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
- <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
- <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.team.tests.ccvs.core.AllTests"/>
<stringAttribute key="progargs" value="-os win32 -ws win32 -arch x86 -nl en_CA"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.team.tests.cvs.core"/>
+ <booleanAttribute key="askclear" value="false"/>
+ <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.uitestapplication"/>
+ <stringAttribute key="location0" value="C:\Eclipse\Latest-Eclipse-Drop\eclipse\runtime-test-workspace"/>
+ <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.debug.ui.javaSourceLocator"/>
</launchConfiguration>
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTeamAndCVSTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllCoreTests.java
index 8e08123bb..d2c43208e 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTeamAndCVSTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllCoreTests.java
@@ -9,36 +9,28 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.team.tests.ccvs.core;
-import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.team.tests.core.AllTeamTests;
-public class AllTeamAndCVSTests extends EclipseTest {
+import org.eclipse.team.tests.ccvs.core.cvsresources.AllTestsCVSResources;
- /**
- * Constructor for CVSClientTest.
- */
- public AllTeamAndCVSTests() {
+/**
+ * Tests that don't require the Team UI plugin to be loaded.
+ */
+public class AllCoreTests extends EclipseTest {
+
+ public AllCoreTests() {
super();
}
- /**
- * Constructor for CVSClientTest.
- * @param name
- */
- public AllTeamAndCVSTests(String name) {
+ public AllCoreTests(String name) {
super(name);
}
- /*
- * ORDER IS IMPORTANT: Run compatibility and resource tests before any other!!!
- */
public static Test suite() {
TestSuite suite = new TestSuite();
- suite.addTest(new TestSetup(AllTeamTests.suite()));
- suite.addTest(new CVSTestSetup(AllTests.suite()));
- return suite;
+ suite.addTest(AllTestsCVSResources.suite());
+ return new CVSTestSetup(suite);
}
}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTests.java
index f64c6c6c0..1cb4cd81a 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/AllTests.java
@@ -12,38 +12,25 @@ package org.eclipse.team.tests.ccvs.core;
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.eclipse.team.tests.ccvs.core.cvsresources.AllTestsCVSResources;
import org.eclipse.team.tests.ccvs.core.provider.AllTestsProvider;
import org.eclipse.team.tests.ccvs.core.subscriber.AllTestsTeamSubscriber;
-import org.eclipse.team.tests.ccvs.ui.unit.AllUIUnitTests;
+import org.eclipse.team.tests.ccvs.ui.AllUITests;
public class AllTests extends EclipseTest {
- /**
- * Constructor for CVSClientTest.
- */
public AllTests() {
super();
}
- /**
- * Constructor for CVSClientTest.
- * @param name
- */
public AllTests(String name) {
super(name);
}
- /*
- * ORDER IS IMPORTANT: Run compatibility and resource tests before any other!!!
- */
public static Test suite() {
TestSuite suite = new TestSuite();
- //suite.addTest(org.eclipse.team.tests.ccvs.core.compatible.AllTestsCompatibility.suite());
- suite.addTest(AllTestsCVSResources.suite());
suite.addTest(AllTestsProvider.suite());
suite.addTest(AllTestsTeamSubscriber.suite());
- suite.addTest(AllUIUnitTests.suite());
+ suite.addTest(AllUITests.suite());
return new CVSTestSetup(suite);
}
}
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 ba0bb474b..c9cb05bb3 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
@@ -67,7 +67,7 @@ import org.eclipse.team.internal.ccvs.ui.operations.CheckoutSingleProjectOperati
import org.eclipse.team.internal.ccvs.ui.operations.ITagOperation;
import org.eclipse.team.internal.ccvs.ui.operations.TagInRepositoryOperation;
import org.eclipse.team.internal.ccvs.ui.operations.TagOperation;
-import org.eclipse.team.tests.ccvs.ui.unit.HeadlessCVSRunnableContext;
+import org.eclipse.team.tests.ccvs.ui.HeadlessCVSRunnableContext;
public class EclipseTest extends EclipseWorkspaceTest {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ConcurrencyTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ConcurrencyTests.java
index aa86e9641..19e2aee45 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ConcurrencyTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ConcurrencyTests.java
@@ -33,7 +33,7 @@ import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.ui.operations.FetchMembersOperation;
import org.eclipse.team.tests.ccvs.core.CVSTestSetup;
import org.eclipse.team.tests.ccvs.core.EclipseTest;
-import org.eclipse.team.tests.ccvs.ui.unit.HeadlessCVSRunnableContext;
+import org.eclipse.team.tests.ccvs.ui.HeadlessCVSRunnableContext;
public class ConcurrencyTests extends EclipseTest {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/AllTestsTeamSubscriber.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/AllTestsTeamSubscriber.java
index eaab5ee77..86d9809b1 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/AllTestsTeamSubscriber.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/AllTestsTeamSubscriber.java
@@ -14,6 +14,7 @@ import junit.framework.TestSuite;
import org.eclipse.team.tests.ccvs.core.CVSTestSetup;
import org.eclipse.team.tests.ccvs.core.EclipseTest;
+import org.eclipse.team.tests.ccvs.ui.SynchronizeViewTestAdapter;
public class AllTestsTeamSubscriber extends EclipseTest {
@@ -30,7 +31,7 @@ public class AllTestsTeamSubscriber extends EclipseTest {
suite.addTest(CVSMergeSubscriberTest.suite());
suite.addTest(CVSWorkspaceSubscriberTest.suite());
suite.addTest(SyncSetTests.suite());
- CVSSyncSubscriberTest.setSyncSource(new SyncInfoSource());
+ CVSSyncSubscriberTest.setSyncSource(new SynchronizeViewTestAdapter());
return new CVSTestSetup(suite);
}
}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java
index 0de2ee447..90c532b94 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java
@@ -28,7 +28,7 @@ import org.eclipse.team.internal.ccvs.core.CVSMergeSubscriber;
import org.eclipse.team.internal.ccvs.core.CVSTag;
import org.eclipse.team.internal.ccvs.core.client.Command;
import org.eclipse.team.tests.ccvs.core.CVSTestSetup;
-import org.eclipse.team.ui.sync.SyncInfoSet;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoSet;
/**
@@ -82,12 +82,6 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
action.getRunnable(new SyncInfoSet(infos)).run(DEFAULT_MONITOR);
}
- private CVSMergeSubscriber createMergeSubscriber(IProject project, CVSTag root, CVSTag branch) {
- CVSMergeSubscriber subscriber = new CVSMergeSubscriber(new IResource[] { project }, root, branch);
- TeamSubscriber.getSubscriberManager().registerSubscriber(subscriber);
- return subscriber;
- }
-
/**
* Test the basic incoming changes cases
* - incoming addition
@@ -110,7 +104,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
changeResources(copy, new String[] {"file1.txt"}, true);
// create a merge subscriber
- CVSMergeSubscriber subscriber = createMergeSubscriber(project, root, branch);
+ CVSMergeSubscriber subscriber = getSyncInfoSource().createMergeSubscriber(project, root, branch);
// check the sync states
assertSyncEquals("testIncomingChanges", subscriber, project,
@@ -141,7 +135,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
SyncInfo.OUTGOING | SyncInfo.DELETION,
SyncInfo.OUTGOING | SyncInfo.ADDITION,
SyncInfo.IN_SYNC,
- SyncInfo.OUTGOING | SyncInfo.ADDITION});
+ SyncInfo.OUTGOING | SyncInfo.ADDITION});
}
public void testMergableConflicts() throws IOException, TeamException, CoreException, InvocationTargetException, InterruptedException {
@@ -168,7 +162,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
appendText(project.getFile("file2.txt"), "first line\n", true);
// create a merge subscriber
- CVSMergeSubscriber subscriber = createMergeSubscriber(project, root, branch);
+ CVSMergeSubscriber subscriber = getSyncInfoSource().createMergeSubscriber(project, root, branch);
// check the sync states
assertSyncEquals("testMergableConflicts", subscriber, project,
@@ -221,7 +215,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
appendText(project.getFile("file2.txt"), "conflict line\n", false);
// create a merge subscriber
- CVSMergeSubscriber subscriber = createMergeSubscriber(project, root, branch);
+ CVSMergeSubscriber subscriber = getSyncInfoSource().createMergeSubscriber(project, root, branch);
// check the sync states
assertSyncEquals("testUnmergableConflicts", subscriber, project,
@@ -289,7 +283,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
commitProject(branchedProject);
// create a merge subscriber
- CVSMergeSubscriber subscriber = createMergeSubscriber(project, root, branch);
+ CVSMergeSubscriber subscriber = getSyncInfoSource().createMergeSubscriber(project, root, branch);
// check the sync states
assertSyncEquals("testLocalScrub", subscriber, project,
@@ -325,44 +319,6 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
commitProject(project);
}
- public void testCancel() throws CVSException, CoreException, IOException {
-
- // Create a test project
- IProject project = createProject("testMergableConflicts", new String[] { "file1.txt", "file2.txt", "folder1/", "folder1/a.txt", "folder1/b.txt"});
- setContentsAndEnsureModified(project.getFile("file1.txt"), "some text\nwith several lines\n");
- setContentsAndEnsureModified(project.getFile("file2.txt"), "some text\nwith several lines\n");
- commitProject(project);
-
- // Checkout and branch a copy
- CVSTag root = new CVSTag("root_branch1", CVSTag.VERSION);
- CVSTag branch = new CVSTag("branch1", CVSTag.BRANCH);
- IProject branchedProject = branchProject(project, root, branch);
-
- // modify the branch
- appendText(branchedProject.getFile("file1.txt"), "first line\n", true);
- appendText(branchedProject.getFile("file2.txt"), "last line\n", false);
- commitProject(branchedProject);
-
- // modify HEAD
- appendText(project.getFile("file1.txt"), "last line\n", false);
- commitProject(project);
- // have one local change
- appendText(project.getFile("file2.txt"), "first line\n", true);
-
- // create a merge subscriber
- CVSMergeSubscriber subscriber = createMergeSubscriber(project, root, branch);
-
- // check the sync states
- assertSyncEquals("testMergableConflicts", subscriber, project,
- new String[] { "file1.txt", "file2.txt"},
- true, new int[] {
- SyncInfo.CONFLICTING | SyncInfo.CHANGE,
- SyncInfo.CONFLICTING | SyncInfo.CHANGE});
-
- // cancel the subscriber
- subscriber.cancel();
- }
-
public void testBug37546MergeWantsToDeleteNewDirectories() throws CVSException, CoreException {
IProject project = createProject("testBug37546", new String[]{"file1.txt", "folder1/", "folder1/a.txt", "folder1/b.txt"});
setContentsAndEnsureModified(project.getFile("file1.txt"), "some text\nwith several lines\n");
@@ -382,7 +338,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
addResources(project, new String[] {"folder4/", "folder4/d.txt"}, false);
// create a merge subscriber
- CVSMergeSubscriber subscriber = createMergeSubscriber(project, root, branch);
+ CVSMergeSubscriber subscriber = getSyncInfoSource().createMergeSubscriber(project, root, branch);
assertSyncEquals("testBug37546", subscriber, project,
new String[]{"folder2/", "folder2/c.txt", "folder3/", "folder4/", "folder4/d.txt"}, true,
@@ -411,7 +367,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
commitProject(branchedProject);
// create a merge subscriber
- CVSMergeSubscriber subscriber = createMergeSubscriber(project, root, branch);
+ CVSMergeSubscriber subscriber = getSyncInfoSource().createMergeSubscriber(project, root, branch);
RepositoryProvider.unmap(project);
assertProjectRemoved(subscriber, project);
@@ -445,7 +401,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
appendText(project.getFile("file2.txt"), "conflict line\n", false);
// create a merge subscriber
- CVSMergeSubscriber subscriber = createMergeSubscriber(project, root, branch);
+ CVSMergeSubscriber subscriber = getSyncInfoSource().createMergeSubscriber(project, root, branch);
// check the sync states
assertSyncEquals("testMarkAsMergedConflicts", subscriber, project,
@@ -469,4 +425,12 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest {
SyncInfo.IN_SYNC,
SyncInfo.IN_SYNC});
}
+
+ /* (non-Javadoc)
+ * @see junit.framework.TestCase#tearDown()
+ */
+ protected void tearDown() throws Exception {
+ getSyncInfoSource().tearDown();
+ super.tearDown();
+ }
}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSSyncSubscriberTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSSyncSubscriberTest.java
index dff0077f7..268da4ca2 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSSyncSubscriberTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSSyncSubscriberTest.java
@@ -54,7 +54,7 @@ public abstract class CVSSyncSubscriberTest extends EclipseTest {
}
protected TeamSubscriber getWorkspaceSubscriber() throws TeamException {
- TeamSubscriber subscriber = TeamSubscriber.getSubscriberManager().getSubscriber(CVSProviderPlugin.CVS_WORKSPACE_SUBSCRIBER_ID);
+ TeamSubscriber subscriber = CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber();
if (subscriber == null) fail("The CVS sync subsciber is not registered");
return subscriber;
}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java
index 68a3bc072..3e49f2ff0 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSWorkspaceSubscriberTest.java
@@ -43,7 +43,7 @@ import org.eclipse.team.internal.ccvs.core.ICVSResource;
import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
import org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction;
import org.eclipse.team.tests.ccvs.core.CVSTestSetup;
-import org.eclipse.team.ui.sync.SyncInfoSet;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoSet;
/**
* This class tests the CVSWorkspaceSubscriber
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncInfoSource.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncInfoSource.java
index cf4a2ac64..881d8afbe 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncInfoSource.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncInfoSource.java
@@ -10,6 +10,10 @@
*******************************************************************************/
package org.eclipse.team.tests.ccvs.core.subscriber;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
import junit.framework.AssertionFailedError;
import org.eclipse.core.resources.IProject;
@@ -19,6 +23,8 @@ import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.subscribers.SyncInfo;
import org.eclipse.team.core.subscribers.TeamSubscriber;
+import org.eclipse.team.internal.ccvs.core.CVSMergeSubscriber;
+import org.eclipse.team.internal.ccvs.core.CVSTag;
/**
* This class acts as the source for the sync info used by the subscriber tests.
@@ -28,7 +34,14 @@ import org.eclipse.team.core.subscribers.TeamSubscriber;
public class SyncInfoSource {
protected static IProgressMonitor DEFAULT_MONITOR = new NullProgressMonitor();
-
+ protected List mergeSubscribers = new ArrayList();
+
+ public CVSMergeSubscriber createMergeSubscriber(IProject project, CVSTag root, CVSTag branch) {
+ CVSMergeSubscriber subscriber = new CVSMergeSubscriber(new IResource[] { project }, root, branch);
+ mergeSubscribers.add(subscriber);
+ return subscriber;
+ }
+
/**
* Return the sync info for the given subscriber for the given resource.
*/
@@ -52,5 +65,11 @@ public class SyncInfoSource {
}
}
}
-
+
+ public void tearDown() {
+ for (Iterator it = mergeSubscribers.iterator(); it.hasNext(); ) {
+ CVSMergeSubscriber s = (CVSMergeSubscriber) it.next();
+ s.cancel();
+ }
+ }
}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncSetTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncSetTests.java
index dfcc4360d..7878f29cb 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncSetTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/SyncSetTests.java
@@ -22,7 +22,7 @@ import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.JobChangeAdapter;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.subscribers.SyncInfo;
-import org.eclipse.team.internal.ui.sync.sets.SyncSet;
+import org.eclipse.team.internal.ui.synchronize.sets.SyncSet;
import org.eclipse.team.tests.ccvs.core.CVSTestSetup;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestCommitAction.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestCommitAction.java
index 5660bba30..692a1fd81 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestCommitAction.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestCommitAction.java
@@ -14,7 +14,7 @@ import org.eclipse.core.resources.IResource;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager;
import org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberCommitAction;
-import org.eclipse.team.ui.sync.SyncInfoSet;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoSet;
class TestCommitAction extends SubscriberCommitAction {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMarkAsMergedAction.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMarkAsMergedAction.java
index 6b7af3ef6..deaa3a8ae 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMarkAsMergedAction.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMarkAsMergedAction.java
@@ -12,7 +12,7 @@ package org.eclipse.team.tests.ccvs.core.subscriber;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.team.internal.ccvs.ui.subscriber.SubscriberConfirmMergedAction;
-import org.eclipse.team.ui.sync.SyncInfoSet;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoSet;
class TestMarkAsMergedAction extends SubscriberConfirmMergedAction {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMergeUpdateAction.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMergeUpdateAction.java
index c1661b65b..8e40682d4 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMergeUpdateAction.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMergeUpdateAction.java
@@ -14,7 +14,7 @@ import org.eclipse.core.resources.IResource;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.team.internal.ccvs.ui.subscriber.MergeUpdateAction;
import org.eclipse.team.tests.ccvs.core.EclipseTest;
-import org.eclipse.team.ui.sync.SyncInfoSet;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoSet;
class TestMergeUpdateAction extends MergeUpdateAction {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndCommit.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndCommit.java
index 48481da81..7f4b6f437 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndCommit.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndCommit.java
@@ -13,7 +13,7 @@ package org.eclipse.team.tests.ccvs.core.subscriber;
import org.eclipse.core.resources.IResource;
import org.eclipse.team.internal.ccvs.ui.repo.RepositoryManager;
import org.eclipse.team.internal.ccvs.ui.subscriber.OverrideAndCommitAction;
-import org.eclipse.team.ui.sync.SyncInfoSet;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoSet;
public class TestOverrideAndCommit extends OverrideAndCommitAction {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndUpdate.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndUpdate.java
index 391cc5443..f31d4c36f 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndUpdate.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestOverrideAndUpdate.java
@@ -1,7 +1,7 @@
package org.eclipse.team.tests.ccvs.core.subscriber;
import org.eclipse.team.internal.ccvs.ui.subscriber.OverrideAndUpdateAction;
-import org.eclipse.team.ui.sync.SyncInfoSet;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoSet;
public class TestOverrideAndUpdate extends OverrideAndUpdateAction {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestUpdateAction.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestUpdateAction.java
index 726e38153..1007996ec 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestUpdateAction.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestUpdateAction.java
@@ -13,7 +13,7 @@ package org.eclipse.team.tests.ccvs.core.subscriber;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.team.internal.ccvs.ui.subscriber.WorkspaceUpdateAction;
import org.eclipse.team.tests.ccvs.core.EclipseTest;
-import org.eclipse.team.ui.sync.SyncInfoSet;
+import org.eclipse.team.ui.synchronize.actions.SyncInfoSet;
class TestUpdateAction extends WorkspaceUpdateAction {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/AllUIUnitTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/AllUITests.java
index 71e9d07d7..e584c5601 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/AllUIUnitTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/AllUITests.java
@@ -8,20 +8,20 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.unit;
+package org.eclipse.team.tests.ccvs.ui;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.team.tests.ccvs.core.EclipseTest;
-public class AllUIUnitTests extends EclipseTest {
+public class AllUITests extends EclipseTest {
- public AllUIUnitTests() {
+ public AllUITests() {
super();
}
- public AllUIUnitTests(String name) {
+ public AllUITests(String name) {
super(name);
}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/CVSOperationTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSOperationTest.java
index a87ac7882..08b878252 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/CVSOperationTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSOperationTest.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.unit;
+package org.eclipse.team.tests.ccvs.ui;
import org.eclipse.team.internal.ccvs.core.CVSException;
import org.eclipse.team.internal.ccvs.ui.operations.CVSOperation;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/CheckoutOperationTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CheckoutOperationTests.java
index 48057d8bf..f54f50d75 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/CheckoutOperationTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CheckoutOperationTests.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.unit;
+package org.eclipse.team.tests.ccvs.ui;
import java.io.IOException;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/CompareOperationTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CompareOperationTests.java
index c7c21b58a..8daed8b59 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/CompareOperationTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CompareOperationTests.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.unit;
+package org.eclipse.team.tests.ccvs.ui;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/HeadlessCVSRunnableContext.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/HeadlessCVSRunnableContext.java
index df1d0af68..b36f43c8b 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/HeadlessCVSRunnableContext.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/HeadlessCVSRunnableContext.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.unit;
+package org.eclipse.team.tests.ccvs.ui;
import java.lang.reflect.InvocationTargetException;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/MenuEnablementTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/MenuEnablementTest.java
index 5896454df..945f4fc11 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/unit/MenuEnablementTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/MenuEnablementTest.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.unit;
+package org.eclipse.team.tests.ccvs.ui;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SynchronizeViewTestAdapter.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SynchronizeViewTestAdapter.java
new file mode 100644
index 000000000..2699c42c9
--- /dev/null
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SynchronizeViewTestAdapter.java
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.team.tests.ccvs.ui;
+
+import junit.framework.AssertionFailedError;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.team.core.TeamException;
+import org.eclipse.team.core.subscribers.SyncInfo;
+import org.eclipse.team.core.subscribers.TeamSubscriber;
+import org.eclipse.team.internal.ccvs.core.CVSMergeSubscriber;
+import org.eclipse.team.internal.ccvs.core.CVSTag;
+import org.eclipse.team.internal.ccvs.core.CVSWorkspaceSubscriber;
+import org.eclipse.team.internal.ccvs.ui.subscriber.MergeSynchronizeParticipant;
+import org.eclipse.team.internal.ui.synchronize.sets.SubscriberInput;
+import org.eclipse.team.internal.ui.synchronize.sets.SyncSet;
+import org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource;
+import org.eclipse.team.ui.TeamUI;
+import org.eclipse.team.ui.synchronize.ISynchronizeManager;
+import org.eclipse.team.ui.synchronize.ISynchronizeParticipant;
+import org.eclipse.team.ui.synchronize.ISynchronizeView;
+import org.eclipse.team.ui.synchronize.TeamSubscriberParticipant;
+
+/**
+ * SyncInfoSource that obtains SyncInfo from the SynchronizeView's SyncSet.
+ */
+public class SynchronizeViewTestAdapter extends SyncInfoSource {
+
+ public SynchronizeViewTestAdapter() {
+ TeamUI.getSynchronizeManager().showSynchronizeViewInActivePage(null);
+ }
+
+ public void waitForEventNotification(SubscriberInput input) {
+ // process UI events first, give the main thread a chance
+ // to handle any syncExecs or asyncExecs posted as a result
+ // of the event processing thread.
+ while (Display.getCurrent().readAndDispatch()) {};
+
+ // wait for the event handler to process changes.
+ Job job = input.getEventHandler().getEventHandlerJob();
+ while(job.getState() != Job.NONE) {
+ while (Display.getCurrent().readAndDispatch()) {};
+ try {
+ Thread.sleep(50);
+ } catch (InterruptedException e) {
+ }
+ }
+ }
+
+ public SyncInfo getSyncInfo(TeamSubscriber subscriber, IResource resource) throws TeamException {
+ SubscriberInput input = getInput(subscriber);
+ SyncSet set = input.getWorkingSetSyncSet();
+ SyncInfo info = set.getSyncInfo(resource);
+ if (info == null) {
+ info = subscriber.getSyncInfo(resource, DEFAULT_MONITOR);
+ if ((info != null && info.getKind() != SyncInfo.IN_SYNC)) {
+ throw new AssertionFailedError();
+ }
+ }
+ return info;
+ }
+
+ private SubscriberInput getInput(TeamSubscriber subscriber) {
+ // show the sync view
+ ISynchronizeParticipant[] participants = TeamUI.getSynchronizeManager().getSynchronizeParticipants();
+ for (int i = 0; i < participants.length; i++) {
+ String id = "";
+ if(subscriber instanceof CVSMergeSubscriber) {
+ id = ((CVSMergeSubscriber)subscriber).getId().getQualifier();
+ } else if(subscriber instanceof CVSWorkspaceSubscriber) {
+ id = ((CVSWorkspaceSubscriber)subscriber).getId().getQualifier();
+ }
+ ISynchronizeParticipant participant = participants[i];
+ if(participant.getId().equals(id)) {
+ if(participant instanceof TeamSubscriberParticipant) {
+ SubscriberInput input = ((TeamSubscriberParticipant)participant).getInput();
+ waitForEventNotification(input);
+ return input;
+ }
+ }
+ }
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource#assertProjectRemoved(org.eclipse.team.core.subscribers.TeamSubscriber, org.eclipse.core.resources.IProject)
+ */
+ protected void assertProjectRemoved(TeamSubscriber subscriber, IProject project) throws TeamException {
+ super.assertProjectRemoved(subscriber, project);
+ SubscriberInput input = getInput(subscriber);
+ SyncSet set = input.getFilteredSyncSet();
+ if (set.getOutOfSyncDescendants(project).length != 0) {
+ throw new AssertionFailedError("The sync set still contains resources from the deleted project " + project.getName());
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource#createMergeSubscriber(org.eclipse.core.resources.IProject, org.eclipse.team.internal.ccvs.core.CVSTag, org.eclipse.team.internal.ccvs.core.CVSTag)
+ */
+ public CVSMergeSubscriber createMergeSubscriber(IProject project, CVSTag root, CVSTag branch) {
+ CVSMergeSubscriber mergeSubscriber = super.createMergeSubscriber(project, root, branch);
+ ISynchronizeManager synchronizeManager = TeamUI.getSynchronizeManager();
+ ISynchronizeParticipant participant = new MergeSynchronizeParticipant(mergeSubscriber);
+ synchronizeManager.addSynchronizeParticipants(
+ new ISynchronizeParticipant[] {participant});
+ ISynchronizeView view = synchronizeManager.showSynchronizeViewInActivePage(null);
+ view.display(participant);
+ return mergeSubscriber;
+ }
+
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource#tearDown()
+ */
+ public void tearDown() {
+ ISynchronizeParticipant[] participants = TeamUI.getSynchronizeManager().getSynchronizeParticipants();
+ for (int i = 0; i < participants.length; i++) {
+ ISynchronizeParticipant participant = participants[i];
+ if(participant.getId().equals(CVSMergeSubscriber.QUALIFIED_NAME)) {
+ TeamUI.getSynchronizeManager().removeSynchronizeParticipants(new ISynchronizeParticipant[] {participant});
+ }
+ }
+ }
+}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/AllTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/AllTests.java
index 29c6e3ff6..8b11d77fc 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/AllTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/AllTests.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.benchmark;
+package org.eclipse.team.tests.ccvs.ui.old;
import junit.framework.Test;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/ArgumentParser.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/ArgumentParser.java
index aa6ca6925..f206dbed4 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/ArgumentParser.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/ArgumentParser.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
public class ArgumentParser {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkTestSetup.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/BenchmarkTestSetup.java
index 4dc51844d..0b9ef08ba 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkTestSetup.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/BenchmarkTestSetup.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.benchmark;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.io.File;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSUITestCase.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/CVSUITestCase.java
index 21ecd5074..4a08ec9bf 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSUITestCase.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/CVSUITestCase.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.io.File;
@@ -95,7 +95,7 @@ public class CVSUITestCase extends LoggingTestCase {
Display display = testWindow.getShell().getDisplay();
if (! installedTrap.contains(display)) {
installedTrap.add(display);
- Util.waitForErrorDialog(display, 10000 /*ms*/, new Waiter() {
+ Utils.waitForErrorDialog(display, 10000 /*ms*/, new Waiter() {
public boolean notify(Object object) {
Dialog dialog = (Dialog) object;
printWarning("Encountered error dialog with title: " + dialog.getShell().getText(), null, null);
@@ -129,12 +129,12 @@ public class CVSUITestCase extends LoggingTestCase {
}
// wait for UI to settle
- Util.processEventsUntil(100);
+ Utils.processEventsUntil(100);
}
public void tearDown() throws CVSException {
// wait for UI to settle
- Util.processEventsUntil(100);
+ Utils.processEventsUntil(100);
closeAllTestWindows();
super.tearDown();
}
@@ -217,7 +217,7 @@ public class CVSUITestCase extends LoggingTestCase {
protected void actionShareProject(IProject project) {
final SharingWizard wizard = new SharingWizard();
wizard.init(PlatformUI.getWorkbench(), project);
- Util.waitForWizardToOpen(testWindow.getShell(), wizard, new Waiter() {
+ Utils.waitForWizardToOpen(testWindow.getShell(), wizard, new Waiter() {
public boolean notify(Object object) {
WizardDialog dialog = (WizardDialog) object;
startTask("set sharing, pop up sync viewer");
@@ -282,7 +282,7 @@ public class CVSUITestCase extends LoggingTestCase {
throws InvocationTargetException, InterruptedException {
super.run(monitor);
DiffNode result = getDiffRoot(); // (DiffNode) getCompareResult()
- if (result == null || Util.isEmpty(result)) throw new InterruptedException();
+ if (result == null || Utils.isEmpty(result)) throw new InterruptedException();
}
};
syncView.showSync(input);
@@ -299,7 +299,7 @@ public class CVSUITestCase extends LoggingTestCase {
protected void syncCommitResources(IResource[] resources, CVSSyncCompareInput input, String comment) {
if (input == null) input = syncResources(resources);
IDiffContainer diffRoot = input.getDiffRoot();
- if (Util.isEmpty(diffRoot)) {
+ if (Utils.isEmpty(diffRoot)) {
startTask("Nothing to Commit");
} else {
ITeamNode[] nodes = getTeamNodesForResources(diffRoot, resources);
@@ -319,7 +319,7 @@ public class CVSUITestCase extends LoggingTestCase {
protected void syncUpdateResources(IResource[] resources, CVSSyncCompareInput input) {
if (input == null) input = syncResources(resources);
IDiffContainer diffRoot = input.getDiffRoot();
- if (Util.isEmpty(diffRoot)) {
+ if (Utils.isEmpty(diffRoot)) {
startTask("Nothing to Update");
} else {
ITeamNode[] nodes = getTeamNodesForResources(diffRoot, resources);
@@ -334,8 +334,8 @@ public class CVSUITestCase extends LoggingTestCase {
* Creates and imports project contents from a zip file.
*/
protected IProject createAndImportProject(String prefix, File zipFile) throws Exception {
- IProject project = Util.createUniqueProject(prefix);
- Util.importZip(project, zipFile);
+ IProject project = Utils.createUniqueProject(prefix);
+ Utils.importZip(project, zipFile);
return project;
}
@@ -481,6 +481,6 @@ public class CVSUITestCase extends LoggingTestCase {
*/
private void timestampGranularityHiatus() {
//JUnitTestCase.waitMsec(1500);
- Util.processEventsUntil(1500);
+ Utils.processEventsUntil(1500);
}
}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/CaseEntry.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/CaseEntry.java
index 754c6809b..8b59e3153 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/CaseEntry.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/CaseEntry.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
import org.xml.sax.Attributes;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/CommandTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/CommandTests.java
index ab2378048..7613bf463 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/CommandTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/CommandTests.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.benchmark;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.util.HashMap;
@@ -35,8 +35,6 @@ import org.eclipse.team.internal.ccvs.core.client.Command.KSubstOption;
import org.eclipse.team.tests.ccvs.core.CommandLineCVSClient;
import org.eclipse.team.tests.ccvs.core.EclipseCVSClient;
import org.eclipse.team.tests.ccvs.core.ICVSClient;
-import org.eclipse.team.tests.ccvs.ui.CVSUITestCase;
-import org.eclipse.team.tests.ccvs.ui.Util;
public class CommandTests extends CVSUITestCase {
private String baseName;
@@ -54,10 +52,10 @@ public class CommandTests extends CVSUITestCase {
public void setUp() throws CVSException {
super.setUp();
try {
- baseName = Util.makeUniqueName(null, "thisproject", null);
- referenceProject = Util.createProject(baseName + "-reference");
- eclipseProject = Util.createProject(baseName + "-eclipse");
- uiProject = Util.createProject(baseName);
+ baseName = Utils.makeUniqueName(null, "thisproject", null);
+ referenceProject = Utils.createProject(baseName + "-reference");
+ eclipseProject = Utils.createProject(baseName + "-eclipse");
+ uiProject = Utils.createProject(baseName);
} catch (CoreException e) {
throw new CVSException(e);
}
@@ -140,7 +138,7 @@ public class CommandTests extends CVSUITestCase {
syncCommitResources(new IResource[] { uiProject }, null, "initial");
}
private void prepareContents(IContainer localRoot) throws Exception {
- Util.importZip(localRoot, BenchmarkTestSetup.BIG_ZIP_FILE);
+ Utils.importZip(localRoot, BenchmarkTestSetup.BIG_ZIP_FILE);
}
}.run();
@@ -158,7 +156,7 @@ public class CommandTests extends CVSUITestCase {
protected void setUp(IContainer localRoot) throws Exception {
// delete then recreate the container
IProject project = (IProject) localRoot;
- Util.deleteProject(project);
+ Utils.deleteProject(project);
project.create(null);
project.open(null);
// delete the .project file (avoid .project is in the way error)
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/DelimitedValuesWriter.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/DelimitedValuesWriter.java
index 662043555..2146320e7 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/DelimitedValuesWriter.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/DelimitedValuesWriter.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.io.PrintStream;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/DummyPromptCondition.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/DummyPromptCondition.java
index c20d8d496..88985f7e7 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/DummyPromptCondition.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/DummyPromptCondition.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui;
+package org.eclipse.team.tests.ccvs.ui.old;
import org.eclipse.core.resources.IResource;
import org.eclipse.team.internal.ui.dialogs.IPromptCondition;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/EclipseUITestHarnessApplication.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/EclipseUITestHarnessApplication.java
index f38785951..f944872e4 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/EclipseUITestHarnessApplication.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/EclipseUITestHarnessApplication.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.io.BufferedOutputStream;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/EmptyPerspective.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/EmptyPerspective.java
index c708f3050..91435094b 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/EmptyPerspective.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/EmptyPerspective.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui;
+package org.eclipse.team.tests.ccvs.ui.old;
import org.eclipse.ui.IPageLayout;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/FakeSelectionProvider.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/FakeSelectionProvider.java
index cd7cf4c0f..dbae25df5 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/FakeSelectionProvider.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/FakeSelectionProvider.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui;
+package org.eclipse.team.tests.ccvs.ui.old;
import org.eclipse.jface.viewers.ISelection;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/GroupEntry.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/GroupEntry.java
index 6a59cdfd0..094558c6c 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/GroupEntry.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/GroupEntry.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
import org.xml.sax.Attributes;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ICriteria.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/ICriteria.java
index d9f466885..3b84b7a67 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ICriteria.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/ICriteria.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui;
+package org.eclipse.team.tests.ccvs.ui.old;
/**
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/ILogEntryVisitor.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/ILogEntryVisitor.java
index dce734c51..e9842b2c5 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/ILogEntryVisitor.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/ILogEntryVisitor.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
public interface ILogEntryVisitor {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/LogEntry.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LogEntry.java
index 3650b9300..8e854ecd1 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/LogEntry.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LogEntry.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.io.File;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/LogEntryContainer.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LogEntryContainer.java
index 9692f0848..aca48e393 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/LogEntryContainer.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LogEntryContainer.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.util.ArrayList;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/LogFormatterUIMain.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LogFormatterUIMain.java
index 6f1225802..a7ce8a74c 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/LogFormatterUIMain.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LogFormatterUIMain.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
import org.eclipse.swt.SWT;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/LoggingTestCase.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LoggingTestCase.java
index a1dccc563..b5a389d20 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/LoggingTestCase.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LoggingTestCase.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui;
+package org.eclipse.team.tests.ccvs.ui.old;
import junit.framework.Assert;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/LoggingTestResult.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LoggingTestResult.java
index f4843ba57..dad409d66 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/LoggingTestResult.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LoggingTestResult.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.io.PrintStream;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/LoggingTestRunner.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LoggingTestRunner.java
index 395bf1ccc..9d2e5714b 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/LoggingTestRunner.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/LoggingTestRunner.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui;
+package org.eclipse.team.tests.ccvs.ui.old;
import junit.framework.Test;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/MergeRunsVisitor.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/MergeRunsVisitor.java
index 1a35031aa..22b58dc46 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/MergeRunsVisitor.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/MergeRunsVisitor.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
public class MergeRunsVisitor implements ILogEntryVisitor {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PerformanceTimer.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PerformanceTimer.java
index 89bad073d..ddf7a359e 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PerformanceTimer.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PerformanceTimer.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui;
+package org.eclipse.team.tests.ccvs.ui.old;
public class PerformanceTimer {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintCSVDiffVisitor.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintCSVDiffVisitor.java
index 07ddb8fc5..a05f9c0bb 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintCSVDiffVisitor.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintCSVDiffVisitor.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
public class PrintCSVDiffVisitor extends PrintDiffVisitor {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintCSVSummaryVisitor.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintCSVSummaryVisitor.java
index 1b5dc1461..1bde78ace 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintCSVSummaryVisitor.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintCSVSummaryVisitor.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
public class PrintCSVSummaryVisitor implements ILogEntryVisitor {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintDiffMain.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintDiffMain.java
index 0e06a0395..f4dfd60be 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintDiffMain.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintDiffMain.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.io.BufferedOutputStream;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintDiffVisitor.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintDiffVisitor.java
index ca75be186..ab2d2443e 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintDiffVisitor.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintDiffVisitor.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
public abstract class PrintDiffVisitor implements ILogEntryVisitor {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintSummaryMain.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintSummaryMain.java
index e3bfb4026..fbdf96960 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintSummaryMain.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintSummaryMain.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.io.BufferedOutputStream;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintTextDiffVisitor.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintTextDiffVisitor.java
index 98091b290..4572a8734 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintTextDiffVisitor.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintTextDiffVisitor.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.io.PrintStream;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintTextSummaryVisitor.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintTextSummaryVisitor.java
index a535019c3..a2d91ab06 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/PrintTextSummaryVisitor.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/PrintTextSummaryVisitor.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.io.PrintStream;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/Result.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/Result.java
index b0899f741..0755d5e70 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/Result.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/Result.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
import org.xml.sax.Attributes;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/RootEntry.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/RootEntry.java
index 12496c46a..1d1452eb2 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/RootEntry.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/RootEntry.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
import org.xml.sax.Attributes;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SequenceGenerator.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/SequenceGenerator.java
index d1eb6daef..1b76b1a63 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SequenceGenerator.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/SequenceGenerator.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.util.Random;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/SyncTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/SyncTests.java
index 8a605054d..a74b46604 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/SyncTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/SyncTests.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.benchmark;
+package org.eclipse.team.tests.ccvs.ui.old;
import junit.framework.Test;
@@ -16,9 +16,6 @@ import junit.framework.TestSuite;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.team.internal.ccvs.core.CVSTag;
-import org.eclipse.team.tests.ccvs.ui.CVSUITestCase;
-import org.eclipse.team.tests.ccvs.ui.SequenceGenerator;
-import org.eclipse.team.tests.ccvs.ui.Util;
public class SyncTests extends CVSUITestCase {
private static final int FILE_SIZE_MEAN = 16384;
@@ -72,18 +69,18 @@ public class SyncTests extends CVSUITestCase {
// setup out project then move it out of the way
IProject outProject = setupOutProject();
String moduleName = outProject.getName();
- Util.renameResource(outProject, moduleName + "out");
- outProject = Util.getProject(moduleName + "out");
+ Utils.renameResource(outProject, moduleName + "out");
+ outProject = Utils.getProject(moduleName + "out");
// setup in project
disableLog();
actionCheckoutProjects(new String[] { moduleName }, new CVSTag[] { new CVSTag() });
enableLog();
- IProject inProject = Util.getProject(moduleName);
+ IProject inProject = Utils.getProject(moduleName);
/*** outgoing and incoming changes ***/
startGroup("synchronize " + size + " added file(s)");
- Util.createRandomDeepFiles(gen, outProject, size, FILE_SIZE_MEAN, FILE_SIZE_VARIANCE, PROB_BINARY);
+ Utils.createRandomDeepFiles(gen, outProject, size, FILE_SIZE_MEAN, FILE_SIZE_VARIANCE, PROB_BINARY);
startGroup("as outgoing changes");
syncCommitResources(new IResource[] { outProject }, null, "");
endGroup();
@@ -93,7 +90,7 @@ public class SyncTests extends CVSUITestCase {
endGroup();
startGroup("synchronize " + size + " modified file(s)");
- Util.modifyRandomDeepFiles(gen, outProject, size);
+ Utils.modifyRandomDeepFiles(gen, outProject, size);
startGroup("as outgoing changes");
syncCommitResources(new IResource[] { outProject }, null, "");
endGroup();
@@ -103,7 +100,7 @@ public class SyncTests extends CVSUITestCase {
endGroup();
startGroup("synchronize " + size + " removed file(s)");
- Util.deleteRandomDeepFiles(gen, outProject, size);
+ Utils.deleteRandomDeepFiles(gen, outProject, size);
startGroup("as outgoing changes");
syncCommitResources(new IResource[] { outProject }, null, "");
endGroup();
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/TaskEntry.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/TaskEntry.java
index 71797e175..666b40914 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/TaskEntry.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/TaskEntry.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.util.ArrayList;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/Util.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/Util.java
index b86a962c7..ac0f2bd75 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/logformatter/Util.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/Util.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.logformatter;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.text.DecimalFormat;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/Util.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/Utils.java
index 413596339..fdccc453a 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/Util.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/Utils.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.io.ByteArrayInputStream;
@@ -67,7 +67,7 @@ import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
*
* Note: This class is referenced from the VCM 1.0 performance tests.
*/
-public class Util {
+public class Utils {
/*** RESOURCE MANIPULATION SUPPORT ***/
/**
@@ -188,7 +188,7 @@ public class Util {
* @return the new folder
*/
public static IFolder createUniqueFolder(SequenceGenerator gen, IContainer parent) throws CoreException {
- IFolder folder = parent.getFolder(new Path(Util.makeUniqueName(gen, "folder", null)));
+ IFolder folder = parent.getFolder(new Path(Utils.makeUniqueName(gen, "folder", null)));
folder.create(false /*force*/, true /*local*/, null);
return folder;
}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/Waiter.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/Waiter.java
index 8fb02047a..91dd75672 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/Waiter.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/Waiter.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui;
+package org.eclipse.team.tests.ccvs.ui.old;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/WorkflowTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/WorkflowTests.java
index 530023dbc..e5fee208a 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/WorkflowTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/old/WorkflowTests.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.benchmark;
+package org.eclipse.team.tests.ccvs.ui.old;
import java.io.File;
@@ -20,9 +20,6 @@ import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.team.internal.ccvs.core.CVSTag;
-import org.eclipse.team.tests.ccvs.ui.CVSUITestCase;
-import org.eclipse.team.tests.ccvs.ui.SequenceGenerator;
-import org.eclipse.team.tests.ccvs.ui.Util;
public class WorkflowTests extends CVSUITestCase {
private int FILE_SIZE_MEAN = 16384;
@@ -68,22 +65,22 @@ public class WorkflowTests extends CVSUITestCase {
// move the project out of the way
String moduleName = outProject.getName();
- Util.renameResource(outProject, moduleName + "out");
- outProject = Util.getProject(moduleName + "out");
+ Utils.renameResource(outProject, moduleName + "out");
+ outProject = Utils.getProject(moduleName + "out");
// test initial project checkout
startGroup("test initial project checkout");
actionCheckoutProjects(new String[] { moduleName }, new CVSTag[] { new CVSTag() });
endGroup();
- IProject inProject = Util.getProject(moduleName);
+ IProject inProject = Utils.getProject(moduleName);
// test scenarios
startGroup("test incoming and outgoing change scenarios");
startGroup("adding a new component - localized additions and some changes");
- Util.modifyRandomDeepFiles(gen, outProject, 5);
- Util.touchRandomDeepFiles(gen, outProject, 2);
- IFolder componentRoot = Util.createRandomDeepFolder(gen, outProject);
- Util.createRandomDeepFiles(gen, componentRoot, 12, FILE_SIZE_MEAN, FILE_SIZE_VARIANCE, PROB_BINARY);
+ Utils.modifyRandomDeepFiles(gen, outProject, 5);
+ Utils.touchRandomDeepFiles(gen, outProject, 2);
+ IFolder componentRoot = Utils.createRandomDeepFolder(gen, outProject);
+ Utils.createRandomDeepFiles(gen, componentRoot, 12, FILE_SIZE_MEAN, FILE_SIZE_VARIANCE, PROB_BINARY);
syncCommitResources(new IResource[] { outProject }, null, "");
endGroup();
@@ -92,8 +89,8 @@ public class WorkflowTests extends CVSUITestCase {
endGroup();
startGroup("fixing a bug - localized changes");
- Util.modifyRandomDeepFiles(gen, componentRoot, 2);
- Util.touchRandomDeepFiles(gen, componentRoot, 2);
+ Utils.modifyRandomDeepFiles(gen, componentRoot, 2);
+ Utils.touchRandomDeepFiles(gen, componentRoot, 2);
syncCommitResources(new IResource[] { outProject }, null, "");
endGroup();
@@ -102,9 +99,9 @@ public class WorkflowTests extends CVSUITestCase {
endGroup();
startGroup("moving a package - scattered changes, files moved");
- Util.modifyRandomDeepFiles(gen, outProject, 5); // a few scattered changes
- Util.modifyRandomDeepFiles(gen, componentRoot, 12); // changes to "package" stmt
- Util.renameResource(componentRoot, Util.makeUniqueName(gen, "folder", null));
+ Utils.modifyRandomDeepFiles(gen, outProject, 5); // a few scattered changes
+ Utils.modifyRandomDeepFiles(gen, componentRoot, 12); // changes to "package" stmt
+ Utils.renameResource(componentRoot, Utils.makeUniqueName(gen, "folder", null));
syncCommitResources(new IResource[] { outProject }, null, "");
endGroup();
@@ -113,10 +110,10 @@ public class WorkflowTests extends CVSUITestCase {
endGroup();
startGroup("big refactoring - scattered changes, files renamed and balanced additions/deletions");
- Util.deleteRandomDeepFiles(gen, outProject, 4); // some stuff deleted
- Util.modifyRandomDeepFiles(gen, outProject, 20); // many scattered changes
- Util.renameRandomDeepFiles(gen, outProject, 5); // renamed some stuff
- Util.createRandomDeepFiles(gen, outProject, 4, FILE_SIZE_MEAN, FILE_SIZE_VARIANCE, PROB_BINARY); // some new stuff added
+ Utils.deleteRandomDeepFiles(gen, outProject, 4); // some stuff deleted
+ Utils.modifyRandomDeepFiles(gen, outProject, 20); // many scattered changes
+ Utils.renameRandomDeepFiles(gen, outProject, 5); // renamed some stuff
+ Utils.createRandomDeepFiles(gen, outProject, 4, FILE_SIZE_MEAN, FILE_SIZE_VARIANCE, PROB_BINARY); // some new stuff added
syncCommitResources(new IResource[] { outProject }, null, "");
endGroup();
@@ -137,18 +134,18 @@ public class WorkflowTests extends CVSUITestCase {
endGroup();
startGroup("abandoning some local work, no remote changes");
- Util.deleteRandomDeepFiles(gen, inProject, 4); // some stuff locally deleted
- Util.modifyRandomDeepFiles(gen, inProject, 6); // a few unimportant changes to forget
- Util.createRandomDeepFiles(gen, inProject, 4, FILE_SIZE_MEAN, FILE_SIZE_VARIANCE, PROB_BINARY); // some new work to abandon
+ Utils.deleteRandomDeepFiles(gen, inProject, 4); // some stuff locally deleted
+ Utils.modifyRandomDeepFiles(gen, inProject, 6); // a few unimportant changes to forget
+ Utils.createRandomDeepFiles(gen, inProject, 4, FILE_SIZE_MEAN, FILE_SIZE_VARIANCE, PROB_BINARY); // some new work to abandon
actionReplaceWithRemote(new IResource[] { inProject });
endGroup();
startGroup("no local dirty files, many remote changes");
// e.g. returning from a long vacation
- Util.deleteRandomDeepFiles(gen, outProject, 10); // some components obsoleted
- Util.modifyRandomDeepFiles(gen, outProject, 42); // many changes
- Util.renameRandomDeepFiles(gen, outProject, 8); // evidence of some refactoring
- Util.createRandomDeepFiles(gen, outProject, 10, FILE_SIZE_MEAN, FILE_SIZE_VARIANCE, PROB_BINARY); // a few new components added
+ Utils.deleteRandomDeepFiles(gen, outProject, 10); // some components obsoleted
+ Utils.modifyRandomDeepFiles(gen, outProject, 42); // many changes
+ Utils.renameRandomDeepFiles(gen, outProject, 8); // evidence of some refactoring
+ Utils.createRandomDeepFiles(gen, outProject, 10, FILE_SIZE_MEAN, FILE_SIZE_VARIANCE, PROB_BINARY); // a few new components added
disableLog();
syncCommitResources(new IResource[] { outProject }, null, "");
enableLog();
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/sync/AllTestsSynchronizeView.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/sync/AllTestsSynchronizeView.java
deleted file mode 100644
index e292bdc34..000000000
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/sync/AllTestsSynchronizeView.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.sync;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.team.internal.ui.sync.views.SynchronizeView;
-import org.eclipse.team.tests.ccvs.core.EclipseTest;
-import org.eclipse.team.tests.ccvs.core.subscriber.CVSMergeSubscriberTest;
-import org.eclipse.team.tests.ccvs.core.subscriber.CVSSyncSubscriberTest;
-import org.eclipse.team.tests.ccvs.core.subscriber.CVSWorkspaceSubscriberTest;
-import org.eclipse.team.tests.ccvs.ui.CVSUITestCase;
-
-public class AllTestsSynchronizeView extends EclipseTest {
-
- private SynchronizeView syncView;
-
- public AllTestsSynchronizeView() {
- super();
- }
-
- public AllTestsSynchronizeView(String name) {
- super(name);
- }
-
- public static Test suite() {
- TestSuite suite = new TestSuite();
-
- // sync info tests re-using the subscribers tests but checking state based on the
- // sync set data structures in the synchronize view.
- suite.addTest(CVSMergeSubscriberTest.suite());
- suite.addTest(CVSWorkspaceSubscriberTest.suite());
- CVSSyncSubscriberTest.setSyncSource(new SyncInfoFromSyncSet());
-
- // place other ui tests here
-
- return new CVSUITestCase(suite);
- }
-}
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/sync/SyncInfoFromSyncSet.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/sync/SyncInfoFromSyncSet.java
deleted file mode 100644
index f97682496..000000000
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/sync/SyncInfoFromSyncSet.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2003 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.team.tests.ccvs.ui.sync;
-
-import junit.framework.AssertionFailedError;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.team.core.TeamException;
-import org.eclipse.team.core.subscribers.SyncInfo;
-import org.eclipse.team.core.subscribers.TeamSubscriber;
-import org.eclipse.team.internal.ui.sync.sets.SubscriberInput;
-import org.eclipse.team.internal.ui.sync.sets.SyncSet;
-import org.eclipse.team.internal.ui.sync.views.SynchronizeView;
-import org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource;
-
-/**
- * SyncInfoSource that obtains SyncInfo from the SynchronizeView's SyncSet.
- */
-public class SyncInfoFromSyncSet extends SyncInfoSource {
-
- public SyncInfoFromSyncSet() {
- }
-
- public void waitForEventNotification(SubscriberInput input) {
- // process UI events first, give the main thread a chance
- // to handle any syncExecs or asyncExecs posted as a result
- // of the event processing thread.
- while (Display.getCurrent().readAndDispatch()) {};
-
- // wait for the event handler to process changes.
- Job job = input.getEventHandler().getEventHandlerJob();
- while(job.getState() != Job.NONE) {
- while (Display.getCurrent().readAndDispatch()) {};
- try {
- Thread.sleep(50);
- } catch (InterruptedException e) {
- }
- }
- }
-
- public SyncInfo getSyncInfo(TeamSubscriber subscriber, IResource resource) throws TeamException {
- SubscriberInput input = getInput(subscriber);
- SyncSet set = input.getWorkingSetSyncSet();
- SyncInfo info = set.getSyncInfo(resource);
- if (info == null) {
- info = subscriber.getSyncInfo(resource, DEFAULT_MONITOR);
- if ((info != null && info.getKind() != SyncInfo.IN_SYNC)) {
- throw new AssertionFailedError();
- }
- }
- return info;
- }
-
- private SubscriberInput getInput(TeamSubscriber subscriber) throws AssertionFailedError {
- // show the sync view
- SynchronizeView syncView = (SynchronizeView)SynchronizeView.showInActivePage(null, true);
- SubscriberInput input = syncView.getInput();
- if (subscriber != input.getSubscriber()) {
- // ensure that the CVS subscriber is active
- syncView.activateSubscriber(subscriber);
- input = syncView.getInput();
- }
- if (subscriber != input.getSubscriber()) {
- throw new AssertionFailedError();
- }
- waitForEventNotification(input);
- return input;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.team.tests.ccvs.core.subscriber.SyncInfoSource#assertProjectRemoved(org.eclipse.team.core.subscribers.TeamSubscriber, org.eclipse.core.resources.IProject)
- */
- protected void assertProjectRemoved(TeamSubscriber subscriber, IProject project) throws TeamException {
- super.assertProjectRemoved(subscriber, project);
- SubscriberInput input = getInput(subscriber);
- SyncSet set = input.getFilteredSyncSet();
- if (set.getOutOfSyncDescendants(project).length != 0) {
- throw new AssertionFailedError("The sync set still contains resources from the deleted project " + project.getName());
- }
- }
-}
diff --git a/tests/org.eclipse.team.tests.cvs.core/test.xml b/tests/org.eclipse.team.tests.cvs.core/test.xml
index a1475450e..21fbf7854 100644
--- a/tests/org.eclipse.team.tests.cvs.core/test.xml
+++ b/tests/org.eclipse.team.tests.cvs.core/test.xml
@@ -30,8 +30,17 @@
<property name="vmargs" value="-Declipse.cvs.properties=${team-home}/repository.properties"/>
<property name="data-dir" value="${location}"/>
<property name="plugin-name" value="org.eclipse.team.tests.cvs.core"/>
+ <property name="classname" value="org.eclipse.team.tests.ccvs.core.AllCoreTests"/>
+ </ant>
+
+ <!-- Session Test ** CVS Provider ** -->
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="vmargs" value="-Declipse.cvs.properties=${team-home}/repository.properties"/>
+ <property name="data-dir" value="${location}"/>
+ <property name="plugin-name" value="org.eclipse.team.tests.cvs.core"/>
<property name="classname" value="org.eclipse.team.tests.ccvs.core.AllTests"/>
</ant>
+
</target>

Back to the top