Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2018-11-06 12:55:53 -0500
committerAlexander Kurtakov2018-11-06 13:17:13 -0500
commit5be32bf6f206eabd2822723ca0c36fe12b9bcd91 (patch)
tree88221874baf40d31b8139d59105c304e438b0da2
parentbfeba8f3c940d1df631f0a688da55952d0437ac5 (diff)
downloadeclipse.platform.team-5be32bf6f206eabd2822723ca0c36fe12b9bcd91.tar.gz
eclipse.platform.team-5be32bf6f206eabd2822723ca0c36fe12b9bcd91.tar.xz
eclipse.platform.team-5be32bf6f206eabd2822723ca0c36fe12b9bcd91.zip
Change-Id: Ic55777c90a3e0fd9e2fd0265cd06e05dee5e75f8 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java8
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ResourceDeltaTest.java4
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/WatchEditTest.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSMergeSubscriberTest.java6
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSSyncSubscriberTest.java8
-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.java4
-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/ui/CheckoutOperationTests.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ModelParticipantSyncInfoSource.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SubscriberParticipantSyncInfoSource.java2
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkUtils.java15
12 files changed, 28 insertions, 29 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java
index 28c6a93af..395fbc03e 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/CVSProviderTest.java
@@ -77,7 +77,7 @@ public class CVSProviderTest extends EclipseTest {
return suite(CVSProviderTest.class);
}
- public void testAdd() throws TeamException, CoreException {
+ public void testAdd() {
// Test add with cvsignores
/*
@@ -310,7 +310,7 @@ public class CVSProviderTest extends EclipseTest {
assertEquals(project, copy);
}
- public void testReadOnly() throws TeamException, CoreException, IOException {
+ public void testReadOnly() {
// IProject project = createProject("testReadOnly", new String[] { "changed.txt", "deleted.txt", "folder1/", "folder1/a.txt" });
// Need to check the project out as read-only
}
@@ -365,13 +365,13 @@ public class CVSProviderTest extends EclipseTest {
assertEqualsFileContents(file, "The \r\n quick brown \r\n fox \r\r\r\n jumped \r\n\r\n over \r\n the \r\n lazy dog.\r\n");
}
- public void testKeywordSubstitution() throws TeamException, CoreException, IOException {
+ public void testKeywordSubstitution() throws TeamException, CoreException {
testKeywordSubstitution(Command.KSUBST_BINARY); // -kb
testKeywordSubstitution(Command.KSUBST_TEXT); // -ko
testKeywordSubstitution(Command.KSUBST_TEXT_EXPAND); // -kkv
}
- private void testKeywordSubstitution(KSubstOption ksubst) throws TeamException, CoreException, IOException {
+ private void testKeywordSubstitution(KSubstOption ksubst) throws TeamException, CoreException {
// setup some known file types
Team.setAllTypes( new String[] {"xbin", "xtxt"}, new int[] {Team.BINARY, Team.TEXT});
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ResourceDeltaTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ResourceDeltaTest.java
index 9ec795ac1..30453f9fd 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ResourceDeltaTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ResourceDeltaTest.java
@@ -77,11 +77,11 @@ public class ResourceDeltaTest extends EclipseTest {
});
}
- public void assertAdditionMarkerFor(IResource resource, boolean exists) throws CoreException {
+ public void assertAdditionMarkerFor(IResource resource, boolean exists) {
// Addition markers are no longer used
}
- public void assertDeletionMarkerFor(IResource resource, boolean exists) throws CoreException {
+ public void assertDeletionMarkerFor(IResource resource, boolean exists) {
}
public void testOrphanedSubtree() throws TeamException, CoreException {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/WatchEditTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/WatchEditTest.java
index 53c785e2f..7e448d3d1 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/WatchEditTest.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/WatchEditTest.java
@@ -81,7 +81,7 @@ public class WatchEditTest extends EclipseTest {
assertEquals(project, copy);
}
- public void testCommit() throws CoreException, TeamException, IOException {
+ public void testCommit() throws CoreException, TeamException {
// Create a project
IProject project = createProject("testCommit", new String[] { "changed.txt", "deleted.txt", "folder1/", "folder1/a.txt" });
// XXX project will not be read-only at this point because "cvs add" followed by a "cvs commit" doesn't set the resource "read-only"
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"});
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 5c87abd1b..572a003f7 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
@@ -117,7 +117,7 @@ public abstract class CVSSyncSubscriberTest extends EclipseTest {
/*
* Assert that the named resources have no local resource or sync info
*/
- protected void assertDeleted(String message, IContainer root, String[] resourcePaths) throws CoreException, TeamException {
+ protected void assertDeleted(String message, IContainer root, String[] resourcePaths) {
IResource[] resources = getResources(root, resourcePaths);
for (int i=0;i<resources.length;i++) {
try {
@@ -178,12 +178,12 @@ public abstract class CVSSyncSubscriberTest extends EclipseTest {
return (IResource[]) affected.toArray(new IResource[affected.size()]);
}
- protected ISubscriberChangeEvent[] deregisterSubscriberListener(Subscriber subscriber) throws TeamException {
+ protected ISubscriberChangeEvent[] deregisterSubscriberListener(Subscriber subscriber) {
subscriber.removeListener(listener);
return (ISubscriberChangeEvent[]) accumulatedTeamDeltas.toArray(new SubscriberChangeEvent[accumulatedTeamDeltas.size()]);
}
- protected ISubscriberChangeListener registerSubscriberListener(Subscriber subscriber) throws TeamException {
+ protected ISubscriberChangeListener registerSubscriberListener(Subscriber subscriber) {
listener = new ISubscriberChangeListener() {
public void subscriberResourceChanged(ISubscriberChangeEvent[] deltas) {
accumulatedTeamDeltas.addAll(Arrays.asList(deltas));
@@ -194,7 +194,7 @@ public abstract class CVSSyncSubscriberTest extends EclipseTest {
return listener;
}
- protected void assertProjectRemoved(Subscriber subscriber, IProject project) throws TeamException {
+ protected void assertProjectRemoved(Subscriber subscriber, IProject project) {
getSyncInfoSource().assertProjectRemoved(subscriber, project);
}
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 fdb33defd..41cc42c21 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
@@ -169,7 +169,7 @@ public class CVSWorkspaceSubscriberTest extends CVSSyncSubscriberTest {
protected void addResources(IResource[] resources) throws TeamException, CVSException, CoreException {
// first, get affected children
IResource[] affectedChildren = collect(resources, new ResourceCondition() {
- public boolean matches(IResource resource) throws CoreException, TeamException {
+ public boolean matches(IResource resource) throws TeamException {
ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource);
return (!cvsResource.isManaged() && !cvsResource.isIgnored());
}
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 6a9344527..2487ac2ef 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
@@ -106,7 +106,7 @@ public class SyncInfoSource {
subscriber.refresh(resources, IResource.DEPTH_INFINITE, DEFAULT_MONITOR);
}
- protected void assertProjectRemoved(Subscriber subscriber, IProject project) throws TeamException {
+ protected void assertProjectRemoved(Subscriber subscriber, IProject project) {
IResource[] roots = subscriber.roots();
for (int i = 0; i < roots.length; i++) {
IResource resource = roots[i];
@@ -221,7 +221,7 @@ public class SyncInfoSource {
mergeResources(subscriber, infos, allowOverwrite);
}
- private void mergeResources(Subscriber subscriber, SyncInfo[] infos, boolean allowOverwrite) throws TeamException, InvocationTargetException, InterruptedException {
+ private void mergeResources(Subscriber subscriber, SyncInfo[] infos, boolean allowOverwrite) throws InvocationTargetException, InterruptedException {
TestMergeUpdateOperation action = new TestMergeUpdateOperation(getElements(infos), allowOverwrite);
action.run(DEFAULT_MONITOR);
}
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 89146b2f3..26d1a09d5 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
@@ -52,7 +52,7 @@ public class SyncSetTests extends CVSSyncSubscriberTest {
protected int calculateKind() throws TeamException {
return 0;
}
- public TestSyncInfo() throws TeamException {
+ public TestSyncInfo() {
super(ResourcesPlugin.getWorkspace().getRoot(), null, null, new IResourceVariantComparator() {
public boolean compare(IResource local, IResourceVariant remote) {
return false;
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CheckoutOperationTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CheckoutOperationTests.java
index 6643cd60b..9e6470e4b 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CheckoutOperationTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CheckoutOperationTests.java
@@ -67,7 +67,7 @@ public class CheckoutOperationTests extends CVSOperationTest {
assertEquals(project, movedProject);
}
- public void testNonRootCheckout() throws CoreException, TeamException, IOException {
+ public void testNonRootCheckout() throws CoreException, TeamException {
IProject project = createProject("testNonRootCheckout", new String[] { "changed.txt", "deleted.txt", "folder1/", "folder1/a.txt" });
// checkout the non-root folder as a project to the default location
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ModelParticipantSyncInfoSource.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ModelParticipantSyncInfoSource.java
index 1d10679bf..c3aac32dc 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ModelParticipantSyncInfoSource.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ModelParticipantSyncInfoSource.java
@@ -338,7 +338,7 @@ public class ModelParticipantSyncInfoSource extends ParticipantSyncInfoSource {
}
}
- protected void assertProjectRemoved(Subscriber subscriber, IProject project) throws TeamException {
+ protected void assertProjectRemoved(Subscriber subscriber, IProject project) {
super.assertProjectRemoved(subscriber, project);
waitForCollectionToFinish(subscriber);
ModelSynchronizeParticipant participant = getParticipant(subscriber);
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SubscriberParticipantSyncInfoSource.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SubscriberParticipantSyncInfoSource.java
index 1a3e04340..64bb7dbf1 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SubscriberParticipantSyncInfoSource.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SubscriberParticipantSyncInfoSource.java
@@ -164,7 +164,7 @@ public class SubscriberParticipantSyncInfoSource extends ParticipantSyncInfoSour
/* (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(Subscriber subscriber, IProject project) throws TeamException {
+ protected void assertProjectRemoved(Subscriber subscriber, IProject project) {
super.assertProjectRemoved(subscriber, project);
SyncInfoTree set = getCollector(subscriber).getSyncInfoSet();
if (set.hasMembers(project)) {
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkUtils.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkUtils.java
index db51b7d09..d439a4b70 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkUtils.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/BenchmarkUtils.java
@@ -65,7 +65,7 @@ public class BenchmarkUtils {
* @param name the project name
* @return the project handle
*/
- public static IProject getProject(String name) throws CoreException {
+ public static IProject getProject(String name) {
return ResourcesPlugin.getWorkspace().getRoot().getProject(name);
}
@@ -258,8 +258,7 @@ public class BenchmarkUtils {
* @param extension the file extension not including the period, null if none
* @return the new name
*/
- public static String makeUniqueName(SequenceGenerator gen, String prefix, String extension)
- throws CoreException {
+ public static String makeUniqueName(SequenceGenerator gen, String prefix, String extension) {
StringBuffer name = new StringBuffer(prefix);
name.append('-');
if (gen == null) {
@@ -495,7 +494,7 @@ public class BenchmarkUtils {
/**
* Returns true iff file is a valid IFile (that should not be ignored).
*/
- public static boolean isValidFile(IResource file) throws CoreException {
+ public static boolean isValidFile(IResource file) {
String name = file.getName();
return file instanceof IFile
&& ! file.isPhantom()
@@ -507,7 +506,7 @@ public class BenchmarkUtils {
/**
* Returns true iff folder is a valid IFolder (that should not be ignored).
*/
- public static boolean isValidFolder(IResource folder) throws CoreException {
+ public static boolean isValidFolder(IResource folder) {
String name = folder.getName();
return folder instanceof IFolder
&& ! folder.isPhantom()
@@ -518,14 +517,14 @@ public class BenchmarkUtils {
/**
* Returns true iff container is a valid IFolder or IProject (that should not be ignored).
*/
- public static boolean isValidContainer(IResource container) throws CoreException {
+ public static boolean isValidContainer(IResource container) {
return container instanceof IProject || isValidFolder(container);
}
/**
* Returns true iff resource is a valid IFile, IFolder or IProject (that should not be ignored).
*/
- public static boolean isValidResource(IResource resource) throws CoreException {
+ public static boolean isValidResource(IResource resource) {
return isValidFile(resource) || isValidContainer(resource);
}
@@ -535,7 +534,7 @@ public class BenchmarkUtils {
* pseudo-random numbers, we will always pick the same sequence of files and
* folders each time we repeat the test.
*/
- public static IResource[] filterResources(IResource[] resources) throws CoreException {
+ public static IResource[] filterResources(IResource[] resources) {
List<IResource> list = new ArrayList<>(resources.length);
for (int i = 0; i < resources.length; ++i) {
if (isValidResource(resources[i])) list.add(resources[i]);

Back to the top