Changeset 3577 in josm for trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java

Timestamp:

2010-10-01T19:26:20+02:00 (14 years ago)

Author:

jttt

Message:

Fix tests

File:

• trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModelTest.java

@@ -10 +10 @@
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -43 +45 @@
     PropertiesMergeModel model;
 
+    @BeforeClass
+    public static void init() {
+        Main.proj = new Epsg4326();
+        Main.pref = new Preferences();
+    }
+
     @Before
     public void setUp() {
         model = new PropertiesMergeModel();
-        Main.proj = new Epsg4326();
     }