Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/command/AddPrimitivesCommandTest.java

Timestamp:

2020-10-28T20:41:00+01:00 (3 years ago)

Author:

Don-vip

Message:

see #16567 - upgrade almost all tests to JUnit 5, except those depending on WiremockRule

See ​https://github.com/tomakehurst/wiremock/issues/684

File:

• trunk/test/unit/org/openstreetmap/josm/command/AddPrimitivesCommandTest.java (modified) (15 diffs)

trunk/test/unit/org/openstreetmap/josm/command/AddPrimitivesCommandTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.command;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
@@ -12 +12 @@
 import java.util.List;
 
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -34 +34 @@
  * Unit tests of {@link AddPrimitivesCommand} class.
  */
-public class AddPrimitivesCommandTest {
+class AddPrimitivesCommandTest {
 
     /**
      * We need prefs for nodes.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules().preferences().i18n();
@@ -47 +47 @@
      */
     @Test
-    public void testAdd() {
+    void testAdd() {
         DataSet ds = new DataSet();
 
@@ -61 +61 @@
      */
     @Test
-    public void testAddSetSelection() {
+    void testAddSetSelection() {
         DataSet ds = new DataSet();
 
@@ -77 +77 @@
      */
     @Test
-    public void testAddToLayer() {
+    void testAddToLayer() {
         DataSet ds1 = new DataSet();
         DataSet ds2 = new DataSet();
@@ -95 +95 @@
      */
     @Test
-    public void testAddIgnoresExisting() {
+    void testAddIgnoresExisting() {
         DataSet ds = new DataSet();
 
@@ -114 +114 @@
      */
     @Test
-    public void testDescription() {
+    void testDescription() {
         DataSet ds = new DataSet();
 
@@ -138 +138 @@
      */
     @Test
-    public void testUndo() {
+    void testUndo() {
         DataSet ds = new DataSet();
 
@@ -172 +172 @@
      */
     @Test
-    public void testUndoIgnoresExisting() {
+    void testUndoIgnoresExisting() {
         DataSet ds = new DataSet();
 
@@ -208 +208 @@
      */
     @Test
-    public void testUndoIgnoresExistingAsDeleted() {
+    void testUndoIgnoresExistingAsDeleted() {
         DataSet ds = new DataSet();
 
@@ -243 +243 @@
      */
     @Test
-    public void testUndoIgnoresExistingSameUniqueIdDifferentType() {
+    void testUndoIgnoresExistingSameUniqueIdDifferentType() {
         DataSet ds = new DataSet();
 
@@ -288 +288 @@
      */
     @Test
-    public void testParticipatingPrimitives() {
+    void testParticipatingPrimitives() {
         DataSet ds = new DataSet();
 
@@ -308 +308 @@
      */
     @Test
-    public void testFillModifiedData() {
+    void testFillModifiedData() {
         ArrayList<OsmPrimitive> modified = new ArrayList<>();
         ArrayList<OsmPrimitive> deleted = new ArrayList<>();
@@ -364 +364 @@
      */
     @Test
-    public void testEqualsContract() {
+    void testEqualsContract() {
         TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(AddPrimitivesCommand.class).usingGetClass()