Changeset 12564 in josm for trunk/test/unit/org/openstreetmap/josm/io/session
- Timestamp:
- 2017-08-03T23:24:56+02:00 (7 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm/io/session
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/io/session/SessionReaderTest.java
r12140 r12564 10 10 import java.util.List; 11 11 12 import org.junit. BeforeClass;12 import org.junit.Rule; 13 13 import org.junit.Test; 14 import org.openstreetmap.josm.JOSMFixture;15 14 import org.openstreetmap.josm.Main; 16 15 import org.openstreetmap.josm.TestUtils; … … 23 22 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; 24 23 import org.openstreetmap.josm.io.IllegalDataException; 24 import org.openstreetmap.josm.testutils.JOSMTestRules; 25 26 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 25 27 26 28 /** … … 32 34 * Setup tests. 33 35 */ 34 @BeforeClass 35 public static void setUpBeforeClass() { 36 JOSMFixture.createUnitTestFixture().init(); 37 } 36 @Rule 37 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 38 public JOSMTestRules test = new JOSMTestRules().platform().projection(); 38 39 39 40 private static String getSessionDataDir() { -
trunk/test/unit/org/openstreetmap/josm/io/session/SessionWriterTest.java
r12118 r12564 10 10 import java.util.Map; 11 11 12 import org.junit.BeforeClass; 12 import org.junit.Before; 13 import org.junit.Rule; 13 14 import org.junit.Test; 14 import org.openstreetmap.josm.JOSMFixture;15 15 import org.openstreetmap.josm.Main; 16 16 import org.openstreetmap.josm.data.coor.LatLon; … … 28 28 import org.openstreetmap.josm.gui.layer.TMSLayer; 29 29 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer; 30 import org.openstreetmap.josm. gui.preferences.projection.ProjectionPreference;30 import org.openstreetmap.josm.testutils.JOSMTestRules; 31 31 import org.openstreetmap.josm.tools.MultiMap; 32 32 import org.openstreetmap.josm.tools.Utils; 33 34 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 33 35 34 36 /** … … 84 86 * Setup tests. 85 87 */ 86 @BeforeClass 87 public static void setUpBeforeClass() { 88 JOSMFixture.createUnitTestFixture().init(true); 89 ProjectionPreference.setProjection(); 88 @Rule 89 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 90 public JOSMTestRules test = new JOSMTestRules().platform().projection().mainMenu(); 91 92 /** 93 * Setup tests. 94 */ 95 @Before 96 public void setUp() { 97 Main.getLayerManager().addLayer(createOsmLayer()); 90 98 } 91 99
Note:
See TracChangeset
for help on using the changeset viewer.