diff options
Diffstat (limited to 'tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java')
-rw-r--r-- | tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
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 a5db9624d..c00d45005 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 @@ -470,7 +470,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest { SyncInfo.OUTGOING | SyncInfo.DELETION}); } - public void testDisconnectingProject() throws CoreException, IOException, TeamException, InterruptedException { + public void testDisconnectingProject() throws CoreException, IOException, TeamException { // Create a test project (which commits it as well) // Create a test project IProject project = createProject("testDisconnect", new String[] { "file1.txt", "file2.txt", "folder1/", "folder1/a.txt", "folder1/b.txt"}); @@ -595,7 +595,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest { }); } - public void testFileAddedToBranch() throws InvocationTargetException, InterruptedException, CoreException, IOException { + public void testFileAddedToBranch() throws InvocationTargetException, InterruptedException, CoreException { // Create a project IProject project = createProject(new String[] { "delete.txt", "file1.txt", "file2.txt", "folder1/", "folder1/a.txt", "folder1/b.txt"}); @@ -712,7 +712,7 @@ public class CVSMergeSubscriberTest extends CVSSyncSubscriberTest { } } - public void testMergeNewFileToBranch() throws InvocationTargetException, InterruptedException, CoreException, IOException { + public void testMergeNewFileToBranch() throws InvocationTargetException, InterruptedException, CoreException { // Create a project IProject project = createProject(new String[] {"file1.txt"}); |