diff options
author | Lars Vogel | 2019-06-17 12:46:20 +0000 |
---|---|---|
committer | Lars Vogel | 2019-06-17 12:56:49 +0000 |
commit | 902dafac600b4ca9615c4ab5b934fd61cfa54aa7 (patch) | |
tree | b00c4afb9ea65cfd6b76f4ff327e504308d15d4f | |
parent | 86615da70411c3c9b6906bdc348e11740ec2d0f2 (diff) | |
download | eclipse.platform.team-902dafac600b4ca9615c4ab5b934fd61cfa54aa7.tar.gz eclipse.platform.team-902dafac600b4ca9615c4ab5b934fd61cfa54aa7.tar.xz eclipse.platform.team-902dafac600b4ca9615c4ab5b934fd61cfa54aa7.zip |
Adds missing annotations to org.eclipse.team.tests.cvs.coreI20190617-1800
Change-Id: Ib07ba9e4c77f5240b05110b5252b648cd4c58d07
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
30 files changed, 73 insertions, 0 deletions
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/BasicTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/BasicTest.java index e60c18e63..fca8bad2c 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/BasicTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/BasicTest.java @@ -42,6 +42,7 @@ public class BasicTest extends JUnitTestCase { return new CompatibleTestSetup(suite); //return new CompatibleTestSetup(new BasicTest("testReadOnly")); } + @Override public void setUp() throws Exception { env1.setUp(); env2.setUp(); @@ -51,6 +52,7 @@ public class BasicTest extends JUnitTestCase { env2.deleteFile("proj2"); } + @Override public void tearDown() throws Exception { env1.tearDown(); env2.tearDown(); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/CompatibleTestSetup.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/CompatibleTestSetup.java index 9fcb550a9..08f5755c1 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/CompatibleTestSetup.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/CompatibleTestSetup.java @@ -43,6 +43,7 @@ public class CompatibleTestSetup extends CVSTestSetup { /** * For compatibility testing, we need to set up two repositories */ + @Override public void setUp() throws CVSException { CVSProviderPlugin.getPlugin().setPruneEmptyDirectories(false); CVSProviderPlugin.getPlugin().setFetchAbsentDirectories(false); @@ -54,6 +55,7 @@ public class CompatibleTestSetup extends CVSTestSetup { eclipseClientRepository = setupRepository(ECLIPSE_REPOSITORY_LOCATION); } + @Override public void tearDown() throws CVSException { CVSProviderPlugin.getPlugin().setPruneEmptyDirectories(true); CVSProviderPlugin.getPlugin().setFetchAbsentDirectories(true); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/ConflictTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/ConflictTest.java index 6eb141b2a..1751719b2 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/ConflictTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/ConflictTest.java @@ -30,6 +30,7 @@ public class ConflictTest extends JUnitTestCase { env2 = new SameResultEnv(arg + "checkout2"); } + @Override public void setUp() throws Exception { env1.setUp(); env2.setUp(); @@ -39,6 +40,7 @@ public class ConflictTest extends JUnitTestCase { env2.deleteFile("proj2"); } + @Override public void tearDown() throws Exception { env1.tearDown(); env2.tearDown(); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/ModuleTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/ModuleTest.java index 0e634d261..bf461c445 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/ModuleTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/compatible/ModuleTest.java @@ -30,6 +30,7 @@ public class ModuleTest extends JUnitTestCase { run(ModuleTest.class); } + @Override public void setUp() throws Exception { env1.setUp(); env2.setUp(); @@ -41,6 +42,7 @@ public class ModuleTest extends JUnitTestCase { env2.deleteFile("proj2"); } + @Override public void tearDown() throws Exception { env1.tearDown(); env2.tearDown(); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/BatchedTestSetup.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/BatchedTestSetup.java index 46bf5694a..6bdc8e0f1 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/BatchedTestSetup.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/BatchedTestSetup.java @@ -29,10 +29,12 @@ public class BatchedTestSetup extends TestSetup { super(test); } + @Override public void setUp() throws CVSException { rule = EclipseSynchronizer.getInstance().beginBatching(ResourcesPlugin.getWorkspace().getRoot(), null); } + @Override public void tearDown() throws CVSException { EclipseSynchronizer.getInstance().endBatching(rule, null); } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/EclipseFolderTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/EclipseFolderTest.java index a35827b6a..303c3ade2 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/EclipseFolderTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/cvsresources/EclipseFolderTest.java @@ -48,6 +48,7 @@ public class EclipseFolderTest extends EclipseTest { protected void assertChildrenHaveSync(IContainer root, final boolean hasSync) throws CoreException, CVSException { root.accept(new IResourceVisitor() { + @Override public boolean visit(IResource resource) throws CoreException { try { ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/jsch/PreferenceInitializerTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/jsch/PreferenceInitializerTest.java index 731eeb107..05982717e 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/jsch/PreferenceInitializerTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/jsch/PreferenceInitializerTest.java @@ -33,6 +33,7 @@ public class PreferenceInitializerTest extends EclipseTest { private String KEY_SSH2HOME_value = null; private String KEY_PRIVATEKEY_value = null; + @Override protected void setUp() throws Exception { if (!Platform.getOS().equals(Platform.OS_WIN32)) return; @@ -49,6 +50,7 @@ public class PreferenceInitializerTest extends EclipseTest { KEY_PRIVATEKEY_value = preferences.get(IConstants.KEY_PRIVATEKEY, null); } + @Override protected void tearDown() throws Exception { if (!Platform.getOS().equals(Platform.OS_WIN32)) return; diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/model/ModelNature.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/model/ModelNature.java index 2d5e320c8..7ea0b16ab 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/model/ModelNature.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/model/ModelNature.java @@ -25,18 +25,22 @@ public class ModelNature implements IProjectNature { private IProject project; + @Override public void configure() { // Nothing to do } + @Override public void deconfigure() { // Nothing to do } + @Override public IProject getProject() { return project; } + @Override public void setProject(IProject project) { this.project = project; } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/model/ModelObject.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/model/ModelObject.java index 69b53caba..cf34346fc 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/model/ModelObject.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/model/ModelObject.java @@ -57,6 +57,7 @@ public abstract class ModelObject extends PlatformObject { return ModelObject.create(getResource().getParent()); } + @Override public boolean equals(Object obj) { if (obj instanceof ModelObject) { ModelObject mr = (ModelObject) obj; @@ -65,6 +66,7 @@ public abstract class ModelObject extends PlatformObject { return super.equals(obj); } + @Override public int hashCode() { return getResource().hashCode(); } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/model/mapping/CustomModelProvider.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/model/mapping/CustomModelProvider.java index c44d2dbfc..562396bef 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/model/mapping/CustomModelProvider.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/model/mapping/CustomModelProvider.java @@ -35,10 +35,12 @@ public class CustomModelProvider extends super(); } + @Override public IStatus validateChange(IResourceDelta delta, IProgressMonitor monitor) { return super.validateChange(delta, monitor); } + @Override public ResourceMapping[] getMappings(IResource resource, ResourceMappingContext context, IProgressMonitor monitor) throws CoreException { diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/model/mapping/ModelResourceMapping.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/model/mapping/ModelResourceMapping.java index 28fa7e462..6e02f1c6c 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/model/mapping/ModelResourceMapping.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/model/mapping/ModelResourceMapping.java @@ -40,6 +40,7 @@ public class ModelResourceMapping extends ResourceMapping { return null; } + @Override public ResourceTraversal[] getTraversals(ResourceMappingContext context, IProgressMonitor monitor) throws CoreException { return new ResourceTraversal[] { new ResourceTraversal( @@ -52,18 +53,22 @@ public class ModelResourceMapping extends ResourceMapping { this.object = object; } + @Override public Object getModelObject() { return object; } + @Override public String getModelProviderId() { return CustomModelProvider.ID; } + @Override public IProject[] getProjects() { return new IProject[] { (IProject) object.getProject().getResource() }; } + @Override public boolean contains(ResourceMapping mapping) { if (mapping instanceof ModelResourceMapping) { ModelObject object = (ModelObject) mapping.getModelObject(); 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 019382a06..3191949c0 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 @@ -56,18 +56,22 @@ public class ConcurrencyTests extends EclipseTest { final List<Object> result = new ArrayList<>(); final boolean[] done = new boolean[] { false }; IElementCollector collector = new IElementCollector() { + @Override public void add(Object element, IProgressMonitor monitor) { result.add(element); } + @Override public void add(Object[] elements, IProgressMonitor monitor) { result.addAll(Arrays.asList(elements)); } + @Override public void done() { done[0] = true; } }; FetchMembersOperation operation = new FetchMembersOperation(null, folder, collector) { + @Override public void done(IJobChangeEvent event) { done[0] = true; super.done(event); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ImportTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ImportTest.java index 1c1a3773f..06f29ed63 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ImportTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ImportTest.java @@ -86,6 +86,7 @@ public class ImportTest extends EclipseTest { // Assert that the two projects have equal contents ignoreing the project name // and the .vcm_meta file + @Override protected void assertEquals(IProject container1, IProject container2) throws CoreException { List<IResource> members1 = new ArrayList<>(); members1.addAll(Arrays.asList(container1.members())); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java index 9527a9532..80cfcf3c1 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/provider/ModuleTest.java @@ -71,6 +71,7 @@ public class ModuleTest extends EclipseTest { private static RemoteModule[] remoteModules; + @Override public void setUp() throws TeamException, CoreException, IOException { if (isSetUp) return; 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 9af4d0526..c4a03dcff 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 @@ -68,9 +68,11 @@ public class ResourceDeltaTest extends EclipseTest { assertTrue("Folder " + cvsFolder.getName() + " should not be managed", ! cvsFolder.isManaged()); assertTrue("Folder " + cvsFolder.getName() + " should not be a cvs folder", ! cvsFolder.isCVSFolder()); cvsFolder.acceptChildren(new ICVSResourceVisitor() { + @Override public void visitFile(ICVSFile file) throws CVSException { assertNotManaged(file); } + @Override public void visitFolder(ICVSFolder folder) throws CVSException { assertNotManaged(folder, false); } @@ -256,6 +258,7 @@ public class ResourceDeltaTest extends EclipseTest { project.create(null); project.open(null); project.accept(new IResourceProxyVisitor() { + @Override public boolean visit(IResourceProxy proxy) throws CoreException { if(proxy.getName().equals("CVS")) { fail("all folders should be marked as team private. This one was not:" + proxy.requestResource().getFullPath()); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSChangeSetTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSChangeSetTests.java index 7d1c58382..eb7b5c8fe 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSChangeSetTests.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CVSChangeSetTests.java @@ -181,21 +181,29 @@ public class CVSChangeSetTests extends CVSSyncSubscriberTest { */ private ISynchronizeModelElement getModelRoot(Subscriber workspaceSubscriber) throws CoreException { IProgressMonitor eventLoopProgressMonitor = new IProgressMonitor() { + @Override public void beginTask(String name, int totalWork) { } + @Override public void done() { } + @Override public void internalWorked(double work) { } + @Override public boolean isCanceled() { return false; } + @Override public void setCanceled(boolean value) { } + @Override public void setTaskName(String name) { } + @Override public void subTask(String name) { } + @Override public void worked(int work) { while (Display.getCurrent().readAndDispatch()) {} } 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 0facedf0b..db02c4424 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 @@ -141,6 +141,7 @@ public abstract class CVSSyncSubscriberTest extends EclipseTest { for (IResource resource : resources) { if (resource.exists() || resource.isPhantom()) { resource.accept(new IResourceVisitor() { + @Override public boolean visit(IResource r) throws CoreException { try { if (condition.matches(r)) { @@ -183,6 +184,7 @@ public abstract class CVSSyncSubscriberTest extends EclipseTest { protected ISubscriberChangeListener registerSubscriberListener(Subscriber subscriber) { listener = new ISubscriberChangeListener() { + @Override public void subscriberResourceChanged(ISubscriberChangeEvent[] deltas) { accumulatedTeamDeltas.addAll(Arrays.asList(deltas)); } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CompareEditorTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CompareEditorTests.java index c6acde392..666fe0e19 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CompareEditorTests.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/CompareEditorTests.java @@ -142,6 +142,7 @@ public class CompareEditorTests extends CVSSyncSubscriberTest { document.set(string); } + @Override protected void setUp() throws Exception { super.setUp(); // Need to set both the Compare and Team test flags to true @@ -155,6 +156,7 @@ public class CompareEditorTests extends CVSSyncSubscriberTest { Utils.TESTING_FLUSH_ON_COMPARE_INPUT_CHANGE = b; } + @Override protected void tearDown() throws Exception { closeAllEditors(); super.tearDown(); 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 26d1a09d5..4dba8df58 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 @@ -49,18 +49,22 @@ public class SyncSetTests extends CVSSyncSubscriberTest { } class TestSyncInfo extends SyncInfo { + @Override protected int calculateKind() throws TeamException { return 0; } public TestSyncInfo() { super(ResourcesPlugin.getWorkspace().getRoot(), null, null, new IResourceVariantComparator() { + @Override public boolean compare(IResource local, IResourceVariant remote) { return false; } + @Override public boolean compare(IResourceVariant base, IResourceVariant remote) { return false; } + @Override public boolean isThreeWay() { return false; } @@ -79,6 +83,7 @@ public class SyncSetTests extends CVSSyncSubscriberTest { for(int numJobs = 0; numJobs < 10; numJobs++) { Job job = new Job("SyncSetTests" + numJobs) { + @Override public IStatus run(IProgressMonitor monitor) { while(! done[0]) { try { @@ -96,6 +101,7 @@ public class SyncSetTests extends CVSSyncSubscriberTest { }; job.addJobChangeListener(new JobChangeAdapter() { + @Override public void done(IJobChangeEvent event) { if(event.getResult() != Status.OK_STATUS) { error[0] = event.getResult(); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMergeUpdateOperation.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMergeUpdateOperation.java index 5cd90dd0f..8cc5c31a8 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMergeUpdateOperation.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/subscriber/TestMergeUpdateOperation.java @@ -29,6 +29,7 @@ class TestMergeUpdateOperation extends MergeUpdateOperation { this.allowOverwrite = allowOverwrite; } + @Override protected boolean promptForOverwrite(SyncInfoSet syncSet) { if (allowOverwrite) return true; if (syncSet.isEmpty()) return true; @@ -37,6 +38,7 @@ class TestMergeUpdateOperation extends MergeUpdateOperation { return false; } + @Override protected boolean canRunAsJob() { return false; } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSProjectSetImportTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSProjectSetImportTest.java index 7b881e10c..a2da28eb7 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSProjectSetImportTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CVSProjectSetImportTest.java @@ -53,6 +53,7 @@ public class CVSProjectSetImportTest extends TestCase { return new TestSuite(CVSProjectSetImportTest.class); } + @Override protected void setUp() throws Exception { super.setUp(); knownRepositories = KnownRepositories.getInstance(); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java index 7b0a768f3..ddf327f22 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/CreatePatchTest.java @@ -81,11 +81,13 @@ public class CreatePatchTest extends EclipseTest { return suite(CreatePatchTest.class); } + @Override protected void setUp() throws Exception { super.setUp(); testProject = createProject("ApplyPatchTest", new String[] {}); } + @Override protected void tearDown() throws Exception { super.tearDown(); testProject.delete(true, null); @@ -301,6 +303,7 @@ public class CreatePatchTest extends EclipseTest { asInputStream("server_response_with_error.txt"))); + @Override public String readLine() throws CVSException { try { return serverResp.readLine(); @@ -310,6 +313,7 @@ public class CreatePatchTest extends EclipseTest { } } + @Override public void close() { try { super.close(); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ParticipantSyncInfoSource.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ParticipantSyncInfoSource.java index eedf96fbc..82bcaaef9 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ParticipantSyncInfoSource.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/ParticipantSyncInfoSource.java @@ -56,6 +56,7 @@ public class ParticipantSyncInfoSource extends SyncInfoSource { return converter; } + @Override public void tearDown() { ISynchronizeParticipantReference[] participants = TeamUI.getSynchronizeManager().getSynchronizeParticipants(); for (ISynchronizeParticipantReference ref : participants) { @@ -93,6 +94,7 @@ public class ParticipantSyncInfoSource extends SyncInfoSource { // Default is to do nothing. Subclasses may override } + @Override public void refresh(Subscriber subscriber, IResource[] resources) throws TeamException { super.refresh(subscriber, resources); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchTreeTest.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchTreeTest.java index fba91fe14..4b7bf9ff4 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchTreeTest.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchTreeTest.java @@ -118,14 +118,17 @@ public class PatchTreeTest extends EclipseTest { null); conf.setPage(new ISynchronizePage() { + @Override public void init(ISynchronizePageSite site) throws PartInitException { } + @Override public Viewer getViewer() { return viewer; } + @Override public boolean aboutToChangeProperty( ISynchronizePageConfiguration configuration, String key, Object newValue) { @@ -138,6 +141,7 @@ public class PatchTreeTest extends EclipseTest { private class MyModelProvider extends ChangeSetModelProvider implements IPropertyChangeListener { + @Override public ChangeSetCapability getChangeSetCapability() { return new ChangeSetCapability() { }; @@ -149,6 +153,7 @@ public class PatchTreeTest extends EclipseTest { addPropertyChangeListener(this); } + @Override public void propertyChange(PropertyChangeEvent event) { // nothing to do } diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchWizardRadioButtonGroupTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchWizardRadioButtonGroupTests.java index c339d3508..464826489 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchWizardRadioButtonGroupTests.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PatchWizardRadioButtonGroupTests.java @@ -68,6 +68,7 @@ public class PatchWizardRadioButtonGroupTests extends TestCase { return suite; } + @Override protected void setUp() throws Exception { Shell shell = new Shell(Display.getCurrent()); Composite composite = new Composite(shell, SWT.NONE); diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PerspectiveFactory.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PerspectiveFactory.java index 1c261e7f4..999807170 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PerspectiveFactory.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/PerspectiveFactory.java @@ -18,6 +18,7 @@ import org.eclipse.ui.IPerspectiveFactory; public class PerspectiveFactory implements IPerspectiveFactory { + @Override public void createInitialLayout(IPageLayout layout) { String editorArea = layout.getEditorArea(); /* IFolderLayout top = */ diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/RepositoriesViewTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/RepositoriesViewTests.java index 54fe24b16..72d1970ec 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/RepositoriesViewTests.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/RepositoriesViewTests.java @@ -39,6 +39,7 @@ public class RepositoriesViewTests extends EclipseTest { super(testName); } + @Override protected void setUp() throws Exception { super.setUp(); // clear repository root cache diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/TestEditor.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/TestEditor.java index f81919ac7..a928395db 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/TestEditor.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/TestEditor.java @@ -22,6 +22,7 @@ public class TestEditor extends TextEditor { // Nothing to do } + @Override public void init(IEditorSite site, IEditorInput input) throws PartInitException { if (!(input instanceof IFileEditorInput)) diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/Bug152581Test.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/Bug152581Test.java index aa9ceb720..239b09c32 100644 --- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/Bug152581Test.java +++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/benchmark/Bug152581Test.java @@ -72,6 +72,7 @@ public class Bug152581Test extends BenchmarkTest { ensureExistsInWorkspace(currentDir.getFile(new Path(null,filename)), true); } + @Override public void ensureExistsInWorkspace(final IResource resource, final boolean local) { IWorkspaceRunnable body = monitor -> create(resource, local); try { 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/benchmark/WorkflowTests.java index f236a8212..06563a48e 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/benchmark/WorkflowTests.java @@ -65,6 +65,7 @@ public class WorkflowTests extends BenchmarkTest { runWorkflowTests("testBigWithNoUI", BenchmarkTestSetup.BIG_ZIP_FILE, "CVS Workflow No UI", BenchmarkTestSetup.LOOP_COUNT, false, new SyncInfoSource()); } + @Override protected void waitForBuild() { super.waitForBuild(); // Ensure that we can obtrain the worksapce lock before continuing |