Bug 558441: Update tests of base.core to use JUnit 5 jupiter
Change-Id: I73a90a5c8e17dec858362b706bcde722627c9838
diff --git a/docmlet/org.eclipse.statet.docmlet.base.core-tests/META-INF/MANIFEST.MF b/docmlet/org.eclipse.statet.docmlet.base.core-tests/META-INF/MANIFEST.MF
index 9ac86b8..00e7907 100644
--- a/docmlet/org.eclipse.statet.docmlet.base.core-tests/META-INF/MANIFEST.MF
+++ b/docmlet/org.eclipse.statet.docmlet.base.core-tests/META-INF/MANIFEST.MF
@@ -6,4 +6,4 @@
Bundle-Name: StatET DocMLET - Base - Core - Tests (Incubation)
Fragment-Host: org.eclipse.statet.docmlet.base.core
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="4.12.0"
+Import-Package: org.junit.jupiter.api;bundle-version="5.5.1"
diff --git a/docmlet/org.eclipse.statet.docmlet.base.core-tests/src/org/eclipse/statet/docmlet/base/core/DocmlSearchPatternLabelTest.java b/docmlet/org.eclipse.statet.docmlet.base.core-tests/src/org/eclipse/statet/docmlet/base/core/DocmlSearchPatternLabelTest.java
index c9db841..e731de6 100644
--- a/docmlet/org.eclipse.statet.docmlet.base.core-tests/src/org/eclipse/statet/docmlet/base/core/DocmlSearchPatternLabelTest.java
+++ b/docmlet/org.eclipse.statet.docmlet.base.core-tests/src/org/eclipse/statet/docmlet/base/core/DocmlSearchPatternLabelTest.java
@@ -14,15 +14,15 @@
package org.eclipse.statet.docmlet.base.core;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.eclipse.statet.jcommons.text.core.SearchPattern.PREFIX_MATCH;
import static org.eclipse.statet.jcommons.text.core.SearchPattern.SUBSTRING_MATCH;
import static org.eclipse.statet.docmlet.base.core.DocmlSearchPattern.LABEL_SUBSTRING_MATCH;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
import org.eclipse.statet.jcommons.text.core.SearchPattern;
diff --git a/docmlet/org.eclipse.statet.docmlet.base.core-tests/src/org/eclipse/statet/docmlet/base/core/DocmlSearchPatternTest.java b/docmlet/org.eclipse.statet.docmlet.base.core-tests/src/org/eclipse/statet/docmlet/base/core/DocmlSearchPatternTest.java
index 56e9994..1dbf68c 100644
--- a/docmlet/org.eclipse.statet.docmlet.base.core-tests/src/org/eclipse/statet/docmlet/base/core/DocmlSearchPatternTest.java
+++ b/docmlet/org.eclipse.statet.docmlet.base.core-tests/src/org/eclipse/statet/docmlet/base/core/DocmlSearchPatternTest.java
@@ -14,14 +14,14 @@
package org.eclipse.statet.docmlet.base.core;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.eclipse.statet.jcommons.text.core.SearchPattern.PREFIX_MATCH;
import static org.eclipse.statet.jcommons.text.core.SearchPattern.SUBSTRING_MATCH;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
import org.eclipse.statet.jcommons.text.core.SearchPattern;
@@ -29,7 +29,7 @@
@NonNullByDefault
public class DocmlSearchPatternTest {
- // Copy of DocmlSearchPatternTest
+ // Copy of org.eclipse.statet.jcommons.text.core.SearchPatternTest
public DocmlSearchPatternTest() {
