Changeset 31990 in osm for applications/editors/josm/plugins

Timestamp:

2016-01-16T18:47:23+01:00 (9 years ago)

Author:

donvip

Message:

[josm_opendata] simplify unit tests

Location:

applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io

Files:

• geographic/KmlReaderTest.java (modified) (2 diffs)
• tabular/CsvReaderTest.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/geographic/KmlReaderTest.java

@@ -35 +35 @@
     @Test
     public void testTicket10214() throws IOException, XMLStreamException, FactoryConfigurationError {
-        File file = new File(TestUtils.getRegressionDataFile(10214, "utf8_test.kml"));
-        try (InputStream is = new FileInputStream(file)) {
+        try (InputStream is = TestUtils.getRegressionDataStream(10214, "utf8_test.kml")) {
             NonRegFunctionalTests.testTicket10214(KmlReader.parseDataSet(is, null));
         }
@@ -47 +46 @@
     @Test
     public void testTicket7714() throws IOException, XMLStreamException, FactoryConfigurationError {
-        File file = new File(TestUtils.getRegressionDataFile(7714, "doc.kml"));
-        try (InputStream is = new FileInputStream(file)) {
+        try (InputStream is = TestUtils.getRegressionDataStream(7714, "doc.kml")) {
             NonRegFunctionalTests.testGeneric("#7714", KmlReader.parseDataSet(is, null));
         }

applications/editors/josm/plugins/opendata/test/unit/org/openstreetmap/josm/plugins/opendata/core/io/tabular/CsvReaderTest.java

@@ -63 +63 @@
     @Test
     public void testTicket10214() throws IOException, XMLStreamException, FactoryConfigurationError {
-        File file = new File(TestUtils.getRegressionDataFile(10214, "utf8_test.csv"));
-        try (InputStream is = new FileInputStream(file)) {
+        try (InputStream is = TestUtils.getRegressionDataStream(10214, "utf8_test.csv")) {
             NonRegFunctionalTests.testTicket10214(CsvReader.parseDataSet(is, newHandler("EPSG:4326"), null));
         }
@@ -75 +74 @@
     @Test
     public void testTicket8805() throws IOException, XMLStreamException, FactoryConfigurationError {
-        File file = new File(TestUtils.getRegressionDataFile(8805, "XXX.csv"));
-        try (InputStream is = new FileInputStream(file)) {
+        try (InputStream is = TestUtils.getRegressionDataStream(8805, "XXX.csv")) {
             NonRegFunctionalTests.testGeneric("#8805", CsvReader.parseDataSet(is, newHandler("EPSG:4326"), null));
         }