Changeset 10945 in josm for trunk/test/unit/org/openstreetmap/josm/data/notes

Timestamp:

2016-09-03T14:22:22+02:00 (9 years ago)

Author:

Don-vip

Message:

convert more unit tests to JOSMTestRules

Location:

trunk/test/unit/org/openstreetmap/josm/data/notes

Files:

• NoteCommentTest.java (modified) (2 diffs)
• NoteTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/data/notes/NoteCommentTest.java

@@ -8 +8 @@
 import java.util.Date;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -20 +22 @@
      * Setup test.
      */
-    @BeforeClass
-    public static void init() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
 
     /**

trunk/test/unit/org/openstreetmap/josm/data/notes/NoteTest.java

@@ -7 +7 @@
 import java.util.Date;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import nl.jqno.equalsverifier.EqualsVerifier;
 import nl.jqno.equalsverifier.Warning;
@@ -23 +24 @@
      * Setup test.
      */
-    @BeforeClass
-    public static void init() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules();
 
     /**