diff --git a/ds/org.eclipse.pde.ds.annotations.tests/META-INF/MANIFEST.MF b/ds/org.eclipse.pde.ds.annotations.tests/META-INF/MANIFEST.MF index 4e7f0102f49..195d46f6a6a 100644 --- a/ds/org.eclipse.pde.ds.annotations.tests/META-INF/MANIFEST.MF +++ b/ds/org.eclipse.pde.ds.annotations.tests/META-INF/MANIFEST.MF @@ -12,9 +12,14 @@ Require-Bundle: org.eclipse.pde.ds.annotations;bundle-version="[1.1.0,1.5.0)", org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)", org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)", - org.eclipse.text;bundle-version="[3.6.0,4.0.0)" + org.eclipse.text;bundle-version="[3.6.0,4.0.0)", + org.osgi.annotation.bundle;bundle-version="[2.0.0,3.0.0)", + org.osgi.annotation.versioning;bundle-version="[1.1.0,2.0.0)", + org.osgi.service.component.annotations;bundle-version="[1.5.0,2.0.0)", + org.osgi.service.metatype.annotations;bundle-version="[1.2.0,2.0.0)" Export-Package: org.eclipse.pde.ds.internal.annotations.tests;x-internal:=true -Import-Package: org.junit.jupiter.api;version="[5.14.0,6.0.0)", +Import-Package: org.assertj.core.api;version="[3.27.0,4.0.0)", + org.junit.jupiter.api;version="[5.14.0,6.0.0)", org.junit.platform.suite.api;version="[1.14.0,2.0.0)" Eclipse-BundleShape: dir Bundle-ClassPath: tests.jar diff --git a/ds/org.eclipse.pde.ds.annotations.tests/projects/test1/test.project b/ds/org.eclipse.pde.ds.annotations.tests/projects/test1/test.project index cf724e7d7af..7af19aa440f 100644 --- a/ds/org.eclipse.pde.ds.annotations.tests/projects/test1/test.project +++ b/ds/org.eclipse.pde.ds.annotations.tests/projects/test1/test.project @@ -20,6 +20,11 @@ + + org.eclipse.pde.ds.core.builder + + + org.eclipse.pde.PluginNature diff --git a/ds/org.eclipse.pde.ds.annotations.tests/projects/test2/test.project b/ds/org.eclipse.pde.ds.annotations.tests/projects/test2/test.project index b2db9029cd4..2226eda3595 100644 --- a/ds/org.eclipse.pde.ds.annotations.tests/projects/test2/test.project +++ b/ds/org.eclipse.pde.ds.annotations.tests/projects/test2/test.project @@ -20,6 +20,11 @@ + + org.eclipse.pde.ds.core.builder + + + org.eclipse.pde.PluginNature diff --git a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/AllDSAnnotationsTests.java b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/AllDSAnnotationsTests.java index d9d604b01c5..17a89cd185d 100644 --- a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/AllDSAnnotationsTests.java +++ b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/AllDSAnnotationsTests.java @@ -5,7 +5,6 @@ import java.io.InputStream; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.Paths; import java.nio.file.StandardCopyOption; import java.util.Enumeration; import java.util.Map; @@ -56,7 +55,7 @@ public static void setUpBeforeClass() throws Exception { @Override public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException { // import test projects - Path wsRoot = Paths.get(ws.getRoot().getLocationURI()); + Path wsRoot = ws.getRoot().getLocation().toPath(); for (Map.Entry entry : projects.entrySet()) { IProject project = ws.getRoot().getProject(entry.getKey()); try { diff --git a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/AnnotationProcessorTest.java b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/AnnotationProcessorTest.java index 003e97cb037..f21faa9db12 100644 --- a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/AnnotationProcessorTest.java +++ b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/AnnotationProcessorTest.java @@ -1,21 +1,18 @@ package org.eclipse.pde.ds.internal.annotations.tests; -import static org.junit.Assume.assumeTrue; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; - import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.jface.text.Document; import org.eclipse.pde.internal.ds.core.IDSModel; import org.eclipse.pde.internal.ds.core.text.DSModel; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; @SuppressWarnings("restriction") public abstract class AnnotationProcessorTest extends TestBase { @@ -28,31 +25,23 @@ public abstract class AnnotationProcessorTest extends TestBase { protected abstract String getComponentDescriptorPath(); - @Before + @BeforeEach public void setUp() throws Exception { testProject = ResourcesPlugin.getWorkspace().getRoot().getProject(getTestProjectName()); - assumeTrue("Test project does not exist!", testProject.exists()); + assertTrue(testProject.exists(), "Test project does not exist!"); IFile dsFile = testProject.getFile(IPath.fromOSString(getComponentDescriptorPath())); - assertTrue(dsFile.exists(),"Missing component descriptor!"); - - ByteArrayOutputStream buf = new ByteArrayOutputStream(); - try (InputStream src = dsFile.getContents()) { - byte[] bytes = new byte[4096]; - int c; - while ((c = src.read(bytes)) != -1) { - buf.write(bytes, 0, c); - } - } - - dsModel = new DSModel(new Document(buf.toString(dsFile.getCharset())), false); + dsFile.refreshLocal(IResource.DEPTH_ZERO, null); + assertTrue(dsFile.exists(), "Missing component descriptor:" + dsFile); + String dsFileContent = dsFile.readString(); + dsModel = new DSModel(new Document(dsFileContent), false); dsModel.setUnderlyingResource(dsFile); dsModel.load(); assertNotNull(dsModel.getDSComponent()); } - @After + @AfterEach public void tearDown() throws Exception { if (dsModel != null) { dsModel.dispose(); diff --git a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/CompilationParticipantTest.java b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/CompilationParticipantTest.java index de1a074022d..1541e9d170a 100644 --- a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/CompilationParticipantTest.java +++ b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/CompilationParticipantTest.java @@ -1,10 +1,10 @@ package org.eclipse.pde.ds.internal.annotations.tests; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; -import org.junit.Before; +import org.junit.jupiter.api.BeforeEach; public abstract class CompilationParticipantTest extends TestBase { @@ -12,9 +12,9 @@ public abstract class CompilationParticipantTest extends TestBase { protected abstract String getTestProjectName(); - @Before + @BeforeEach public void setUp() { testProject = ResourcesPlugin.getWorkspace().getRoot().getProject(getTestProjectName()); - assumeTrue("Test project does not exist!", testProject.exists()); + assertTrue(testProject.exists(), "Test project does not exist!"); } } diff --git a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/FullComponentTest.java b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/FullComponentTest.java index 45cd7c49cfd..4fa7a3c7be1 100644 --- a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/FullComponentTest.java +++ b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/FullComponentTest.java @@ -4,8 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.Assume.assumeNotNull; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Map; import java.util.Set; @@ -110,9 +109,9 @@ public void componentProperties() throws Exception { @Test public void componentPropertyString() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 0; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("stringProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("stringValue", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("String", properties[PROPERTY_INDEX].getPropertyType()); @@ -122,9 +121,9 @@ public void componentPropertyString() throws Exception { @Test public void componentPropertyImplicitString() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 1; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("implicitStringProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("implicitStringValue", properties[PROPERTY_INDEX].getPropertyValue()); assertNull(properties[PROPERTY_INDEX].getPropertyType()); @@ -134,9 +133,9 @@ public void componentPropertyImplicitString() throws Exception { @Test public void componentPropertyExplicitString() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 2; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("explicitStringProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("explicitStringValue", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("String", properties[PROPERTY_INDEX].getPropertyType()); @@ -146,9 +145,9 @@ public void componentPropertyExplicitString() throws Exception { @Test public void componentPropertyInteger() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 3; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("integerProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("1", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("Integer", properties[PROPERTY_INDEX].getPropertyType()); @@ -158,9 +157,9 @@ public void componentPropertyInteger() throws Exception { @Test public void componentPropertyLong() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 4; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("longProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("2", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("Long", properties[PROPERTY_INDEX].getPropertyType()); @@ -170,9 +169,9 @@ public void componentPropertyLong() throws Exception { @Test public void componentPropertyShort() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 5; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("shortProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("3", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("Short", properties[PROPERTY_INDEX].getPropertyType()); @@ -182,9 +181,9 @@ public void componentPropertyShort() throws Exception { @Test public void componentPropertyByte() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 6; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("byteProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("4", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("Byte", properties[PROPERTY_INDEX].getPropertyType()); @@ -194,9 +193,9 @@ public void componentPropertyByte() throws Exception { @Test public void componentPropertyCharacter() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 7; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("characterProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("5", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("Character", properties[PROPERTY_INDEX].getPropertyType()); @@ -206,9 +205,9 @@ public void componentPropertyCharacter() throws Exception { @Test public void componentPropertyFloat() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 8; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("floatProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("6.7", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("Float", properties[PROPERTY_INDEX].getPropertyType()); @@ -218,9 +217,9 @@ public void componentPropertyFloat() throws Exception { @Test public void componentPropertyDouble() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 9; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("doubleProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("8.9", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("Double", properties[PROPERTY_INDEX].getPropertyType()); @@ -230,9 +229,9 @@ public void componentPropertyDouble() throws Exception { @Test public void componentPropertyImplicitStringArray() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 10; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("implicitStringArrayProperty", properties[PROPERTY_INDEX].getPropertyName()); assertNull(properties[PROPERTY_INDEX].getPropertyValue()); assertNull(properties[PROPERTY_INDEX].getPropertyType()); @@ -242,9 +241,9 @@ public void componentPropertyImplicitStringArray() throws Exception { @Test public void componentPropertyExplicitStringArray() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 11; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("explicitStringArrayProperty", properties[PROPERTY_INDEX].getPropertyName()); assertNull(properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("String", properties[PROPERTY_INDEX].getPropertyType()); diff --git a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/FullComponentTestV1_2.java b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/FullComponentTestV1_2.java index bfb819044bc..3ee5c647b2c 100644 --- a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/FullComponentTestV1_2.java +++ b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/FullComponentTestV1_2.java @@ -4,8 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.Assume.assumeNotNull; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Map; import java.util.Set; @@ -110,9 +109,9 @@ public void componentProperties() throws Exception { @Test public void componentPropertyImplicitString() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 0; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("implicitStringProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("implicitStringValue", properties[PROPERTY_INDEX].getPropertyValue()); assertNull(properties[PROPERTY_INDEX].getPropertyType()); @@ -122,9 +121,9 @@ public void componentPropertyImplicitString() throws Exception { @Test public void componentPropertyExplicitString() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 1; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("explicitStringProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("explicitStringValue", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("String", properties[PROPERTY_INDEX].getPropertyType()); @@ -134,9 +133,9 @@ public void componentPropertyExplicitString() throws Exception { @Test public void componentPropertyInteger() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 2; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("integerProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("1", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("Integer", properties[PROPERTY_INDEX].getPropertyType()); @@ -146,9 +145,9 @@ public void componentPropertyInteger() throws Exception { @Test public void componentPropertyLong() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 3; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("longProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("2", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("Long", properties[PROPERTY_INDEX].getPropertyType()); @@ -158,9 +157,9 @@ public void componentPropertyLong() throws Exception { @Test public void componentPropertyShort() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 4; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("shortProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("3", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("Short", properties[PROPERTY_INDEX].getPropertyType()); @@ -170,9 +169,9 @@ public void componentPropertyShort() throws Exception { @Test public void componentPropertyByte() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 5; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("byteProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("4", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("Byte", properties[PROPERTY_INDEX].getPropertyType()); @@ -182,9 +181,9 @@ public void componentPropertyByte() throws Exception { @Test public void componentPropertyCharacter() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 6; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("characterProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("5", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("Character", properties[PROPERTY_INDEX].getPropertyType()); @@ -194,9 +193,9 @@ public void componentPropertyCharacter() throws Exception { @Test public void componentPropertyFloat() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 7; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("floatProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("6.7", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("Float", properties[PROPERTY_INDEX].getPropertyType()); @@ -206,9 +205,9 @@ public void componentPropertyFloat() throws Exception { @Test public void componentPropertyDouble() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 8; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("doubleProperty", properties[PROPERTY_INDEX].getPropertyName()); assertEquals("8.9", properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("Double", properties[PROPERTY_INDEX].getPropertyType()); @@ -218,9 +217,9 @@ public void componentPropertyDouble() throws Exception { @Test public void componentPropertyImplicitStringArray() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 9; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("implicitStringArrayProperty", properties[PROPERTY_INDEX].getPropertyName()); assertNull(properties[PROPERTY_INDEX].getPropertyValue()); assertNull(properties[PROPERTY_INDEX].getPropertyType()); @@ -230,9 +229,9 @@ public void componentPropertyImplicitStringArray() throws Exception { @Test public void componentPropertyExplicitStringArray() throws Exception { IDSProperty[] properties = dsModel.getDSComponent().getPropertyElements(); - assumeNotNull((Object) properties); + assertNotNull(properties); final int PROPERTY_INDEX = 10; - assumeTrue(properties.length > PROPERTY_INDEX); + assertTrue(properties.length > PROPERTY_INDEX); assertEquals("explicitStringArrayProperty", properties[PROPERTY_INDEX].getPropertyName()); assertNull(properties[PROPERTY_INDEX].getPropertyValue()); assertEquals("String", properties[PROPERTY_INDEX].getPropertyType()); diff --git a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/ManagedProjectTest.java b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/ManagedProjectTest.java index 4b2f44481e0..40c47056921 100644 --- a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/ManagedProjectTest.java +++ b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/ManagedProjectTest.java @@ -1,7 +1,6 @@ package org.eclipse.pde.ds.internal.annotations.tests; -import static org.junit.Assume.assumeNotNull; -import static org.junit.Assume.assumeTrue; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -47,9 +46,9 @@ public void folderOSGIInfCreated() throws Exception { @Test public void manifestHeaderServiceComponentAdded() throws Exception { IPluginModelBase pluginModel = PluginRegistry.findModel(testProject); - assumeTrue("Test project not a bundle project!", pluginModel instanceof IBundlePluginModelBase); + assertThat(pluginModel).isExactlyInstanceOf(IBundlePluginModelBase.class); IBundleModel bundleModel = ((IBundlePluginModelBase) pluginModel).getBundleModel(); - assumeNotNull("Missing bundle manifest!", bundleModel); + assertNotNull(bundleModel, "Missing bundle manifest!"); String serviceComponentHeader = bundleModel.getBundle().getHeader("Service-Component"); assertNotNull("Missing Service-Component header!", serviceComponentHeader); String[] entries = serviceComponentHeader.split("\\s*,\\s*"); diff --git a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/TestBase.java b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/TestBase.java index 5409985a52b..daefbf4b486 100644 --- a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/TestBase.java +++ b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/TestBase.java @@ -1,13 +1,25 @@ package org.eclipse.pde.ds.internal.annotations.tests; -import org.junit.Before; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; public abstract class TestBase { protected static final String DS_PROBLEM_MARKER = "org.eclipse.pde.ds.annotations.problem"; - @Before + @BeforeAll + public static void setUpBeforeClass() throws Exception { + AllDSAnnotationsTests.setUpBeforeClass(); + } + + @BeforeEach public void ensureWorkspaceReady() throws Exception { AllDSAnnotationsTests.wsJob.join(); } + + @AfterAll + public static void tearDownAfterClass() throws Exception { + AllDSAnnotationsTests.tearDownAfterClass(); + } } diff --git a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/UnmanagedProjectTest.java b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/UnmanagedProjectTest.java index c3e03a3cd4d..45c1872f7f1 100644 --- a/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/UnmanagedProjectTest.java +++ b/ds/org.eclipse.pde.ds.annotations.tests/src/org/eclipse/pde/ds/internal/annotations/tests/UnmanagedProjectTest.java @@ -1,7 +1,7 @@ package org.eclipse.pde.ds.internal.annotations.tests; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.Assume.assumeTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; @@ -19,7 +19,7 @@ protected String getTestProjectName() { @Test public void managedProject() throws Exception { IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("ds.annotations.test0"); - assumeTrue(project.exists()); + assertTrue(project.exists()); assertFalse(DSAnnotationCompilationParticipant.isManaged(project)); } } diff --git a/ds/org.eclipse.pde.ds.annotations/META-INF/MANIFEST.MF b/ds/org.eclipse.pde.ds.annotations/META-INF/MANIFEST.MF index 51e4220f811..7da71696dfd 100644 --- a/ds/org.eclipse.pde.ds.annotations/META-INF/MANIFEST.MF +++ b/ds/org.eclipse.pde.ds.annotations/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.pde.ds.annotations;singleton:=true -Bundle-Version: 1.4.200.qualifier +Bundle-Version: 1.4.300.qualifier Bundle-Activator: org.eclipse.pde.ds.internal.annotations.Activator Bundle-Vendor: %Bundle-Vendor Require-Bundle: org.eclipse.ui;bundle-version="[3.105.0,4.0.0)", diff --git a/ds/org.eclipse.pde.ds.annotations/src/org/eclipse/pde/ds/internal/annotations/AnnotationVisitor.java b/ds/org.eclipse.pde.ds.annotations/src/org/eclipse/pde/ds/internal/annotations/AnnotationVisitor.java index faa42e79170..42ebb1fe0c9 100644 --- a/ds/org.eclipse.pde.ds.annotations/src/org/eclipse/pde/ds/internal/annotations/AnnotationVisitor.java +++ b/ds/org.eclipse.pde.ds.annotations/src/org/eclipse/pde/ds/internal/annotations/AnnotationVisitor.java @@ -54,7 +54,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Status; -import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.dom.ASTNode; import org.eclipse.jdt.core.dom.ASTVisitor; import org.eclipse.jdt.core.dom.AbstractTypeDeclaration; @@ -328,8 +327,9 @@ private Annotation findComponentAnnotation(AbstractTypeDeclaration type) { continue; } - - if (COMPONENT_ANNOTATION.equals(annotationBinding.getAnnotationType().getQualifiedName())) { + ITypeBinding annotationType = annotationBinding.getAnnotationType(); + String qualifiedName = annotationType.getQualifiedName(); + if (COMPONENT_ANNOTATION.equals(qualifiedName)) { return annotation; } } @@ -1629,7 +1629,7 @@ private String[] collectPropertiesFiles(String key, ITypeBinding typeBinding, An propertyFiles = list.toArray(new String[list.size()]); validateComponentPropertyFiles(key, annotation, - ((IType) typeBinding.getJavaElement()).getJavaProject().getProject(), propertyFiles); + typeBinding.getJavaElement().getJavaProject().getProject(), propertyFiles); } else { propertyFiles = new String[0]; } diff --git a/ds/pom.xml b/ds/pom.xml index b0109202b62..74727f240c4 100644 --- a/ds/pom.xml +++ b/ds/pom.xml @@ -24,6 +24,7 @@ org.eclipse.pde.ds.tests org.eclipse.pde.ds.ui org.eclipse.pde.ds.annotations + org.eclipse.pde.ds.annotations.tests