Changeset 10945 in josm for trunk/test/unit/org/openstreetmap/josm/data/validation
- Timestamp:
- 2016-09-03T14:22:22+02:00 (8 years ago)
- Location:
- trunk/test/unit/org/openstreetmap/josm/data/validation
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java
r10758 r10945 4 4 import static org.junit.Assert.assertEquals; 5 5 6 import org.junit. BeforeClass;6 import org.junit.Rule; 7 7 import org.junit.Test; 8 import org.openstreetmap.josm.JOSMFixture;9 8 import org.openstreetmap.josm.data.coor.LatLon; 10 9 import org.openstreetmap.josm.data.osm.DataSet; 11 10 import org.openstreetmap.josm.data.osm.Node; 12 11 import org.openstreetmap.josm.gui.progress.NullProgressMonitor; 12 import org.openstreetmap.josm.testutils.JOSMTestRules; 13 14 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 13 15 14 16 /** … … 20 22 * Setup test by initializing JOSM preferences and projection. 21 23 */ 22 @BeforeClass 23 public static void setUp() { 24 JOSMFixture.createUnitTestFixture().init(); 25 } 24 @Rule 25 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 26 public JOSMTestRules test = new JOSMTestRules(); 26 27 27 28 /** -
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/InternetTagsTest.java
r9853 r10945 5 5 import static org.junit.Assert.assertNull; 6 6 7 import org.junit. BeforeClass;7 import org.junit.Rule; 8 8 import org.junit.Test; 9 import org.openstreetmap.josm.JOSMFixture;10 9 import org.openstreetmap.josm.data.osm.OsmUtils; 11 10 import org.openstreetmap.josm.data.validation.TestError; … … 13 12 import org.openstreetmap.josm.data.validation.routines.EmailValidator; 14 13 import org.openstreetmap.josm.data.validation.routines.UrlValidator; 14 import org.openstreetmap.josm.testutils.JOSMTestRules; 15 16 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 15 17 16 18 /** … … 19 21 public class InternetTagsTest { 20 22 21 private static InternetTags TEST;23 private static final InternetTags TEST = new InternetTags(); 22 24 23 25 /** 24 26 * Setup test by initializing JOSM preferences and projection. 25 27 */ 26 @BeforeClass 27 public static void setUp() { 28 JOSMFixture.createUnitTestFixture().init(); 29 TEST = new InternetTags(); 30 } 28 @Rule 29 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 30 public JOSMTestRules test = new JOSMTestRules(); 31 31 32 32 /** -
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/LongSegmentTest.java
r10081 r10945 4 4 import static org.junit.Assert.assertEquals; 5 5 6 import org.junit. Before;6 import org.junit.Rule; 7 7 import org.junit.Test; 8 import org.openstreetmap.josm.JOSMFixture;9 8 import org.openstreetmap.josm.data.coor.LatLon; 10 9 import org.openstreetmap.josm.data.osm.Node; 11 10 import org.openstreetmap.josm.data.osm.Way; 11 import org.openstreetmap.josm.testutils.JOSMTestRules; 12 13 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 12 14 13 15 /** … … 19 21 * Setup test. 20 22 */ 21 @Before 22 public void setUp() { 23 JOSMFixture.createUnitTestFixture().init(); 24 } 23 @Rule 24 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 25 public JOSMTestRules test = new JOSMTestRules(); 25 26 26 27 private static int test(Way w) throws Exception { -
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
r10758 r10945 14 14 import java.util.Set; 15 15 16 import org.junit. BeforeClass;16 import org.junit.Rule; 17 17 import org.junit.Test; 18 import org.openstreetmap.josm.JOSMFixture;19 18 import org.openstreetmap.josm.Main; 20 19 import org.openstreetmap.josm.command.ChangePropertyCommand; … … 31 30 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.TagCheck; 32 31 import org.openstreetmap.josm.gui.mappaint.mapcss.parsergen.ParseException; 32 import org.openstreetmap.josm.testutils.JOSMTestRules; 33 34 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 33 35 34 36 /** … … 40 42 * Setup test. 41 43 */ 42 @BeforeClass 43 public static void setUp() { 44 JOSMFixture.createUnitTestFixture().init(); 45 } 44 @Rule 45 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 46 public JOSMTestRules test = new JOSMTestRules(); 46 47 47 48 static MapCSSTagChecker buildTagChecker(String css) throws ParseException { -
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java
r10222 r10945 15 15 import java.util.TreeSet; 16 16 17 import org.junit. BeforeClass;17 import org.junit.Rule; 18 18 import org.junit.Test; 19 import org.openstreetmap.josm.JOSMFixture;20 19 import org.openstreetmap.josm.data.coor.LatLon; 21 20 import org.openstreetmap.josm.data.osm.Node; … … 26 25 import org.openstreetmap.josm.gui.DefaultNameFormatter; 27 26 import org.openstreetmap.josm.gui.mappaint.ElemStyles; 28 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;29 27 import org.openstreetmap.josm.io.OsmReader; 28 import org.openstreetmap.josm.testutils.JOSMTestRules; 29 30 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 30 31 31 32 /** … … 39 40 /** 40 41 * Setup test. 41 * @throws Exception if test cannot be initialized42 42 */ 43 @BeforeClass 44 public static void setUp() throws Exception { 45 JOSMFixture.createUnitTestFixture().init(true); 46 MapPaintStyles.readFromPreferences(); 47 } 43 @Rule 44 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 45 public JOSMTestRules test = new JOSMTestRules().commands(); 48 46 49 47 private static Way createUnclosedWay(String tags) { -
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/NameMismatchTest.java
r10758 r10945 6 6 import java.util.List; 7 7 8 import org.junit. Before;8 import org.junit.Rule; 9 9 import org.junit.Test; 10 import org.openstreetmap.josm.JOSMFixture;11 10 import org.openstreetmap.josm.data.osm.OsmUtils; 12 11 import org.openstreetmap.josm.data.validation.TestError; 12 import org.openstreetmap.josm.testutils.JOSMTestRules; 13 14 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 13 15 14 16 /** … … 20 22 * Setup test. 21 23 */ 22 @Before 23 public void setUp() { 24 JOSMFixture.createUnitTestFixture().init(); 25 } 24 @Rule 25 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 26 public JOSMTestRules test = new JOSMTestRules(); 26 27 27 28 List<TestError> test(String primitive) { -
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/PublicTransportRouteTestTest.java
r10758 r10945 7 7 import java.util.List; 8 8 9 import org.junit. Before;9 import org.junit.Rule; 10 10 import org.junit.Test; 11 import org.openstreetmap.josm.JOSMFixture;12 11 import org.openstreetmap.josm.TestUtils; 13 12 import org.openstreetmap.josm.data.osm.Node; … … 15 14 import org.openstreetmap.josm.data.osm.RelationMember; 16 15 import org.openstreetmap.josm.data.osm.Way; 16 import org.openstreetmap.josm.testutils.JOSMTestRules; 17 18 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 17 19 18 20 /** … … 26 28 * Setup test. 27 29 */ 28 @Before 29 public void setUp() { 30 JOSMFixture.createUnitTestFixture().init(); 31 } 30 @Rule 31 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 32 public JOSMTestRules rules = new JOSMTestRules(); 32 33 33 34 /** -
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UntaggedNodeTest.java
r9693 r10945 8 8 import java.io.InputStream; 9 9 10 import org.junit. Before;10 import org.junit.Rule; 11 11 import org.junit.Test; 12 import org.openstreetmap.josm.JOSMFixture;13 12 import org.openstreetmap.josm.TestUtils; 14 13 import org.openstreetmap.josm.data.osm.DataSet; 15 14 import org.openstreetmap.josm.gui.progress.NullProgressMonitor; 16 15 import org.openstreetmap.josm.io.OsmReader; 16 import org.openstreetmap.josm.testutils.JOSMTestRules; 17 18 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 17 19 18 20 /** … … 21 23 public class UntaggedNodeTest { 22 24 23 private UntaggedNode test;25 private final UntaggedNode test = new UntaggedNode(); 24 26 25 27 /** 26 28 * Setup test. 27 29 */ 28 @Before 29 public void setUp() { 30 JOSMFixture.createUnitTestFixture().init(); 31 test = new UntaggedNode(); 32 } 30 @Rule 31 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 32 public JOSMTestRules rules = new JOSMTestRules(); 33 33 34 34 /** -
trunk/test/unit/org/openstreetmap/josm/data/validation/util/MultipleNameVisitorTest.java
r9666 r10945 6 6 import java.util.Arrays; 7 7 8 import org.junit. BeforeClass;8 import org.junit.Rule; 9 9 import org.junit.Test; 10 import org.openstreetmap.josm.JOSMFixture;11 10 import org.openstreetmap.josm.data.osm.Way; 11 import org.openstreetmap.josm.testutils.JOSMTestRules; 12 13 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; 12 14 13 15 /** … … 19 21 * Setup test. 20 22 */ 21 @BeforeClass 22 public static void setUp() { 23 JOSMFixture.createUnitTestFixture().init(); 24 } 23 @Rule 24 @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD") 25 public JOSMTestRules test = new JOSMTestRules().platform(); 25 26 26 27 /**
Note:
See TracChangeset
for help on using the changeset viewer.