diff --git a/resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager1Test.java b/resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager1Test.java index 9933b8a6cbf..efddd85ebea 100644 --- a/resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager1Test.java +++ b/resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager1Test.java @@ -28,6 +28,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; /** * This class needs to be used with SaveManager2Test. Basically this diff --git a/resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager2Test.java b/resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager2Test.java index 29862157dd3..33ad7a4c124 100644 --- a/resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager2Test.java +++ b/resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager2Test.java @@ -30,6 +30,7 @@ import junit.framework.Test; import junit.framework.TestSuite; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem; diff --git a/resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager3Test.java b/resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager3Test.java index 0f83bb6aeca..e7f2f388c8a 100644 --- a/resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager3Test.java +++ b/resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager3Test.java @@ -16,6 +16,8 @@ import junit.framework.Test; import junit.framework.TestSuite; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.resources.*; import org.eclipse.core.runtime.*; import org.eclipse.core.tests.internal.builders.DeltaVerifierBuilder; diff --git a/resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManagerTest.java b/resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManagerTest.java index 552b92809be..a186abd0617 100644 --- a/resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManagerTest.java +++ b/resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManagerTest.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.saveparticipant; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.resources.*; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.tests.resources.WorkspaceSessionTest; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/FileStoreTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/FileStoreTest.java index 2abaa1db7be..49431bd7814 100755 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/FileStoreTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/FileStoreTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.filesystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.createFile; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import java.io.File; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/alias/BasicAliasTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/alias/BasicAliasTest.java index ecd437f9ea6..3472fe10052 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/alias/BasicAliasTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/alias/BasicAliasTest.java @@ -20,6 +20,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.createFile; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertThrows; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/alias/SyncAliasTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/alias/SyncAliasTest.java index 4db6c65ec9c..5f2830eac11 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/alias/SyncAliasTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/alias/SyncAliasTest.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.alias; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/AutoBuildJobTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/AutoBuildJobTest.java index 70cbf03b514..94187624cce 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/AutoBuildJobTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/AutoBuildJobTest.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.builders; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import java.util.Map; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuildConfigurationsTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuildConfigurationsTest.java index a839f3182c2..c50bfe382dd 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuildConfigurationsTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuildConfigurationsTest.java @@ -15,6 +15,7 @@ package org.eclipse.core.tests.internal.builders; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.util.Map; import org.eclipse.core.resources.IBuildConfiguration; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuildContextTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuildContextTest.java index b0be9e73286..dbfe85dd68f 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuildContextTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuildContextTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.internal.builders; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import org.eclipse.core.internal.events.BuildContext; import org.eclipse.core.internal.resources.BuildConfiguration; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuildDeltaVerificationTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuildDeltaVerificationTest.java index a9d51f0eed1..13b54f6ddef 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuildDeltaVerificationTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuildDeltaVerificationTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.internal.builders; import static org.eclipse.core.tests.resources.ResourceTestUtil.create; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.io.ByteArrayInputStream; import java.util.ArrayList; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderCycleTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderCycleTest.java index 0b71abdca53..11e97224fe7 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderCycleTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderCycleTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.internal.builders; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import org.eclipse.core.resources.ICommand; import org.eclipse.core.resources.IFile; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderEventTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderEventTest.java index 519be7f625b..b797c0ae0e1 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderEventTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderEventTest.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.builders; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.resources.ICommand; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderTest.java index 776f043c243..61446ff1d22 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuilderTest.java @@ -15,6 +15,7 @@ package org.eclipse.core.tests.internal.builders; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.transferStreams; import static org.junit.Assert.assertArrayEquals; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/CustomBuildTriggerTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/CustomBuildTriggerTest.java index a41358b46cb..2ce977b3624 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/CustomBuildTriggerTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/CustomBuildTriggerTest.java @@ -12,6 +12,8 @@ ******************************************************************************/ package org.eclipse.core.tests.internal.builders; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.resources.ICommand; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/EmptyDeltaTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/EmptyDeltaTest.java index da974c58f78..aae6b5977cc 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/EmptyDeltaTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/EmptyDeltaTest.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.builders; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.resources.ICommand; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/MultiProjectBuildTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/MultiProjectBuildTest.java index bc4662e2c1d..d2e4272b672 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/MultiProjectBuildTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/MultiProjectBuildTest.java @@ -15,6 +15,7 @@ package org.eclipse.core.tests.internal.builders; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.lang.reflect.Array; import java.util.ArrayList; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ParallelBuildChainTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ParallelBuildChainTest.java index 32b83b1027c..243b153b4b9 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ParallelBuildChainTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ParallelBuildChainTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.internal.builders; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.TestUtil.waitForCondition; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RebuildTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RebuildTest.java index ec121249281..8fb1be558db 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RebuildTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RebuildTest.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.builders; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import java.util.List; import org.eclipse.core.internal.resources.Workspace; import org.eclipse.core.resources.ICommand; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RelaxedSchedRuleBuilderTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RelaxedSchedRuleBuilderTest.java index dec41cc356f..d7c89443a37 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RelaxedSchedRuleBuilderTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/RelaxedSchedRuleBuilderTest.java @@ -16,6 +16,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.create; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.empty; import static org.hamcrest.Matchers.is; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/events/BuildProjectFromMultipleJobsTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/events/BuildProjectFromMultipleJobsTest.java index c0470fb5346..13397afabf5 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/events/BuildProjectFromMultipleJobsTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/events/BuildProjectFromMultipleJobsTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.internal.events; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.util.ArrayList; import java.util.Arrays; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/BucketTreeTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/BucketTreeTests.java index a8c383c5726..c517d08c696 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/BucketTreeTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/BucketTreeTests.java @@ -16,6 +16,7 @@ package org.eclipse.core.tests.internal.localstore; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/CaseSensitivityTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/CaseSensitivityTest.java index bac99d38b94..3abf0b7860d 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/CaseSensitivityTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/CaseSensitivityTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.internal.localstore; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem; import static org.junit.Assert.assertThrows; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/CopyTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/CopyTest.java index 81fb2b1ef70..c3abf4ef05c 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/CopyTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/CopyTest.java @@ -15,6 +15,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/DeleteTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/DeleteTest.java index b92ab49ab61..c45b191f116 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/DeleteTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/DeleteTest.java @@ -15,6 +15,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem; import static org.junit.Assert.assertThrows; 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 85a0ac21272..38f2399b8ca 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 @@ -15,6 +15,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.junit.Assert.assertThrows; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/HistoryStoreTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/HistoryStoreTest.java index a3d7903b380..8be0465bc5f 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/HistoryStoreTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/HistoryStoreTest.java @@ -16,6 +16,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.createFile; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import java.io.ByteArrayInputStream; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/LocalStoreTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/LocalStoreTest.java index 0321f4f96c4..5f5b897d286 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/LocalStoreTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/LocalStoreTest.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.localstore; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileOutputStream; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/MoveTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/MoveTest.java index 11f9e8761b2..890d82cce34 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/MoveTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/MoveTest.java @@ -19,6 +19,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import org.eclipse.core.internal.resources.File; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/RefreshLocalPerformanceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/RefreshLocalPerformanceTest.java index a2126c5cf9f..9efecf122b6 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/RefreshLocalPerformanceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/RefreshLocalPerformanceTest.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.localstore; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import java.io.File; import java.util.Date; import org.eclipse.core.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 a98a7d13baa..c79e2e46d71 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 @@ -15,6 +15,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/SymlinkResourceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/SymlinkResourceTest.java index 1283b303323..2683c634b4f 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/SymlinkResourceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/SymlinkResourceTest.java @@ -15,6 +15,8 @@ *******************************************************************************/ package org.eclipse.core.tests.internal.localstore; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.filesystem.EFS; import org.eclipse.core.filesystem.IFileStore; import org.eclipse.core.resources.IProject; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/UnifiedTreeTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/UnifiedTreeTest.java index 84218a32fbb..4caec632d35 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/UnifiedTreeTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/UnifiedTreeTest.java @@ -15,6 +15,7 @@ package org.eclipse.core.tests.internal.localstore; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/ChangeValidationTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/ChangeValidationTest.java index 759e3ce19bb..a5e6664bf69 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/ChangeValidationTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/ChangeValidationTest.java @@ -16,6 +16,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.util.ArrayList; import java.util.List; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/TestProjectDeletion.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/TestProjectDeletion.java index 831d821485b..d68264c497a 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/TestProjectDeletion.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/mapping/TestProjectDeletion.java @@ -15,6 +15,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/properties/PropertyManagerTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/properties/PropertyManagerTest.java index 9fefce91378..48da0f890f7 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/properties/PropertyManagerTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/properties/PropertyManagerTest.java @@ -15,6 +15,7 @@ package org.eclipse.core.tests.internal.properties; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertNotEquals; import java.nio.charset.StandardCharsets; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ModelObjectReaderWriterTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ModelObjectReaderWriterTest.java index 1371775060e..502d62ef70e 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ModelObjectReaderWriterTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ModelObjectReaderWriterTest.java @@ -16,6 +16,7 @@ package org.eclipse.core.tests.internal.resources; import static org.eclipse.core.tests.resources.ResourceTestUtil.createFile; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem; import java.io.ByteArrayInputStream; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectBuildConfigsTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectBuildConfigsTest.java index a800e252802..b5c35ad933e 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectBuildConfigsTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectBuildConfigsTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.internal.resources; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import org.eclipse.core.internal.resources.BuildConfiguration; import org.eclipse.core.resources.IBuildConfiguration; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectDynamicReferencesTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectDynamicReferencesTest.java index ce2cb7da9c3..1708d3916d6 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectDynamicReferencesTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectDynamicReferencesTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.internal.resources; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.util.ArrayList; import java.util.Collections; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectPreferencesTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectPreferencesTest.java index 8f70b88e461..c853b027828 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectPreferencesTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/ProjectPreferencesTest.java @@ -15,6 +15,7 @@ package org.eclipse.core.tests.internal.resources; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; 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 74e133fe638..f0f6fd8b069 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 @@ -14,6 +14,7 @@ package org.eclipse.core.tests.internal.resources; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import org.eclipse.core.internal.resources.BuildConfiguration; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/WorkspaceConcurrencyTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/WorkspaceConcurrencyTest.java index 27bebed398b..4f93aeada07 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/WorkspaceConcurrencyTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/WorkspaceConcurrencyTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.internal.resources; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/CharsetTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/CharsetTest.java index 025740df4d5..f519cf55fc8 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/CharsetTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/CharsetTest.java @@ -19,6 +19,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.junit.Assert.assertThrows; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ContentDescriptionManagerTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ContentDescriptionManagerTest.java index 7c6b5ecd0c3..b10e564c6ec 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ContentDescriptionManagerTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ContentDescriptionManagerTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.io.ByteArrayInputStream; import java.io.InputStream; 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 3f5f3a5150b..53be99a54f0 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 @@ -16,6 +16,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.create; import static org.eclipse.core.tests.resources.ResourceTestUtil.createFile; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.junit.Assert.assertThrows; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/HiddenResourceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/HiddenResourceTest.java index 1048f9b8375..c2d12b1ebb1 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/HiddenResourceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/HiddenResourceTest.java @@ -16,6 +16,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.junit.Assert.assertThrows; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java index 3ee69ab31dc..67ed50cd36e 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java @@ -21,6 +21,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.junit.Assert.assertThrows; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFolderTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFolderTest.java index aa2658f658b..ce98f9278f7 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFolderTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFolderTest.java @@ -16,6 +16,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.junit.Assert.assertThrows; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IPathVariableTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IPathVariableTest.java index b740af9f359..2c0791dfc67 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IPathVariableTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IPathVariableTest.java @@ -15,6 +15,7 @@ package org.eclipse.core.tests.resources; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import java.io.BufferedWriter; 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 17ff5d4a7d6..d1dff646896 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 @@ -15,6 +15,7 @@ package org.eclipse.core.tests.resources; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import java.util.HashMap; 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 7f492cf80e1..9df1df81f72 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 @@ -19,6 +19,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.createFile; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.junit.Assert.assertThrows; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeEventTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeEventTest.java index 329807b8291..5910f0397e3 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeEventTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeEventTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; 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/IResourceChangeListenerTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeListenerTest.java index 4a142066956..b48611e9bf2 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 @@ -16,6 +16,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.create; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import java.io.ByteArrayInputStream; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceDeltaTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceDeltaTest.java index b25bbc25931..fa9405ed12d 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceDeltaTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceDeltaTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; 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/IResourceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java index 7fe5a35972f..e576aff2d04 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 @@ -22,6 +22,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.createFile; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ISynchronizerTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ISynchronizerTest.java index 3274722813c..978f10e8393 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ISynchronizerTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ISynchronizerTest.java @@ -15,6 +15,7 @@ package org.eclipse.core.tests.resources; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.junit.Assert.assertThrows; 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 b3937a8581f..875caacc1f5 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 @@ -15,6 +15,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.createFile; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.junit.Assert.assertThrows; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceTest.java index e3ceedd0273..cb0cb062823 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceTest.java @@ -19,6 +19,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.junit.Assert.assertNotEquals; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedDotProjectTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedDotProjectTest.java index 1ddb0c832d9..3119b2334b0 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedDotProjectTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedDotProjectTest.java @@ -10,6 +10,7 @@ ******************************************************************************/ package org.eclipse.core.tests.resources; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertThrows; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceSyncMoveAndCopyTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceSyncMoveAndCopyTest.java index 0c587f16fd5..7f61ad82fea 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceSyncMoveAndCopyTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceSyncMoveAndCopyTest.java @@ -17,6 +17,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.createFile; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import java.io.ByteArrayInputStream; 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 b57fb9239cf..360b4a788a4 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 @@ -20,6 +20,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.createFile; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.junit.Assert.assertThrows; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceWithPathVariableTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceWithPathVariableTest.java index f0e85dd0611..61b2de62057 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceWithPathVariableTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceWithPathVariableTest.java @@ -20,6 +20,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem; import java.io.File; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java index 3b34129f063..1fa92f1a471 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/MarkerTest.java @@ -16,6 +16,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.create; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.arrayContainingInAnyOrder; import static org.hamcrest.Matchers.arrayWithSize; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/NatureTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/NatureTest.java index 105698fc1ab..5779e657dfc 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/NatureTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/NatureTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import java.io.ByteArrayInputStream; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/NonLocalLinkedResourceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/NonLocalLinkedResourceTest.java index c9e1dca441a..4a0b6932d01 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/NonLocalLinkedResourceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/NonLocalLinkedResourceTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.junit.Assert.assertThrows; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectOrderTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectOrderTest.java index d9802f6134f..3c956cffa7e 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectOrderTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectOrderTest.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectScopeTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectScopeTest.java index 54166130afb..2b9b0a01623 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectScopeTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectScopeTest.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ProjectScope; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectSnapshotPerfManualTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectSnapshotPerfManualTest.java index b31ac2e912c..8577c75bea7 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectSnapshotPerfManualTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectSnapshotPerfManualTest.java @@ -15,6 +15,7 @@ package org.eclipse.core.tests.resources; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.io.File; import java.net.URI; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectSnapshotTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectSnapshotTest.java index b3bb67a7dfc..ac3a5d08abe 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectSnapshotTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ProjectSnapshotTest.java @@ -18,6 +18,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import java.io.InputStream; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceAttributeTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceAttributeTest.java index f0f5f28d1fd..e7aac1f4bac 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceAttributeTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceAttributeTest.java @@ -17,6 +17,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import java.io.File; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java index 865b432a237..48e7dd46484 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.core.tests.resources; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; @@ -113,10 +114,6 @@ public abstract class ResourceTest extends CoreTest { */ private final Set storesToDelete = new HashSet<>(); - public static IWorkspace getWorkspace() { - return ResourcesPlugin.getWorkspace(); - } - private IWorkspaceDescription storedWorkspaceDescription; private final void storeWorkspaceDescription() { diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceURLTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceURLTest.java index 7b461c03c8a..33c6e21eb00 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceURLTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceURLTest.java @@ -15,6 +15,7 @@ package org.eclipse.core.tests.resources; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import java.io.IOException; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/TeamPrivateMemberTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/TeamPrivateMemberTest.java index aab5e91a529..2916a929c74 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/TeamPrivateMemberTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/TeamPrivateMemberTest.java @@ -16,6 +16,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.arrayWithSize; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/VirtualFolderTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/VirtualFolderTest.java index 2b58379ea62..99016e108bf 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/VirtualFolderTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/VirtualFolderTest.java @@ -20,6 +20,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.create; import static org.eclipse.core.tests.resources.ResourceTestUtil.createFile; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import org.eclipse.core.filesystem.EFS; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/WorkspaceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/WorkspaceTest.java index de67edafe0e..af0e234ded1 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/WorkspaceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/WorkspaceTest.java @@ -18,6 +18,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertThrows; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BenchWorkspace.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BenchWorkspace.java index 1aa8f728e42..782cba7d5c2 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BenchWorkspace.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BenchWorkspace.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.perf; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import org.eclipse.core.internal.resources.Workspace; import org.eclipse.core.resources.IMarker; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BuilderPerformanceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BuilderPerformanceTest.java index a5046e7b90e..3d7dd1e30b5 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BuilderPerformanceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/BuilderPerformanceTest.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.perf; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import java.util.Map; import org.eclipse.core.resources.*; import org.eclipse.core.runtime.CoreException; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/LocalHistoryPerformanceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/LocalHistoryPerformanceTest.java index 72d9564422a..cb04cf5e090 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/LocalHistoryPerformanceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/LocalHistoryPerformanceTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.perf; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import org.eclipse.core.internal.localstore.IHistoryStore; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/MarkerPerformanceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/MarkerPerformanceTest.java index 8b76059a3b4..7ee8f5d166b 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/MarkerPerformanceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/MarkerPerformanceTest.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.perf; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/PropertyManagerPerformanceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/PropertyManagerPerformanceTest.java index 7c1dbb4f7e2..3b1637c8668 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/PropertyManagerPerformanceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/PropertyManagerPerformanceTest.java @@ -15,6 +15,7 @@ package org.eclipse.core.tests.resources.perf; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.util.ArrayList; import java.util.Arrays; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/WorkspacePerformanceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/WorkspacePerformanceTest.java index c9c9483671b..f107c7fe768 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/WorkspacePerformanceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/perf/WorkspacePerformanceTest.java @@ -15,6 +15,7 @@ package org.eclipse.core.tests.resources.perf; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.io.ByteArrayInputStream; import java.net.URI; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/RefreshJobTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/RefreshJobTest.java index e3cb1ac0395..14797524a18 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/RefreshJobTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/RefreshJobTest.java @@ -19,6 +19,7 @@ import static org.eclipse.core.internal.refresh.RefreshJob.MAX_RECURSION; import static org.eclipse.core.internal.refresh.RefreshJob.SLOW_REFRESH_THRESHOLD; import static org.eclipse.core.internal.refresh.RefreshJob.UPDATE_DELAY; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertArrayEquals; import java.lang.reflect.Field; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/RefreshProviderTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/RefreshProviderTest.java index b8e9b92fb1a..5d4c8f85001 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/RefreshProviderTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/refresh/RefreshProviderTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.refresh; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import java.util.HashMap; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_025457.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_025457.java index 1d6732f4a5e..34fce5403d9 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_025457.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_025457.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.regression; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import java.io.ByteArrayInputStream; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_026294.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_026294.java index beb7239636d..6e6b9a58e96 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_026294.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_026294.java @@ -18,6 +18,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import java.io.InputStream; 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 8c31e130379..b82882e7615 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 @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.regression; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.resources.IPathVariableManager; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_028981.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_028981.java index b86f4d6c13e..e19303a13ac 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_028981.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_028981.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.regression; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import org.eclipse.core.resources.IContainer; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_029116.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_029116.java index 8f997736dbd..4a3ad80f646 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_029116.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_029116.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.regression; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.runtime.CoreException; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_029671.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_029671.java index 6d9f8bc5ce2..ed16c2bb286 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_029671.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_029671.java @@ -15,6 +15,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; 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/regression/Bug_029851.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_029851.java index 0f56d76279a..ad1222ca55e 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_029851.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_029851.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.regression; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import java.util.ArrayList; import java.util.Collection; import org.eclipse.core.resources.IResourceVisitor; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_032076.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_032076.java index 3bba59a19fb..2193bd0a487 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_032076.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_032076.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.regression; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import java.io.InputStream; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_044106.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_044106.java index 8e4f3f31d34..b6742a22b36 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_044106.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_044106.java @@ -18,6 +18,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.createFile; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.io.IOException; import org.eclipse.core.filesystem.IFileStore; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_079398.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_079398.java index 4b6d895f568..6969cacb968 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_079398.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_079398.java @@ -15,6 +15,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import org.eclipse.core.internal.localstore.IHistoryStore; import org.eclipse.core.internal.resources.Workspace; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_098740.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_098740.java index 6744b26971b..1094bbd1e7d 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_098740.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_098740.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.regression; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import org.eclipse.core.resources.IProject; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_126104.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_126104.java index c325fb9ab0c..0663692afc7 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_126104.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_126104.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.regression; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import org.eclipse.core.filesystem.EFS; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_127562.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_127562.java index 3d4931ef70b..5ec6f127199 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_127562.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_127562.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.regression; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_147232.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_147232.java index c0bf303cbf9..74a36c14f9d 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_147232.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_147232.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.regression; import static org.eclipse.core.tests.resources.ResourceTestUtil.create; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_160251.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_160251.java index 24609362ab9..9f55e2dba66 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_160251.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_160251.java @@ -15,6 +15,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.createFile; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import org.eclipse.core.filesystem.EFS; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_165892.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_165892.java index 97acd499edb..62c2a9cd604 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_165892.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_165892.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.regression; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; 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/regression/Bug_264182.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_264182.java index a058c593a9f..bf46b84ca5e 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_264182.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_264182.java @@ -15,6 +15,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.createFile; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import org.eclipse.core.filesystem.IFileStore; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_265810.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_265810.java index 722f589ce23..86d422fdac2 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_265810.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_265810.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.regression; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_297635.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_297635.java index b7a497eb239..7494776c223 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_297635.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_297635.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.regression; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_303517.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_303517.java index 19e6fe55552..2f2d9d6d696 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_303517.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_303517.java @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.regression; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import java.io.File; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_378156.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_378156.java index 581c854930e..36a4658dc3c 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_378156.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_378156.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.regression; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.util.concurrent.Semaphore; import org.eclipse.core.resources.ICommand; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_530868.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_530868.java index a24786c975e..7caef5e167b 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_530868.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_530868.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.regression; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertNotEquals; import java.io.ByteArrayInputStream; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IFileTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IFileTest.java index 5073af0f2b4..40f7da914cd 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IFileTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IFileTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.regression; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import org.eclipse.core.resources.IFile; 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 a4a489a71a4..b7f7f6b2a45 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 @@ -15,6 +15,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import org.eclipse.core.filesystem.EFS; 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 3d9cb6a383f..b1ddc91cddd 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 @@ -16,6 +16,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.createFile; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import org.eclipse.core.resources.ICommand; 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 56338fdfdbb..f9e6f14c88c 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 @@ -17,6 +17,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.createFile; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import static org.junit.Assert.assertThrows; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IWorkspaceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IWorkspaceTest.java index 3d4fdadae68..93aeed6e6bf 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IWorkspaceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IWorkspaceTest.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.regression; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.internal.resources.Workspace; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFileState; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/LocalStoreRegressionTests.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/LocalStoreRegressionTests.java index 09185ad3787..896eadb888e 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/LocalStoreRegressionTests.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/LocalStoreRegressionTests.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.regression; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInFileSystem; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/NLTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/NLTest.java index f92b7601eb3..ec706574a37 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/NLTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/NLTest.java @@ -17,6 +17,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import java.util.ArrayList; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/PR_1GEAB3C_Test.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/PR_1GEAB3C_Test.java index 6ec9ff5b157..fed5af2b545 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/PR_1GEAB3C_Test.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/PR_1GEAB3C_Test.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.regression; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.internal.preferences.EclipsePreferences; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/PR_1GH2B0N_Test.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/PR_1GH2B0N_Test.java index 3c0b0425514..4376d91e68d 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/PR_1GH2B0N_Test.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/PR_1GH2B0N_Test.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.regression; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.runtime.CoreException; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/PR_1GHOM0N_Test.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/PR_1GHOM0N_Test.java index 61a6f426957..28b8a9f1e5d 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/PR_1GHOM0N_Test.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/PR_1GHOM0N_Test.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.regression; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.resources.ICommand; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/TestMultipleBuildersOfSameType.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/TestMultipleBuildersOfSameType.java index f67f8ecbeed..1525e96d5d6 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/TestMultipleBuildersOfSameType.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/TestMultipleBuildersOfSameType.java @@ -15,6 +15,7 @@ package org.eclipse.core.tests.resources.regression; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.io.ByteArrayInputStream; import java.util.Map; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/Bug_266907.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/Bug_266907.java index 224382c290e..e93b1b2eb08 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/Bug_266907.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/Bug_266907.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.session; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.transferStreams; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/FindDeletedMembersTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/FindDeletedMembersTest.java index 42c8817e88c..1db38ddb7cf 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/FindDeletedMembersTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/FindDeletedMembersTest.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.session; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import java.util.Arrays; import java.util.List; import junit.framework.Test; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/ProjectDescriptionDynamicTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/ProjectDescriptionDynamicTest.java index 912130574ed..8d2a9c63173 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/ProjectDescriptionDynamicTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/ProjectDescriptionDynamicTest.java @@ -13,6 +13,8 @@ ******************************************************************************/ package org.eclipse.core.tests.resources.session; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import junit.framework.Test; import org.eclipse.core.resources.*; import org.eclipse.core.tests.resources.AutomatedResourceTests; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/ProjectPreferenceSessionTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/ProjectPreferenceSessionTest.java index f710786e3a9..0b0ab129035 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/ProjectPreferenceSessionTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/ProjectPreferenceSessionTest.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.session; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import junit.framework.Test; import org.eclipse.core.resources.IFile; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/Test1GALH44.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/Test1GALH44.java index beff2cef729..5da097e34bd 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/Test1GALH44.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/Test1GALH44.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.session; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import junit.framework.Test; import org.eclipse.core.resources.ICommand; import org.eclipse.core.resources.IFile; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug113943.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug113943.java index 02583a031d5..48458314dc3 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug113943.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug113943.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.session; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import junit.framework.Test; import org.eclipse.core.filesystem.EFS; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug20127.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug20127.java index c738980f03b..bcaf0558313 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug20127.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug20127.java @@ -15,6 +15,7 @@ package org.eclipse.core.tests.resources.session; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.util.Map; import junit.framework.Test; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug208833.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug208833.java index a1ca4ffd261..021c156e1ee 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug208833.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug208833.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.session; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.io.File; import junit.framework.Test; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug294854.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug294854.java index ddf51f4149b..2ba0fb3d036 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug294854.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug294854.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.session; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import junit.framework.Test; import junit.framework.TestSuite; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug30015.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug30015.java index 5d4f309bbba..c7ea2d4f6d3 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug30015.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug30015.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.session; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import junit.framework.Test; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug426263.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug426263.java index f75d474b2a3..72c1748471d 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug426263.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug426263.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.session; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import junit.framework.Test; import org.eclipse.core.resources.IPathVariableManager; import org.eclipse.core.tests.resources.AutomatedResourceTests; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug6995.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug6995.java index 62ea359ab59..e81d18549ff 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug6995.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug6995.java @@ -14,6 +14,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.session; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import java.util.Map; import junit.framework.Test; import org.eclipse.core.resources.ICommand; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug93473.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug93473.java index 98470deead4..2c178ccb07d 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug93473.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBug93473.java @@ -15,6 +15,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import junit.framework.Test; import org.eclipse.core.internal.resources.ContentDescriptionManager; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBuilderDeltaSerialization.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBuilderDeltaSerialization.java index 10e965a2caa..8c09e39bcd4 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBuilderDeltaSerialization.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestBuilderDeltaSerialization.java @@ -15,6 +15,7 @@ package org.eclipse.core.tests.resources.session; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.io.ByteArrayInputStream; import java.util.Map; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestInterestingProjectPersistence.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestInterestingProjectPersistence.java index 837a9c946e3..548aa43f235 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestInterestingProjectPersistence.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestInterestingProjectPersistence.java @@ -15,6 +15,7 @@ package org.eclipse.core.tests.resources.session; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.util.ArrayList; import java.util.Map; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestMasterTableCleanup.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestMasterTableCleanup.java index 2111590d7bf..12e353bf808 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestMasterTableCleanup.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestMasterTableCleanup.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.session; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import java.util.Properties; import junit.framework.Test; import org.eclipse.core.internal.resources.TestingSupport; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestMissingBuilder.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestMissingBuilder.java index 7dbd60403e4..41331144b04 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestMissingBuilder.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestMissingBuilder.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.session; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestMultiSnap.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestMultiSnap.java index 87d97d578f1..01d603a9263 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestMultiSnap.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestMultiSnap.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.session; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import junit.framework.Test; import org.eclipse.core.resources.IFile; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestSaveSnap.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestSaveSnap.java index 7d06f3d71a4..ebc7e0ebaa3 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestSaveSnap.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestSaveSnap.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.session; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.io.ByteArrayInputStream; import junit.framework.Test; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestSnapSaveSnap.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestSnapSaveSnap.java index 5f609200249..e5fd2713969 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestSnapSaveSnap.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/TestSnapSaveSnap.java @@ -14,6 +14,7 @@ package org.eclipse.core.tests.resources.session; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.io.ByteArrayInputStream; import junit.framework.Test; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/WorkspaceSerializationTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/WorkspaceSerializationTest.java index 22c5db2bd96..258445b3b4d 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/WorkspaceSerializationTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/session/WorkspaceSerializationTest.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.session; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.tests.resources.WorkspaceSessionTest; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/ConcurrencyPerformanceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/ConcurrencyPerformanceTest.java index fbabf6c7120..932743b62b4 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/ConcurrencyPerformanceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/ConcurrencyPerformanceTest.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.usecase; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.tests.harness.PerformanceTestRunner; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/ConcurrencyTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/ConcurrencyTest.java index 9a92e816a5a..24b9eaca9eb 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/ConcurrencyTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/ConcurrencyTest.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.usecase; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.removeFromWorkspace; import org.eclipse.core.resources.IProject; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/HistoryStorePerformanceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/HistoryStorePerformanceTest.java index 44d32840e77..8dc8d10153d 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/HistoryStorePerformanceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/HistoryStorePerformanceTest.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.usecase; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.resources.*; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.tests.resources.ResourceTest; 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 6d8e497f2b9..59891ff1549 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 @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.usecase; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.arrayWithSize; import static org.hamcrest.Matchers.is; 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 38fb7f45f89..e11f9f1a708 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 @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.usecase; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.arrayWithSize; import static org.hamcrest.Matchers.is; 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 59a16f89a83..26a14cb4935 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 @@ -14,6 +14,7 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.usecase; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.arrayWithSize; import static org.hamcrest.Matchers.is; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IResourceTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IResourceTest.java index 4332249074c..f9c94bf45eb 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IResourceTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IResourceTest.java @@ -13,6 +13,7 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.usecase; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import static org.junit.Assert.assertThrows; import org.eclipse.core.resources.IResource; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IWorkspaceRunnableUseCaseTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IWorkspaceRunnableUseCaseTest.java index 0273c706722..f8ce1598248 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IWorkspaceRunnableUseCaseTest.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/IWorkspaceRunnableUseCaseTest.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.core.tests.resources.usecase; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; + import org.eclipse.core.resources.ICommand; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot1Test.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot1Test.java index 6d01e96a6b3..6c96316f076 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot1Test.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot1Test.java @@ -16,6 +16,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot2Test.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot2Test.java index 6f6dd83b149..29728bcab61 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot2Test.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot2Test.java @@ -17,6 +17,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.util.ArrayList; import java.util.Arrays; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot3Test.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot3Test.java index 9b2d8deb053..3dcb3bbb702 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot3Test.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot3Test.java @@ -15,6 +15,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot4Test.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot4Test.java index 3df848451bf..640c65ae833 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot4Test.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot4Test.java @@ -18,6 +18,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.util.ArrayList; import java.util.Arrays; diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot5Test.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot5Test.java index f6b74f21799..96e6604e44f 100644 --- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot5Test.java +++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/usecase/Snapshot5Test.java @@ -17,6 +17,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; diff --git a/team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java b/team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java index 9340d5c09eb..1e03db017a1 100644 --- a/team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java +++ b/team/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java @@ -15,6 +15,7 @@ import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem; import static org.eclipse.core.tests.resources.ResourceTestUtil.ensureExistsInWorkspace; +import static org.eclipse.core.tests.resources.ResourceTestUtil.getWorkspace; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream;