Changeset 10945 in josm for trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java
- Timestamp:
- 2016-09-03T14:22:22+02:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/command/conflict/TagConflictResolveCommandTest.java
r10758 r10945 2 2 package org.openstreetmap.josm.command.conflict; 3 3 4 import org.junit. BeforeClass;4 import org.junit.Rule; 5 5 import org.junit.Test; 6 import org.openstreetmap.josm.JOSMFixture;7 6 import org.openstreetmap.josm.data.conflict.Conflict; 8 7 import org.openstreetmap.josm.data.osm.DataSet; … … 11 10 import org.openstreetmap.josm.data.osm.Way; 12 11 import org.openstreetmap.josm.gui.layer.OsmDataLayer; 12 import org.openstreetmap.josm.testutils.JOSMTestRules; 13 13 14 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 14 15 import nl.jqno.equalsverifier.EqualsVerifier; 15 16 import nl.jqno.equalsverifier.Warning; … … 23 24 * Setup test. 24 25 */ 25 @BeforeClass 26 public static void setUpBeforeClass() { 27 JOSMFixture.createUnitTestFixture().init(false); 28 } 26 @Rule 27 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 28 public JOSMTestRules test = new JOSMTestRules(); 29 29 30 30 /**
Note:
See TracChangeset
for help on using the changeset viewer.