Skip to content

Commit 753acd6

Browse files
HeikoKlareakurtakov
HeikoKlare
authored and
akurtakov
committed
Remove duplicate resource test plugin name constant
The same constant was represented in AutomatedResourceTests as well as ResourceTestPluginConstants. Since the former is only a test suite, the constant is removed from there.
1 parent 21eeb31 commit 753acd6

Some content is hidden

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

48 files changed

+159
-100
lines changed

‎resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/builders/ParallelBuildChainTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,8 @@ protected IStatus run(IProgressMonitor monitor) {
442442
project.build(IncrementalProjectBuilder.FULL_BUILD, getMonitor());
443443
return Status.OK_STATUS;
444444
} catch (CoreException e) {
445-
return new Status(IStatus.ERROR, PI_RESOURCES_TESTS, e.getMessage(), e);
445+
return new Status(IStatus.ERROR, PI_RESOURCES_TESTS, e.getMessage(),
446+
e);
446447
}
447448

448449
}

‎resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/events/BuildProjectFromMultipleJobsTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
*******************************************************************************/
1414
package org.eclipse.core.tests.internal.events;
1515

16+
import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.PI_RESOURCES_TESTS;
17+
1618
import java.util.ArrayList;
1719
import java.util.Arrays;
1820
import java.util.Collection;
@@ -34,7 +36,6 @@
3436
import org.eclipse.core.runtime.Status;
3537
import org.eclipse.core.runtime.jobs.Job;
3638
import org.eclipse.core.tests.internal.builders.ConfigurationBuilder;
37-
import org.eclipse.core.tests.resources.AutomatedResourceTests;
3839
import org.eclipse.core.tests.resources.ResourceTest;
3940
import org.eclipse.core.tests.resources.regression.SimpleBuilder;
4041

@@ -199,7 +200,7 @@ protected IStatus run(IProgressMonitor jobMonitor) {
199200
} catch (CoreException e) {
200201
return e.getStatus();
201202
}
202-
return new Status(IStatus.OK, AutomatedResourceTests.PI_RESOURCES_TESTS, getName() + " finished");
203+
return new Status(IStatus.OK, PI_RESOURCES_TESTS, getName() + " finished");
203204
}
204205

205206
@Override

‎resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/resources/WorkspacePreferencesTest.java‎

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

17+
import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.PI_RESOURCES_TESTS;
1718
import static org.hamcrest.MatcherAssert.assertThat;
1819
import static org.hamcrest.Matchers.is;
1920

@@ -30,7 +31,6 @@
3031
import org.eclipse.core.runtime.CoreException;
3132
import org.eclipse.core.runtime.IPath;
3233
import org.eclipse.core.runtime.Preferences;
33-
import org.eclipse.core.tests.resources.AutomatedResourceTests;
3434
import org.eclipse.core.tests.resources.WorkspaceSessionTest;
3535
import org.eclipse.core.tests.session.WorkspaceSessionTestSuite;
3636

@@ -282,7 +282,7 @@ public void assertEquals(String message, IWorkspaceDescription description1, IWo
282282
}
283283

284284
public static Test suite() {
285-
return new WorkspaceSessionTestSuite(AutomatedResourceTests.PI_RESOURCES_TESTS, WorkspacePreferencesTest.class);
285+
return new WorkspaceSessionTestSuite(PI_RESOURCES_TESTS, WorkspacePreferencesTest.class);
286286
}
287287

288288
}

‎resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/AutomatedResourceTests.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,4 @@
3737
org.eclipse.core.tests.internal.resources.AllInternalResourcesTests.class,
3838
org.eclipse.core.tests.resources.LinkedDotProjectTest.class })
3939
public class AutomatedResourceTests {
40-
public static final String PI_RESOURCES_TESTS = "org.eclipse.core.tests.resources"; //$NON-NLS-1$
4140
}

‎resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/ContentDescriptionTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@
1313
*******************************************************************************/
1414
package org.eclipse.core.tests.resources.content;
1515

16-
import static org.eclipse.core.tests.resources.AutomatedResourceTests.PI_RESOURCES_TESTS;
16+
import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.PI_RESOURCES_TESTS;
1717
import static org.junit.Assert.assertEquals;
1818
import static org.junit.Assert.assertFalse;
1919
import static org.junit.Assert.assertNull;
2020
import static org.junit.Assert.assertTrue;
2121
import static org.junit.Assert.fail;
2222

23-
import org.eclipse.core.internal.content.*;
23+
import org.eclipse.core.internal.content.ContentDescription;
24+
import org.eclipse.core.internal.content.ContentType;
25+
import org.eclipse.core.internal.content.ContentTypeHandler;
2426
import org.eclipse.core.runtime.Platform;
2527
import org.eclipse.core.runtime.QualifiedName;
2628
import org.eclipse.core.runtime.content.IContentDescription;

‎resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/ContentTypeTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
*******************************************************************************/
1414
package org.eclipse.core.tests.resources.content;
1515

16+
import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.PI_RESOURCES_TESTS;
17+
1618
import java.io.ByteArrayInputStream;
1719
import java.io.InputStream;
1820
import org.eclipse.core.runtime.Platform;
19-
import org.eclipse.core.tests.resources.AutomatedResourceTests;
2021
import org.osgi.framework.BundleContext;
2122

2223
/**
@@ -26,7 +27,7 @@ public abstract class ContentTypeTest {
2627
public static final String TEST_FILES_ROOT = "Plugin_Testing/";
2728

2829
public BundleContext getContext() {
29-
return Platform.getBundle(AutomatedResourceTests.PI_RESOURCES_TESTS).getBundleContext();
30+
return Platform.getBundle(PI_RESOURCES_TESTS).getBundleContext();
3031
}
3132

3233
/**

‎resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/IContentTypeManagerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*******************************************************************************/
1515
package org.eclipse.core.tests.resources.content;
1616

17-
import static org.eclipse.core.tests.resources.AutomatedResourceTests.PI_RESOURCES_TESTS;
17+
import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.PI_RESOURCES_TESTS;
1818
import static org.junit.Assert.assertEquals;
1919
import static org.junit.Assert.assertFalse;
2020
import static org.junit.Assert.assertNotNull;

‎resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/LocalSelectionPolicy.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313
*******************************************************************************/
1414
package org.eclipse.core.tests.resources.content;
1515

16+
import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.PI_RESOURCES_TESTS;
17+
1618
import java.util.ArrayList;
1719
import java.util.List;
1820
import org.eclipse.core.runtime.Platform;
1921
import org.eclipse.core.runtime.content.IContentType;
2022
import org.eclipse.core.runtime.content.IContentTypeManager.ISelectionPolicy;
21-
import org.eclipse.core.tests.resources.AutomatedResourceTests;
2223

2324
/**
2425
* Selection policy that filters out any content types that do not
@@ -30,7 +31,8 @@ public IContentType[] select(IContentType[] candidates, boolean fileName, boolea
3031
List<IContentType> result = new ArrayList<>(candidates.length);
3132
for (IContentType candidate : candidates) {
3233
String namespace = getNamespace(candidate.getId());
33-
if (namespace.equals(AutomatedResourceTests.PI_RESOURCES_TESTS) || namespace.equals(Platform.PI_RUNTIME)) {
34+
if (namespace.equals(PI_RESOURCES_TESTS)
35+
|| namespace.equals(Platform.PI_RUNTIME)) {
3436
result.add(candidate);
3537
}
3638
}

‎resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/MyContentDescriber.java‎

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

16-
import static org.eclipse.core.tests.resources.AutomatedResourceTests.PI_RESOURCES_TESTS;
16+
import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.PI_RESOURCES_TESTS;
1717

1818
import java.io.IOException;
1919
import java.io.InputStream;

‎resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/TestBug94498.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,22 @@
1313
*******************************************************************************/
1414
package org.eclipse.core.tests.resources.content;
1515

16+
import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.PI_RESOURCES_TESTS;
17+
1618
import junit.framework.Test;
1719
import junit.framework.TestCase;
1820
import org.eclipse.core.runtime.CoreException;
1921
import org.eclipse.core.runtime.Platform;
2022
import org.eclipse.core.runtime.content.IContentType;
2123
import org.eclipse.core.runtime.content.IContentTypeManager;
22-
import org.eclipse.core.tests.resources.AutomatedResourceTests;
2324
import org.eclipse.core.tests.session.WorkspaceSessionTestSuite;
2425

2526
public class TestBug94498 extends TestCase {
2627

2728
private static final String FILE_NAME = "foo.bar.zoo";
2829

2930
public static Test suite() {
30-
return new WorkspaceSessionTestSuite(AutomatedResourceTests.PI_RESOURCES_TESTS, TestBug94498.class);
31+
return new WorkspaceSessionTestSuite(PI_RESOURCES_TESTS, TestBug94498.class);
3132
}
3233

3334
public void test1() throws CoreException {

0 commit comments

Comments
 (0)