diff options
author | Carsten Hammer | 2019-11-16 13:51:52 +0000 |
---|---|---|
committer | Karsten Thoms | 2019-12-10 15:55:36 +0000 |
commit | e090ccc9f10ea61bc44c003667ea447a2881046f (patch) | |
tree | cbf48418a60ebd4fe33853480c7b6f07d20416bf /tests | |
parent | 7dffbe18aa4abcc39acff34df14cc7f3170c38d8 (diff) | |
download | eclipse.platform.team-e090ccc9f10ea61bc44c003667ea447a2881046f.tar.gz eclipse.platform.team-e090ccc9f10ea61bc44c003667ea447a2881046f.tar.xz eclipse.platform.team-e090ccc9f10ea61bc44c003667ea447a2881046f.zip |
Add @Override Annotation
Change-Id: I58423eb5a8358639f0c934d66f214f9fbc5be651
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
Diffstat (limited to 'tests')
12 files changed, 86 insertions, 0 deletions
diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderBic.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderBic.java index d1efd473f..aecb6d78f 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderBic.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderBic.java @@ -25,19 +25,24 @@ public class RepositoryProviderBic extends RepositoryProvider { private IMoveDeleteHook mdh; private IFileModificationValidator mv; + @Override public void configureProject() throws CoreException { } + @Override public String getID() { return NATURE_ID; } + @Override public void deconfigure() throws CoreException { } + @Override public IFileModificationValidator getFileModificationValidator() { return mv; } + @Override public IMoveDeleteHook getMoveDeleteHook() { return mdh; } diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderNaish.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderNaish.java index baf35a567..03c4f35ad 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderNaish.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderNaish.java @@ -23,12 +23,15 @@ public class RepositoryProviderNaish extends RepositoryProvider { final public static String NATURE_ID = "org.eclipse.team.tests.core.naish-provider"; private IMoveDeleteHook mdh; private IFileModificationValidator mv; + @Override public void configureProject() throws CoreException { } + @Override public String getID() { return NATURE_ID; } + @Override public void deconfigure() throws CoreException { } @@ -39,10 +42,12 @@ public class RepositoryProviderNaish extends RepositoryProvider { public void setMoveDeleteHook(IMoveDeleteHook mdh) { this.mdh = mdh; } + @Override public IFileModificationValidator getFileModificationValidator() { return mv; } + @Override public IMoveDeleteHook getMoveDeleteHook() { return mdh; } diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderOtherSport.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderOtherSport.java index d0b0b1dd5..025373fca 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderOtherSport.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderOtherSport.java @@ -20,13 +20,16 @@ public class RepositoryProviderOtherSport extends RepositoryProvider { final public static String NATURE_ID = "org.eclipse.team.tests.core.other"; + @Override public void configureProject() throws CoreException { } + @Override public String getID() { return NATURE_ID; } + @Override public void deconfigure() throws CoreException { } } diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTests.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTests.java index 8ef4d6e90..1b9b39a4d 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTests.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTests.java @@ -142,9 +142,11 @@ public class RepositoryProviderTests extends TeamTest { final boolean[] called = new boolean[] {false}; bicProvider.setModificationValidator(new FileModificationValidator() { // can't test validate edit here because it is only called from editors + @Override public IStatus validateEdit(IFile[] files, FileModificationValidationContext context) { return null; } + @Override public IStatus validateSave(IFile file) { called[0] = true; return getTeamTestStatus(IStatus.OK); @@ -159,9 +161,11 @@ public class RepositoryProviderTests extends TeamTest { called[0] = false; bicProvider.setModificationValidator(new FileModificationValidator() { // can't test validate edit here because it is only called from editors + @Override public IStatus validateEdit(IFile[] files, FileModificationValidationContext context) { return null; } + @Override public IStatus validateSave(IFile file) { called[0] = true; return getTeamTestStatus(IStatus.ERROR); @@ -190,26 +194,32 @@ public class RepositoryProviderTests extends TeamTest { // only testing that dispatching works, resources plugin is testing the rest of the API final boolean[] called = new boolean[] {false, false, false, false, false, false}; IMoveDeleteHook hook = new IMoveDeleteHook() { + @Override public boolean deleteFile(IResourceTree tree, IFile file, int updateFlags, IProgressMonitor monitor) { called[0] = true; return false; } + @Override public boolean deleteFolder(IResourceTree tree, IFolder folder, int updateFlags, IProgressMonitor monitor) { called[1] = true; return false; } + @Override public boolean deleteProject(IResourceTree tree, IProject project, int updateFlags, IProgressMonitor monitor) { called[2] = true; return false; } + @Override public boolean moveFile(IResourceTree tree, IFile source, IFile destination, int updateFlags, IProgressMonitor monitor) { called[3] = true; return false; } + @Override public boolean moveFolder(IResourceTree tree, IFolder source, IFolder destination, int updateFlags, IProgressMonitor monitor) { called[4] = true; return false; } + @Override public boolean moveProject(IResourceTree tree, IProject source, IProjectDescription description, int updateFlags, IProgressMonitor monitor) { called[5] = true; return false; @@ -251,25 +261,31 @@ public class RepositoryProviderTests extends TeamTest { // only testing that dispatching works, resources plugin is testing the rest of the API final boolean[] calledProjectA = new boolean[] {false, false}; bicProvider.setMoveDeleteHook(new IMoveDeleteHook() { + @Override public boolean deleteFile(IResourceTree tree, IFile file, int updateFlags, IProgressMonitor monitor) { return false; } + @Override public boolean deleteFolder(IResourceTree tree, IFolder folder, int updateFlags, IProgressMonitor monitor) { return false; } + @Override public boolean deleteProject(IResourceTree tree, IProject project, int updateFlags, IProgressMonitor monitor) { return false; } + @Override public boolean moveFile(IResourceTree tree, IFile source, IFile destination, int updateFlags, IProgressMonitor monitor) { Assert.assertTrue(bicProvider.getProject().equals(source.getProject())); calledProjectA[0] = true; return false; } + @Override public boolean moveFolder(IResourceTree tree, IFolder source, IFolder destination, int updateFlags, IProgressMonitor monitor) { Assert.assertTrue(bicProvider.getProject().equals(source.getProject())); calledProjectA[1] = true; return false; } + @Override public boolean moveProject(IResourceTree tree, IProject source, IProjectDescription description, int updateFlags, IProgressMonitor monitor) { return false; } @@ -277,25 +293,31 @@ public class RepositoryProviderTests extends TeamTest { final boolean[] calledProjectB = new boolean[] {false, false}; naishProvider.setMoveDeleteHook(new IMoveDeleteHook() { + @Override public boolean deleteFile(IResourceTree tree, IFile file, int updateFlags, IProgressMonitor monitor) { return false; } + @Override public boolean deleteFolder(IResourceTree tree, IFolder folder, int updateFlags, IProgressMonitor monitor) { return false; } + @Override public boolean deleteProject(IResourceTree tree, IProject project, int updateFlags, IProgressMonitor monitor) { return false; } + @Override public boolean moveFile(IResourceTree tree, IFile source, IFile destination, int updateFlags, IProgressMonitor monitor) { Assert.assertTrue(bicProvider.getProject().equals(destination.getProject())); calledProjectB[0] = true; return false; } + @Override public boolean moveFolder(IResourceTree tree, IFolder source, IFolder destination, int updateFlags, IProgressMonitor monitor) { Assert.assertTrue(bicProvider.getProject().equals(destination.getProject())); calledProjectB[1] = true; return false; } + @Override public boolean moveProject(IResourceTree tree, IProject source, IProjectDescription description, int updateFlags, IProgressMonitor monitor) { return false; } diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTypeBic.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTypeBic.java index 27475f496..d00850ed5 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTypeBic.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/RepositoryProviderTypeBic.java @@ -22,14 +22,17 @@ import org.eclipse.team.core.*; public class RepositoryProviderTypeBic extends RepositoryProviderType { File createdFile; + @Override public ProjectSetCapability getProjectSetCapability() { return new ProjectSetCapability() { + @Override public IProject[] addToWorkspace(String[] referenceStrings, ProjectSetSerializationContext context, IProgressMonitor monitor) throws TeamException { return new IProject[0]; } + @Override public void projectSetCreated(File file, ProjectSetSerializationContext context, IProgressMonitor monitor) { diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/TestStorageMerger.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/TestStorageMerger.java index 825985032..fa4361e3d 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/TestStorageMerger.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/TestStorageMerger.java @@ -23,10 +23,12 @@ public class TestStorageMerger implements IStorageMerger { public static final String MERGE_FAILURE = "merge failed"; + @Override public boolean canMergeWithoutAncestor() { return false; } + @Override public IStatus merge(OutputStream output, String outputEncoding, IStorage ancestor, IStorage target, IStorage other, IProgressMonitor monitor) throws CoreException { diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java index 6f4b6fd6e..bedb03377 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeBuildingTests.java @@ -36,6 +36,7 @@ public class ScopeBuildingTests extends TeamTest { protected TestResourceMappingOperation(ResourceMapping[] selectedMappings, final ResourceMapping[] additionalMappings) { super(null, new SynchronizationScopeManager("", selectedMappings, ResourceMappingContext.LOCAL_CONTEXT, false) { + @Override public void initialize( IProgressMonitor monitor) throws CoreException { super.initialize(monitor); @@ -49,12 +50,14 @@ public class ScopeBuildingTests extends TeamTest { } }); } + @Override protected void endOperation(IProgressMonitor monitor) throws InvocationTargetException { ISynchronizationScopeManager manager= getScopeManager(); manager.dispose(); super.endOperation(monitor); } + @Override protected void execute(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { // Do nothing since we're just testing the scope build } @@ -90,22 +93,27 @@ public class ScopeBuildingTests extends TeamTest { private ResourceMapping getMapping(final IProject project, final IResource[] resources, final int depth) { return new ResourceMapping() { + @Override public ResourceTraversal[] getTraversals(ResourceMappingContext context, IProgressMonitor monitor) throws CoreException { return new ResourceTraversal[] { new ResourceTraversal(resources, depth, IResource.NONE)}; } + @Override public IProject[] getProjects() { return new IProject[] { project }; } + @Override public Object getModelObject() { return new Object(); } + @Override public String getModelProviderId() { return TEST_MODEL_PROVIDER_ID; } + @Override public boolean contains(ResourceMapping mapping) { return false; } diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeTestSubscriber.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeTestSubscriber.java index f4437faa8..1d1cced67 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeTestSubscriber.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeTestSubscriber.java @@ -24,18 +24,23 @@ import org.eclipse.team.core.variants.IResourceVariantComparator; public class ScopeTestSubscriber extends Subscriber { + @Override public String getName() { return "Scope Tests"; } + @Override public IResourceVariantComparator getResourceComparator() { return new IResourceVariantComparator() { + @Override public boolean isThreeWay() { return false; } + @Override public boolean compare(IResourceVariant base, IResourceVariant remote) { return false; } + @Override public boolean compare(IResource local, IResourceVariant remote) { return false; } @@ -43,14 +48,17 @@ public class ScopeTestSubscriber extends Subscriber { }; } + @Override public SyncInfo getSyncInfo(IResource resource) throws TeamException { return null; } + @Override public boolean isSupervised(IResource resource) throws TeamException { return false; } + @Override public IResource[] members(IResource resource) throws TeamException { if (resource instanceof IContainer) { IContainer c = (IContainer) resource; @@ -63,11 +71,13 @@ public class ScopeTestSubscriber extends Subscriber { return new IResource[0]; } + @Override public void refresh(IResource[] resources, int depth, IProgressMonitor monitor) throws TeamException { // Nothing to do } + @Override public IResource[] roots() { return ResourcesPlugin.getWorkspace().getRoot().getProjects(); } diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeTests.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeTests.java index 7db0fd74a..d8dcdb42d 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeTests.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/mapping/ScopeTests.java @@ -42,6 +42,7 @@ public class ScopeTests extends TeamTest { super(name); } + @Override protected void setUp() throws Exception { super.setUp(); project1 = createProject("p1", new String[]{"file.txt"}); @@ -52,6 +53,7 @@ public class ScopeTests extends TeamTest { manager.addWorkingSet(workingSet); } + @Override protected void tearDown() throws Exception { super.tearDown(); this.manager.dispose(); diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/PessimisticRepositoryProvider.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/PessimisticRepositoryProvider.java index c2ebc1646..83a38200e 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/PessimisticRepositoryProvider.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/PessimisticRepositoryProvider.java @@ -37,22 +37,28 @@ public class PessimisticRepositoryProvider extends RepositoryProvider implements soleInstance = this; } + @Override public void configureProject() { } + @Override public String getID() { return NATURE_ID; } + @Override public void deconfigure() { } + @Override public boolean canHandleLinkedResourceURI() { return true; } + @Override public IFileModificationValidator getFileModificationValidator() { return soleInstance; } + @Override public IStatus validateEdit(final IFile[] files, Object context) { if (markWritableOnEdit) { try { @@ -75,6 +81,7 @@ public class PessimisticRepositoryProvider extends RepositoryProvider implements return Status.OK_STATUS; } + @Override public IStatus validateSave(IFile file) { if (markWritableOnSave) { try { diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/SaveableCompareEditorInputTest.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/SaveableCompareEditorInputTest.java index 265450dde..1ba334c9d 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/SaveableCompareEditorInputTest.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/SaveableCompareEditorInputTest.java @@ -68,6 +68,7 @@ public class SaveableCompareEditorInputTest extends TeamTest { private TestLogListener logListener = new TestLogListener(); private IProject project; + @Override protected void setUp() throws Exception { super.setUp(); @@ -84,6 +85,7 @@ public class SaveableCompareEditorInputTest extends TeamTest { RuntimeLog.addLogListener(logListener); } + @Override protected void tearDown() throws Exception { // remove log listener RuntimeLog.removeLogListener(logListener); @@ -103,20 +105,24 @@ public class SaveableCompareEditorInputTest extends TeamTest { this.file = file; } + @Override public String getName() { return file.getName(); } + @Override public Image getImage() { return null; } + @Override public String getType() { return TEXT_TYPE; } } private class TestLogListener implements ILogListener { + @Override public void logging(IStatus status, String plugin) { if (status.getSeverity() == IStatus.ERROR) fail(status.toString()); @@ -137,6 +143,7 @@ public class SaveableCompareEditorInputTest extends TeamTest { return null; } + @Override protected IResource[] getResources(ICompareInput input) { List resources = new ArrayList(); @@ -154,19 +161,23 @@ public class SaveableCompareEditorInputTest extends TeamTest { super(Differencer.CHANGE, null, left, right); } + @Override public void fireChange() { super.fireChange(); } + @Override protected CompareInputChangeNotifier getChangeNotifier() { return notifier; } + @Override public boolean needsUpdate() { // The remote never changes return false; } + @Override public void update() { fireChange(); } @@ -178,6 +189,7 @@ public class SaveableCompareEditorInputTest extends TeamTest { protected ITypedElement right; private ICompareInput input; + @Override public Object getCompareResult() { return input; } @@ -190,6 +202,7 @@ public class SaveableCompareEditorInputTest extends TeamTest { this.right = right; } + @Override protected ICompareInput prepareCompareInput(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { input = createCompareInput(); @@ -202,6 +215,7 @@ public class SaveableCompareEditorInputTest extends TeamTest { return new TestDiffNode(left, right); } + @Override protected void fireInputChange() { ((TestDiffNode) getCompareResult()).fireChange(); } diff --git a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/synchronize/ResourceContentTests.java b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/synchronize/ResourceContentTests.java index b37d930a9..aa74bb8e5 100644 --- a/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/synchronize/ResourceContentTests.java +++ b/tests/org.eclipse.team.tests.core/src/org/eclipse/team/tests/ui/synchronize/ResourceContentTests.java @@ -47,14 +47,17 @@ public class ResourceContentTests extends TeamTest { this.configuration = configuration; } + @Override public ISynchronizePageConfiguration getConfiguration() { return configuration; } + @Override public ISynchronizationContext getContext() { return context; } + @Override public ISynchronizationScope getScope() { return scope; } @@ -74,11 +77,13 @@ public class ResourceContentTests extends TeamTest { super(name); } + @Override protected void setUp() throws Exception { initializeProvider(null, null, null); super.setUp(); } + @Override protected void tearDown() throws Exception { cleanupProvider(); super.tearDown(); |