Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/MergeContributionTest.java')
-rw-r--r--bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/MergeContributionTest.java27
1 files changed, 14 insertions, 13 deletions
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/MergeContributionTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/MergeContributionTest.java
index eb8662469..b3642bab8 100644
--- a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/MergeContributionTest.java
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/MergeContributionTest.java
@@ -13,7 +13,16 @@
*******************************************************************************/
package org.eclipse.equinox.common.tests.registry.simple;
-import org.eclipse.core.runtime.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
+
+import org.eclipse.core.runtime.ContributorFactorySimple;
+import org.eclipse.core.runtime.IContributor;
+import org.eclipse.core.runtime.IExtension;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.junit.Test;
/**
* Tests merging static and dynamic contributions.
@@ -21,16 +30,8 @@ import org.eclipse.core.runtime.*;
* @since 3.2
*/
public class MergeContributionTest extends BaseExtensionRegistryRun {
-
- public MergeContributionTest() {
- super();
- }
-
- public MergeContributionTest(String name) {
- super(name);
- }
-
- public void testMergeStaticDynamic() {
+ @Test
+ public void testMergeStaticDynamic() throws IOException {
// Test with non-bundle contributor
IContributor nonBundleContributor = ContributorFactorySimple.createContributor("ABC"); //$NON-NLS-1$
String namespace = nonBundleContributor.getName();
@@ -48,11 +49,11 @@ public class MergeContributionTest extends BaseExtensionRegistryRun {
checkRegistry(namespace, 6);
}
- private void fillRegistryStatic(IContributor contributor) {
+ private void fillRegistryStatic(IContributor contributor) throws IOException {
processXMLContribution(contributor, getXML("MergeStatic.xml"), true); //$NON-NLS-1$
}
- private void fillRegistryDynamic(IContributor contributor) {
+ private void fillRegistryDynamic(IContributor contributor) throws IOException {
processXMLContribution(contributor, getXML("MergeDynamic.xml"), false); //$NON-NLS-1$
}

Back to the top