Changeset 17275 in josm for trunk/test/unit/org/openstreetmap/josm/data/tagging

Timestamp:

2020-10-28T20:41:00+01:00 (5 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/data/tagging/ac/AutoCompletionPriorityTest.java (modified) (8 diffs)

trunk/test/unit/org/openstreetmap/josm/data/tagging/ac/AutoCompletionPriorityTest.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.tagging.ac;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
@@ -12 +12 @@
 import java.util.TreeSet;
 
-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.testutils.JOSMTestRules;
@@ -23 +23 @@
  * Unit tests of {@link AutoCompletionPriority}.
  */
-public class AutoCompletionPriorityTest {
+class AutoCompletionPriorityTest {
 
     /**
      * Setup test.
      */
-    @Rule
+    @RegisterExtension
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
     public JOSMTestRules test = new JOSMTestRules();
@@ -36 +36 @@
      */
     @Test
-    public void testGetters() {
+    void testGetters() {
         assertTrue(AutoCompletionPriority.IS_IN_STANDARD_AND_IN_DATASET.isInStandard());
         assertTrue(AutoCompletionPriority.IS_IN_STANDARD_AND_IN_DATASET.isInDataSet());
@@ -69 +69 @@
      */
     @Test
-    public void testOrdering() {
+    void testOrdering() {
         SortedSet<AutoCompletionPriority> set = new TreeSet<>();
         set.add(AutoCompletionPriority.IS_IN_STANDARD_AND_IN_DATASET);
@@ -96 +96 @@
      */
     @Test
-    public void testEqualsContract() {
+    void testEqualsContract() {
         TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(AutoCompletionPriority.class).usingGetClass()
@@ -106 +106 @@
      */
     @Test
-    public void testToString() {
+    void testToString() {
         assertEquals("<Priority; userInput: no, inDataSet: true, inStandard: false, selected: false>",
                 AutoCompletionPriority.IS_IN_DATASET.toString());
@@ -117 +117 @@
      */
     @Test
-    public void testMergeWith() {
+    void testMergeWith() {
         assertEquals(AutoCompletionPriority.IS_IN_STANDARD_AND_IN_DATASET,
                 AutoCompletionPriority.IS_IN_DATASET.mergeWith(AutoCompletionPriority.IS_IN_STANDARD));