Changeset 32884 in osm for applications/editors/josm/plugins/wikipedia/test/unit/org

Timestamp:

2016-08-27T13:00:05+02:00 (9 years ago)

Author:

donvip

Message:

fix unit tests

Location:

applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia

Files:

• WikidataTagCellRendererTest.java (modified) (2 diffs)
• WikipediaAppTest.java (modified) (2 diffs)

applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/WikidataTagCellRendererTest.java

@@ -11 +11 @@
 import javax.swing.JTable;
 
-import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 
 public class WikidataTagCellRendererTest {
 
-    @Before
-    public void setUp() throws Exception {
-        Main.initApplicationPreferences();
-    }
+    /**
+     * Setup test.
+     */
+    @Rule
+    public JOSMTestRules rules = new JOSMTestRules().preferences();
 
     @Test
@@ -42 +43 @@
                 "<li>Q278250 <span color='gray'>Völs</span></li></ul>"));
     }
-
 }

applications/editors/josm/plugins/wikipedia/test/unit/org/wikipedia/WikipediaAppTest.java

@@ -2 +2 @@
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.wikipedia.WikipediaApp.WikipediaEntry;
 import org.wikipedia.WikipediaApp.WikipediaLangArticle;
@@ -22 +24 @@
 
 public class WikipediaAppTest {
-    @Before
-    public void setUp() throws Exception {
-        Main.initApplicationPreferences();
-    }
+
+    /**
+     * Setup test.
+     */
+    @Rule
+    public JOSMTestRules rules = new JOSMTestRules().preferences();
 
     @Test