Skip to content

Commit 1addf09

Browse files
committed
Remove ResourceTest#getWorkspace() method #903
The method getWorkspace() in ResourceTest is only a convenience method delegating to ResourcePlugin#getWorkspace(). In order to clean up the inheritance hierarchy of ResourceTest for migration to JUnit 4, this change inlines the delegation. Contributes to #903
1 parent 776ef3f commit 1addf09

File tree

152 files changed

+240
-12
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+240
-12
lines changed

resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager1Test.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.eclipse.core.tests.resources.saveparticipant3.SaveParticipant3Plugin;
2626
import org.osgi.framework.Bundle;
2727
import org.osgi.framework.BundleException;
28+
import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
2829

2930
/**
3031
* This class needs to be used with SaveManager2Test. Basically this

resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager2Test.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
import junit.framework.Test;
3131
import junit.framework.TestSuite;
32+
import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
3233

3334
/**
3435
* @see SaveManager1Test

resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager3Test.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.eclipse.core.tests.resources.saveparticipant2.SaveParticipant2Plugin;
2424
import org.eclipse.core.tests.resources.saveparticipant3.SaveParticipant3Plugin;
2525
import org.osgi.framework.Bundle;
26+
import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
2627

2728
/**
2829
* @see SaveManager1Test

resources/tests/org.eclipse.core.tests.resources.saveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManagerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.eclipse.core.resources.*;
1717
import org.eclipse.core.runtime.CoreException;
1818
import org.eclipse.core.tests.resources.WorkspaceSessionTest;
19+
import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
1920

2021
/**
2122
* Runs all the SaveManager tests as a single session test.

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/FileStoreTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*******************************************************************************/
1414
package org.eclipse.core.tests.filesystem;
1515

16+
import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
1617
import static org.junit.Assert.assertThrows;
1718

1819
import java.io.File;

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/alias/BasicAliasTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
*******************************************************************************/
1515
package org.eclipse.core.tests.internal.alias;
1616

17+
import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
1718
import static org.junit.Assert.assertNotEquals;
1819
import static org.junit.Assert.assertThrows;
1920

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/alias/SyncAliasTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
*******************************************************************************/
1515
package org.eclipse.core.tests.internal.alias;
1616

17+
import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
18+
1719
import java.io.File;
1820
import java.io.FileOutputStream;
1921
import java.io.IOException;

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/AbstractBuilderTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
*******************************************************************************/
1515
package org.eclipse.core.tests.internal.builders;
1616

17+
import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
18+
1719
import java.util.Map;
1820
import java.util.stream.Stream;
1921
import org.eclipse.core.resources.ICommand;

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/AutoBuildJobTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
*******************************************************************************/
1414
package org.eclipse.core.tests.internal.builders;
1515

16+
import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
1617
import static org.junit.Assert.assertThrows;
1718

1819
import java.util.Map;

resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/BuildConfigurationsTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
******************************************************************************/
1515
package org.eclipse.core.tests.internal.builders;
1616

17+
import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
18+
1719
import java.util.Map;
1820
import org.eclipse.core.resources.IBuildConfiguration;
1921
import org.eclipse.core.resources.ICommand;

0 commit comments

Comments
 (0)