Update tests to JUnit Jupiter 5
Change-Id: I894df6a3efbad6467af46685aea222f7d37ec8b5
diff --git a/core/org.eclipse.statet.rj.services.core-tests/META-INF/MANIFEST.MF b/core/org.eclipse.statet.rj.services.core-tests/META-INF/MANIFEST.MF
index 3d89ddd..a8af9e5 100644
--- a/core/org.eclipse.statet.rj.services.core-tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.statet.rj.services.core-tests/META-INF/MANIFEST.MF
@@ -7,4 +7,4 @@
Bundle-Name: StatET RJ - R Services API and Tools - Tests (Incubation)
Fragment-Host: org.eclipse.statet.rj.services.core
Bundle-RequiredExecutionEnvironment: JavaSE-11
-Require-Bundle: org.junit;bundle-version="4.12.0"
+Require-Bundle: org.junit.jupiter.api;bundle-version="[5.6.0,6.0.0)"
diff --git a/core/org.eclipse.statet.rj.services.core-tests/src/org/eclipse/statet/rj/renv/core/BasicREnvConfigurationTest.java b/core/org.eclipse.statet.rj.services.core-tests/src/org/eclipse/statet/rj/renv/core/BasicREnvConfigurationTest.java
index f57341b..80c8baf 100644
--- a/core/org.eclipse.statet.rj.services.core-tests/src/org/eclipse/statet/rj/renv/core/BasicREnvConfigurationTest.java
+++ b/core/org.eclipse.statet.rj.services.core-tests/src/org/eclipse/statet/rj/renv/core/BasicREnvConfigurationTest.java
@@ -14,14 +14,14 @@
package org.eclipse.statet.rj.renv.core;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
import org.eclipse.statet.jcommons.lang.SystemUtils;
diff --git a/core/org.eclipse.statet.rj.services.core-tests/src/org/eclipse/statet/rj/services/util/dataaccess/LazyRStoreTest.java b/core/org.eclipse.statet.rj.services.core-tests/src/org/eclipse/statet/rj/services/util/dataaccess/LazyRStoreTest.java
index c9bdd85..a7041dd 100644
--- a/core/org.eclipse.statet.rj.services.core-tests/src/org/eclipse/statet/rj/services/util/dataaccess/LazyRStoreTest.java
+++ b/core/org.eclipse.statet.rj.services.core-tests/src/org/eclipse/statet/rj/services/util/dataaccess/LazyRStoreTest.java
@@ -14,9 +14,9 @@
package org.eclipse.statet.rj.services.util.dataaccess;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
import static org.eclipse.statet.jcommons.lang.ObjectUtils.nonNullAssert;
@@ -24,7 +24,7 @@
import java.util.Random;
import java.util.concurrent.atomic.AtomicReference;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.eclipse.statet.jcommons.lang.NonNullByDefault;
import org.eclipse.statet.jcommons.lang.Nullable;
@@ -302,14 +302,14 @@
try {
final Fragment<TestElement> fragment= this.store.getFragment(rowIdx, colIdx, 0, m);
if (expectedPrefix != null) {
- assertNotNull(id, fragment);
+ assertNotNull(fragment, id);
final TestElement rObject= fragment.getRObject();
- assertNotNull(id, rObject);
+ assertNotNull(rObject, id);
assertEquals(toKey(expectedPrefix, rowIdx, colIdx),
rObject.get(fragment.toLocalRowIdx(rowIdx), fragment.toLocalColumnIdx(colIdx)) );
}
else {
- assertNull(id, fragment);
+ assertNull(fragment, id);
}
}
catch (final RuntimeException e) {
