From 52b1bd49d7d43f98094b9679595dfce3f2cb1979 Mon Sep 17 00:00:00 2001 From: Heiko Klare Date: Fri, 2 Jan 2026 16:08:35 +0100 Subject: [PATCH] Suppress warnings in resource tests explicitly testing deprecated API Several resource tests explicitly test API that is deprecated. Since those tests are expected to access deprecated methods, there should be no warnings that mess up the workspace. This change suppresses the according warnings for several methods that by intent call deprecated methods. --- .../FileSystemResourceManagerTest.java | 5 ++++- .../internal/localstore/RefreshLocalTest.java | 11 ++++++----- .../resources/ProjectReferencesTest.java | 18 ++++++++++++------ .../tests/resources/FilteredResourceTest.java | 2 ++ .../resources/IProjectDescriptionTest.java | 2 ++ .../core/tests/resources/IProjectTest.java | 2 ++ .../resources/IResourceChangeListenerTest.java | 4 ++++ .../core/tests/resources/IResourceTest.java | 2 ++ .../tests/resources/IWorkspaceRootTest.java | 6 ++++++ .../tests/resources/LinkedResourceTest.java | 3 ++- .../core/tests/resources/ResourceTestUtil.java | 5 +++++ .../tests/resources/regression/Bug_027271.java | 2 ++ .../resources/regression/IFolderTest.java | 2 ++ .../resources/regression/IProjectTest.java | 2 ++ .../resources/regression/IResourceTest.java | 2 ++ .../tests/resources/usecase/IFileTest.java | 2 +- .../tests/resources/usecase/IFolderTest.java | 2 +- .../tests/resources/usecase/IProjectTest.java | 2 +- .../resources/usecase/IResourceTestUtil.java | 8 -------- 19 files changed, 58 insertions(+), 24 deletions(-) diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/FileSystemResourceManagerTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/FileSystemResourceManagerTest.java index e7eed7ac934..f86680bb200 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/FileSystemResourceManagerTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/FileSystemResourceManagerTest.java @@ -21,6 +21,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.createInputStream; import static org.eclipse.core.tests.resources.ResourceTestUtil.createUniqueString; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureOutOfSync; +import static org.eclipse.core.tests.resources.ResourceTestUtil.isLocal; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.waitForRefresh; @@ -147,7 +148,7 @@ public void testCreateFile() throws Exception { /* create file with flag false */ file.create(createInputStream(originalContent), false, null); assertTrue(file.exists()); - assertTrue(file.isLocal(IResource.DEPTH_ZERO)); + assertTrue(isLocal(file, IResource.DEPTH_ZERO)); assertEquals(file.getStore().fetchInfo().getLastModified(), file.getResourceInfo(false, false).getLocalSyncInfo()); try (InputStream readFile = getLocalManager().read(file, true, null)) { assertThat(readFile).hasContent(originalContent); @@ -187,6 +188,8 @@ public void testFileFor() { assertNull(testFile); } + // Explicitly tests deprecated API + @SuppressWarnings("deprecation") @Test public void testIsLocal() throws CoreException { // create resources diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/RefreshLocalTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/RefreshLocalTest.java index 816bb0989b8..e570a940ddf 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/RefreshLocalTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/RefreshLocalTest.java @@ -21,6 +21,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.createInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.createTestMonitor; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureOutOfSync; +import static org.eclipse.core.tests.resources.ResourceTestUtil.isLocal; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.junit.Assert.assertEquals; @@ -231,7 +232,7 @@ public void testRefreshFolder() throws Throwable { }; workspace.run(operation, null); assertTrue(file.exists()); - assertTrue(file.isLocal(IResource.DEPTH_ZERO)); + assertTrue(isLocal(file, IResource.DEPTH_ZERO)); project.refreshLocal(IResource.DEPTH_INFINITE, null); assertFalse(file.exists()); removeFromWorkspace(file); @@ -252,15 +253,15 @@ public void testRefreshFolder() throws Throwable { file = folder.getFile("file"); createInFileSystem(file); assertTrue(folder.exists()); - assertTrue(folder.isLocal(IResource.DEPTH_ZERO)); + assertTrue(isLocal(folder, IResource.DEPTH_ZERO)); assertFalse(file.exists()); folder.refreshLocal(IResource.DEPTH_ZERO, null); assertTrue(folder.exists()); - assertTrue(folder.isLocal(IResource.DEPTH_ZERO)); + assertTrue(isLocal(folder, IResource.DEPTH_ZERO)); assertFalse(file.exists()); folder.refreshLocal(IResource.DEPTH_ONE, null); assertTrue(folder.exists()); - assertTrue(folder.isLocal(IResource.DEPTH_ZERO)); + assertTrue(isLocal(folder, IResource.DEPTH_ZERO)); assertTrue(file.exists()); removeFromWorkspace(folder); removeFromFileSystem(folder); @@ -270,7 +271,7 @@ public void testRefreshFolder() throws Throwable { IFileStore fileStore = ((Resource) file).getStore(); createInWorkspace(file); assertTrue(file.exists()); - assertTrue(file.isLocal(IResource.DEPTH_ZERO)); + assertTrue(isLocal(file, IResource.DEPTH_ZERO)); assertEquals(fileStore.fetchInfo().getLastModified(), ((Resource) file).getResourceInfo(false, false).getLocalSyncInfo()); ensureOutOfSync(file); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectReferencesTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectReferencesTest.java index dd60a92da5f..e6a0714fdbc 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectReferencesTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectReferencesTest.java @@ -157,7 +157,7 @@ public void testChangingBuildConfigurations() throws CoreException { public void testMixedProjectAndBuildConfigRefs() throws CoreException { // Set project variant references IProjectDescription desc = project0.getDescription(); - desc.setDynamicReferences(new IProject[] {project1, project3}); + setDynamicReferences(desc, new IProject[] { project1, project3 }); project0.setDescription(desc, createTestMonitor()); // Check getters @@ -192,22 +192,22 @@ public void testSetAndGetProjectReferences() throws CoreException { // Set project references IProjectDescription desc = project0.getDescription(); desc.setReferencedProjects(new IProject[] {project3, project1}); - desc.setDynamicReferences(new IProject[] {project1, project2}); + setDynamicReferences(desc, new IProject[] { project1, project2 }); project0.setDescription(desc, createTestMonitor()); desc = project1.getDescription(); desc.setReferencedProjects(new IProject[] {project0}); - desc.setDynamicReferences(new IProject[] {}); + setDynamicReferences(desc, new IProject[] {}); project1.setDescription(desc, createTestMonitor()); desc = project2.getDescription(); desc.setReferencedProjects(new IProject[] {}); - desc.setDynamicReferences(new IProject[] {}); + setDynamicReferences(desc, new IProject[] {}); project2.setDescription(desc, createTestMonitor()); desc = project3.getDescription(); desc.setReferencedProjects(new IProject[] {}); - desc.setDynamicReferences(new IProject[] {project0}); + setDynamicReferences(desc, new IProject[] { project0 }); project3.setDescription(desc, createTestMonitor()); // Test getters @@ -222,6 +222,12 @@ public void testSetAndGetProjectReferences() throws CoreException { project1v0, project2v0); } + // Suppress warning as we explicitly test deprecated API + @SuppressWarnings("deprecation") + private void setDynamicReferences(IProjectDescription description, IProject[] projects) { + description.setDynamicReferences(projects); + } + @Test public void testSetAndGetProjectConfigReferences() throws CoreException { // Set project variant references @@ -229,7 +235,7 @@ public void testSetAndGetProjectConfigReferences() throws CoreException { // 1 static reference desc.setReferencedProjects(new IProject[] {project1}); // 1 dynamic project-level reference - desc.setDynamicReferences(new IProject[] {project3}); + setDynamicReferences(desc, new IProject[] { project3 }); // config level references desc.setBuildConfigReferences(bc0, new IBuildConfiguration[] {project2v0, project1v0}); desc.setBuildConfigReferences(bc1, new IBuildConfiguration[] {project2v0}); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/FilteredResourceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/FilteredResourceTest.java index 4ec51a988fa..5a967bd1266 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/FilteredResourceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/FilteredResourceTest.java @@ -1298,6 +1298,8 @@ public void test328464() throws CoreException { /** * Regression test for bug 343914 */ + // Explicitly tests deprecated API + @SuppressWarnings("deprecation") @Test public void test343914() throws CoreException { String subProjectName = "subProject"; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectDescriptionTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectDescriptionTest.java index 9ddc0b0a84f..83e3019b09a 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectDescriptionTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectDescriptionTest.java @@ -157,6 +157,8 @@ public void testDirtyBuildSpec() throws CoreException { assertTrue(modificationStamp != projectDescription.getModificationStamp()); } + // Explicitly tests deprecated API + @SuppressWarnings("deprecation") @Test public void testDynamicProjectReferences() throws CoreException { IProject target1 = getWorkspace().getRoot().getProject("target1"); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectTest.java index 76c4c19708a..2b58fd78806 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectTest.java @@ -1990,6 +1990,8 @@ public void testProjectDeletionOpenUserDefinedOutOfSync() throws Exception { /** * Tests API on IProjectDescription */ + // Explicitly tests deprecated API + @SuppressWarnings("deprecation") @Test public void testProjectDescriptionDynamic() { IProjectDescription desc = getWorkspace().newProjectDescription("foo"); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeListenerTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeListenerTest.java index 6acaa1e4a2a..4ba62f0f477 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeListenerTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeListenerTest.java @@ -1430,6 +1430,8 @@ public void testProjectDescriptionComment() throws CoreException { assertDelta(); } + // Explicitly tests deprecated API + @SuppressWarnings("deprecation") @Test public void testProjectDescriptionDynamicRefs() throws CoreException { /* change file1's contents */ @@ -1523,6 +1525,8 @@ public void testReplaceFolderWithFolder() throws CoreException { assertDelta(); } + // Explicitly tests deprecated API + @SuppressWarnings("deprecation") @Test public void testSetLocal() throws CoreException { verifier.reset(); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java index de21b7fcff4..0a6bb128013 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java @@ -1338,6 +1338,8 @@ public void testDerived() throws CoreException { * Performs black box testing of the following methods: isDerived() and * setDerived(boolean) */ + // Explicitly tests deprecated API + @SuppressWarnings("deprecation") @Test public void testDeprecatedDerived() throws CoreException { IWorkspaceRoot root = getWorkspace().getRoot(); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceRootTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceRootTest.java index 9f34cff4937..8541a69cdcb 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceRootTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceRootTest.java @@ -58,6 +58,8 @@ public class IWorkspaceRootTest { /** * Tests findFilesForLocation when non-canonical paths are used (bug 155101). */ + // Explicitly tests deprecated API + @SuppressWarnings("deprecation") @Test public void testFindFilesNonCanonicalPath() throws Exception { assumeTrue("only relevant on Windows", OS.isWindows()); @@ -111,6 +113,8 @@ public void testFindContainersForLocationOnWrappedFileSystem() throws Exception /** * Tests the API method findContainersForLocation. */ + // Explicitly tests deprecated API + @SuppressWarnings("deprecation") private void testFindContainersForLocation(IProject p1, IProject p2) throws Exception { //should find the workspace root IWorkspaceRoot root = getWorkspace().getRoot(); @@ -185,6 +189,8 @@ public void testFindFilesForLocation() throws CoreException { /** * Tests the API method findFilesForLocation. */ + // Explicitly tests deprecated API + @SuppressWarnings("deprecation") private void testFindFilesForLocation(IProject project) throws CoreException { //should not find the workspace root IWorkspaceRoot root = getWorkspace().getRoot(); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceTest.java index 75fbe2f97d9..e5ee98c13c0 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceTest.java @@ -27,6 +27,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.createRandomContentsStream; import static org.eclipse.core.tests.resources.ResourceTestUtil.createTestMonitor; import static org.eclipse.core.tests.resources.ResourceTestUtil.createUniqueString; +import static org.eclipse.core.tests.resources.ResourceTestUtil.isLocal; import static org.eclipse.core.tests.resources.ResourceTestUtil.readStringInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; @@ -710,7 +711,7 @@ public void testCreateProjectWithDeepLinks() throws CoreException { project.open(IResource.BACKGROUND_REFRESH, createTestMonitor()); assertTrue(folder.exists()); assertTrue(parent.exists()); - assertTrue(parent.isLocal(IResource.DEPTH_INFINITE)); + assertTrue(isLocal(parent, IResource.DEPTH_INFINITE)); } /** diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTestUtil.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTestUtil.java index 9b795b527bc..803c23219d9 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTestUtil.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTestUtil.java @@ -767,5 +767,10 @@ public static IFileStore getFileStore(Path path) throws IOException { IPath canonicalIPath = wrapInCanonicalIPath(path); return EFS.getLocalFileSystem().getStore(canonicalIPath); } + + @SuppressWarnings("deprecation") + public static boolean isLocal(IResource resource, int depth) { + return resource.isLocal(depth); + } } diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_027271.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_027271.java index 288b49df494..e9d96e52ef7 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_027271.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_027271.java @@ -33,6 +33,8 @@ * Tests how changes in the underlying preference store may affect the path * variable manager. */ +// Explicitly tests deprecated API +@SuppressWarnings("deprecation") @ExtendWith(WorkspaceResetExtension.class) public class Bug_027271 { diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IFolderTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IFolderTest.java index 4eae448b887..351ea41488b 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IFolderTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IFolderTest.java @@ -75,6 +75,8 @@ public void testBug25662() throws CoreException { /** * Bug 11510 [resources] Non-local folders do not become local when directory is created. */ + // Explicitly tests deprecated API + @SuppressWarnings("deprecation") @Test public void testBug11510() throws Exception { IWorkspaceRoot root = getWorkspace().getRoot(); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IProjectTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IProjectTest.java index 79512c730e0..4959232fbaf 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IProjectTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IProjectTest.java @@ -70,6 +70,8 @@ public void test_1G0XIMA() throws CoreException { project.delete(true, createTestMonitor()); } + // Explicitly tests deprecated API + @SuppressWarnings("deprecation") @Test public void test_1G5I6PV() throws CoreException { /* common objects */ diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IResourceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IResourceTest.java index 03491d8988e..630cb45d104 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IResourceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IResourceTest.java @@ -205,6 +205,8 @@ public boolean visit(IResourceDelta aDelta) { /** * Calling isSynchronized on a non-local resource caused an internal error. */ + // Explicitly tests deprecated API + @SuppressWarnings("deprecation") @Test public void testBug83777() throws CoreException { IProject project = getWorkspace().getRoot().getProject("testBug83777"); diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IFileTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IFileTest.java index 9eca51a47dd..fc321aab0bc 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IFileTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IFileTest.java @@ -17,13 +17,13 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.createInputStream; +import static org.eclipse.core.tests.resources.ResourceTestUtil.isLocal; import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.FILE; import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.FOLDER; import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.PROJECT; import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.Q_NAME_SESSION; import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.STRING_VALUE; import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.commonFailureTestsForResource; -import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.isLocal; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IFolderTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IFolderTest.java index c1f6ea4b19a..fb84e3ca4c2 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IFolderTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IFolderTest.java @@ -16,12 +16,12 @@ import static java.util.function.Predicate.not; import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.isLocal; import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.FOLDER; import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.PROJECT; import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.Q_NAME_SESSION; import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.STRING_VALUE; import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.commonFailureTestsForResource; -import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.isLocal; import static org.junit.jupiter.api.Assertions.assertThrows; import org.eclipse.core.resources.IContainer; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IProjectTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IProjectTest.java index 664df68b399..ccba89825ec 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IProjectTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IProjectTest.java @@ -17,11 +17,11 @@ import static java.util.function.Predicate.not; import static org.assertj.core.api.Assertions.assertThat; import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.isLocal; import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.PROJECT; import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.Q_NAME_SESSION; import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.STRING_VALUE; import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.commonFailureTestsForResource; -import static org.eclipse.core.tests.resources.usecase.IResourceTestUtil.isLocal; import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.Hashtable; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IResourceTestUtil.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IResourceTestUtil.java index b8b789bf086..1ac2a4f823f 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IResourceTestUtil.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IResourceTestUtil.java @@ -47,12 +47,4 @@ public static void commonFailureTestsForResource(IResource resource, boolean cre assertThrows(CoreException.class, () -> resource.getSessionProperty(Q_NAME_SESSION)); assertThrows(CoreException.class, () -> resource.setSessionProperty(Q_NAME_SESSION, STRING_VALUE)); } - - /** - * Wrapper for deprecated method {@link IResource#isLocal(int)} to reduce - * warnings. - */ - public static boolean isLocal(IResource resource, int depth) { - return resource.isLocal(depth); - } }