Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/io/OsmChangeBuilderTest.java

Timestamp:

2020-10-28T20:41:00+01:00 (6 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/io/OsmChangeBuilderTest.java (modified) (8 diffs)

trunk/test/unit/org/openstreetmap/josm/io/OsmChangeBuilderTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.Arrays;
 
-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.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Changeset;
@@ -20 +20 @@
  * Unit tests of {@link OsmChangeBuilder}
  */
-public class OsmChangeBuilderTest {
+class OsmChangeBuilderTest {
 
     /**
      * Setup rule
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules();
@@ -42 +42 @@
      */
     @Test
-    public void testConstructor() {
+    void testConstructor() {
         Changeset cs = new Changeset(1);
         // should not fail
@@ -57 +57 @@
      */
     @Test
-    public void testSequenceOfMethodCalls() {
+    void testSequenceOfMethodCalls() {
         Changeset cs = new Changeset(1);
         OsmChangeBuilder csBuilder = new OsmChangeBuilder(cs);
@@ -93 +93 @@
      */
     @Test
-    public void testDocumentWithNewNode() {
+    void testDocumentWithNewNode() {
         Changeset cs = new Changeset(1);
         OsmChangeBuilder builder = new OsmChangeBuilder(cs);
@@ -114 +114 @@
      */
     @Test
-    public void testDocumentWithModifiedNode() {
+    void testDocumentWithModifiedNode() {
         Changeset cs = new Changeset(1);
         OsmChangeBuilder builder = new OsmChangeBuilder(cs);
@@ -137 +137 @@
      */
     @Test
-    public void testDocumentWithDeletedNode() {
+    void testDocumentWithDeletedNode() {
         Changeset cs = new Changeset(1);
         OsmChangeBuilder builder = new OsmChangeBuilder(cs);
@@ -160 +160 @@
      */
     @Test
-    public void testMixed() {
+    void testMixed() {
         Changeset cs = new Changeset(1);
         OsmChangeBuilder builder = new OsmChangeBuilder(cs);