Index: trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java (revision 16006) @@ -146,5 +146,5 @@ /** - * Non-regression test which checks example files in data_nodist + * Non-regression test which checks example files in nodist/data * @throws Exception if an error occurs */ @@ -153,8 +153,8 @@ public void testExamples() throws Exception { DataSet dsToJoin, dsExpected; - try (InputStream is = Files.newInputStream(Paths.get("data_nodist/Join_Areas_Tests.osm"))) { + try (InputStream is = Files.newInputStream(Paths.get("nodist/data/Join_Areas_Tests.osm"))) { dsToJoin = OsmReader.parseDataSet(is, NullProgressMonitor.INSTANCE); } - try (InputStream is = Files.newInputStream(Paths.get("data_nodist/Join_Areas_Tests_joined.osm"))) { + try (InputStream is = Files.newInputStream(Paths.get("nodist/data/Join_Areas_Tests_joined.osm"))) { dsExpected = OsmReader.parseDataSet(is, NullProgressMonitor.INSTANCE); } Index: trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java (revision 16006) @@ -74,5 +74,5 @@ for (int i : new int[] {1, 2, 3, 11, 12, 13, 14, 15}) { DataSet ds; - try (InputStream is = Files.newInputStream(Paths.get("data_nodist/filterTests.osm"))) { + try (InputStream is = Files.newInputStream(Paths.get("nodist/data/filterTests.osm"))) { ds = OsmReader.parseDataSet(is, NullProgressMonitor.INSTANCE); } Index: trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/data/osm/QuadBucketsTest.java (revision 16006) @@ -85,5 +85,5 @@ public void testRemove() throws Exception { ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator - try (InputStream fis = Files.newInputStream(Paths.get("data_nodist/restriction.osm"))) { + try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/restriction.osm"))) { DataSet ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); removeAllTest(ds); @@ -98,5 +98,5 @@ public void testMove() throws Exception { ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator - try (InputStream fis = Files.newInputStream(Paths.get("data_nodist/restriction.osm"))) { + try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/restriction.osm"))) { DataSet ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); Index: trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java (revision 16006) @@ -47,9 +47,9 @@ * Test projections using reference data from external program. * - * To update the reference data file data_nodist/projection/projection-reference-data, + * To update the reference data file nodist/data/projection/projection-reference-data, * run the main method of this class. For this, you need to have the cs2cs * program from the proj.4 library in path (or use CS2CS_EXE to set * the full path of the executable). Make sure the required *.gsb grid files - * can be accessed, i.e. copy them from data_nodist/projection to /usr/share/proj or + * can be accessed, i.e. copy them from nodist/data/projection to /usr/share/proj or * wherever cs2cs expects them to be placed. * @@ -63,6 +63,6 @@ private static final String CS2CS_EXE = "cs2cs"; - private static final String REFERENCE_DATA_FILE = "data_nodist/projection/projection-reference-data"; - private static final String PROJ_LIB_DIR = "data_nodist/projection"; + private static final String REFERENCE_DATA_FILE = "nodist/data/projection/projection-reference-data"; + private static final String PROJ_LIB_DIR = "nodist/data/projection"; private static class RefEntry { Index: trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java (revision 16006) @@ -34,5 +34,5 @@ * This test is used to monitor changes in projection code. * - * It keeps a record of test data in the file data_nodist/projection/projection-regression-test-data. + * It keeps a record of test data in the file nodist/data/projection/projection-regression-test-data. * This record is generated from the current Projection classes available in JOSM. It needs to * be updated, whenever a projection is added / removed or an algorithm is changed, such that @@ -44,5 +44,5 @@ public class ProjectionRegressionTest { - private static final String PROJECTION_DATA_FILE = "data_nodist/projection/projection-regression-test-data"; + private static final String PROJECTION_DATA_FILE = "nodist/data/projection/projection-regression-test-data"; private static class TestData { Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/CoastlinesTest.java (revision 16006) @@ -31,5 +31,5 @@ @Test public void testCoastlineFile() throws Exception { - ValidatorTestUtils.testSampleFile("data_nodist/coastlines.osm", + ValidatorTestUtils.testSampleFile("nodist/data/coastlines.osm", ds -> ds.getWays().stream().filter( w -> "coastline".equals(w.get("natural"))).collect(Collectors.toList()), Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/MultipolygonTestTest.java (revision 16006) @@ -38,5 +38,5 @@ final MultipolygonTest MULTIPOLYGON_TEST = new MultipolygonTest(); final RelationChecker RELATION_TEST = new RelationChecker(); - ValidatorTestUtils.testSampleFile("data_nodist/multipolygon.osm", + ValidatorTestUtils.testSampleFile("nodist/data/multipolygon.osm", ds -> ds.getRelations().stream().filter(Relation::isMultipolygon).collect(Collectors.toList()), name -> name.startsWith("06") || name.startsWith("07") || name.startsWith("08"), MULTIPOLYGON_TEST, RELATION_TEST); Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/TurnRestrictionTestTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/TurnRestrictionTestTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/TurnRestrictionTestTest.java (revision 16006) @@ -29,5 +29,5 @@ @Test public void testTurnrestrictionFile() throws Exception { - ValidatorTestUtils.testSampleFile("data_nodist/restriction.osm", + ValidatorTestUtils.testSampleFile("nodist/data/restriction.osm", ds -> ds.getRelations(), name -> name.startsWith("E"), TURNRESTRICTION_TEST, RELATION_TEST); Index: trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/data/validation/tests/UnconnectedWaysTest.java (revision 16006) @@ -49,5 +49,5 @@ @Test public void testTicket6313() throws IOException, IllegalDataException, FileNotFoundException { - try (InputStream fis = Files.newInputStream(Paths.get("data_nodist/UnconnectedWaysTest.osm"))) { + try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/UnconnectedWaysTest.osm"))) { final DataSet ds = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); MainApplication.getLayerManager().addLayer(new OsmDataLayer(ds, null, null)); Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorterTest.java (revision 16006) @@ -45,5 +45,5 @@ public void loadData() throws IllegalDataException, IOException { if (testDataset == null) { - try (InputStream fis = Files.newInputStream(Paths.get("data_nodist/relation_sort.osm"))) { + try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/relation_sort.osm"))) { testDataset = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); } Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java (revision 16006) @@ -52,5 +52,5 @@ public void loadData() throws IllegalDataException, IOException { if (testDataset == null) { - try (InputStream fis = Files.newInputStream(Paths.get("data_nodist/relation_sort.osm"))) { + try (InputStream fis = Files.newInputStream(Paths.get("nodist/data/relation_sort.osm"))) { testDataset = OsmReader.parseDataSet(fis, NullProgressMonitor.INSTANCE); } Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java (revision 16006) @@ -46,5 +46,5 @@ @Test public void testAutoGuess() throws Exception { - final GpxData gpx = GpxReaderTest.parseGpxData("data_nodist/2094047.gpx"); + final GpxData gpx = GpxReaderTest.parseGpxData("nodist/data/2094047.gpx"); final ImageEntry i0 = new ImageEntry(); i0.setExifTime(DateUtils.fromString("2016:01:03 11:59:54")); // 4 sec before start of GPX Index: trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelperTest.java (revision 16006) @@ -60,5 +60,5 @@ @Test public void testNone() throws IOException, SAXException { - final List colors = calculateColors("data_nodist/2094047.gpx", ImmutableMap.of(), 10); + final List colors = calculateColors("nodist/data/2094047.gpx", ImmutableMap.of(), 10); assertEquals("[#000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000, #000000]", colors.toString()); } @@ -72,5 +72,5 @@ @Test public void testVelocity() throws IOException, SAXException { - final List colors = calculateColors("data_nodist/2094047.gpx", + final List colors = calculateColors("nodist/data/2094047.gpx", ImmutableMap.of("colormode", Integer.toString(ColorMode.VELOCITY.toIndex())), 10); assertEquals("[#000000, #FFAD00, #FFA800, #FFA800, #FF9E00, #FF9400, #FF7000, #FF7000, #FF8000, #FF9400]", colors.toString()); @@ -85,5 +85,5 @@ @Test public void testVelocityDynamic() throws IOException, SAXException { - final List colors = calculateColors("data_nodist/2094047.gpx", + final List colors = calculateColors("nodist/data/2094047.gpx", ImmutableMap.of("colormode.dynamic-range", "true", "colormode", Integer.toString(ColorMode.VELOCITY.toIndex())), @@ -100,5 +100,5 @@ @Test public void testDirection() throws IOException, SAXException { - final List colors = calculateColors("data_nodist/2094047.gpx", + final List colors = calculateColors("nodist/data/2094047.gpx", ImmutableMap.of("colormode", Integer.toString(ColorMode.DIRECTION.toIndex())), 10); assertEquals("[#000000, #EAEC25, #EDEA26, #EDE525, #ECD322, #EBB81D, #E85A0D, #E73708, #E84D0B, #EA8A15]", colors.toString()); @@ -113,5 +113,5 @@ @Test public void testTime() throws IOException, SAXException { - final List colors = calculateColors("data_nodist/2094047.gpx", + final List colors = calculateColors("nodist/data/2094047.gpx", ImmutableMap.of("colormode", Integer.toString(ColorMode.TIME.toIndex())), 10); assertEquals("[#000000, #FF0000, #FF0000, #FF0500, #FF0500, #FF0A00, #FF0A00, #FF1F00, #FF2E00, #FF3300]", colors.toString()); Index: trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ChildOrParentSelectorTest.java (revision 16006) @@ -192,5 +192,5 @@ @Test public void testContains() throws Exception { - ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get("data_nodist/amenity-in-amenity.osm")), null); + ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get("nodist/data/amenity-in-amenity.osm")), null); ChildOrParentSelector css = parse("node[tag(\"amenity\") = parent_tag(\"amenity\")] ∈ *[amenity] {}"); assertFalse(css.matches(new Environment(ds.getPrimitiveById(123, OsmPrimitiveType.NODE)))); Index: trunk/test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java (revision 16006) @@ -128,5 +128,5 @@ @Test public void testMultipolygonRobustness() throws Exception { - try (InputStream in = Files.newInputStream(Paths.get("data_nodist/multipolygon.osm"))) { + try (InputStream in = Files.newInputStream(Paths.get("nodist/data/multipolygon.osm"))) { DataSet ds = OsmReader.parseDataSet(in, null); final GeoJSONWriter writer = new GeoJSONWriter(ds); Index: trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/io/GpxReaderTest.java (revision 16006) @@ -61,5 +61,5 @@ @Test public void testMunich() throws Exception { - final GpxData result = parseGpxData("data_nodist/munich.gpx"); + final GpxData result = parseGpxData("nodist/data/munich.gpx"); assertEquals(2762, result.getTracks().size()); assertEquals(0, result.getRoutes().size()); Index: trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java (revision 16006) @@ -62,5 +62,5 @@ public void testReader() throws Exception { TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin")); - final NmeaReader in = new NmeaReader(Files.newInputStream(Paths.get("data_nodist/btnmeatrack_2016-01-25.nmea"))); + final NmeaReader in = new NmeaReader(Files.newInputStream(Paths.get("nodist/data/btnmeatrack_2016-01-25.nmea"))); in.parse(true); assertEquals(30, in.getNumberOfCoordinates()); Index: trunk/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/io/rtklib/RtkLibPosReaderTest.java (revision 16006) @@ -58,5 +58,5 @@ @Test public void testReader() throws Exception { - RtkLibPosReader in = read("data_nodist/rtklib_example.pos"); + RtkLibPosReader in = read("nodist/data/rtklib_example.pos"); assertEquals(137, in.getNumberOfCoordinates()); @@ -84,5 +84,5 @@ @Test public void testReader2() throws Exception { - RtkLibPosReader in = read("data_nodist/rtklib_example2.pos"); + RtkLibPosReader in = read("nodist/data/rtklib_example2.pos"); assertEquals(6, in.getNumberOfCoordinates()); } Index: trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java (revision 15988) +++ trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java (revision 16006) @@ -42,6 +42,6 @@ @Before public void setUp() { - directionSampleFile = new File("data_nodist/exif-example_direction.jpg"); - orientationSampleFile = new File("data_nodist/exif-example_orientation=6.jpg"); + directionSampleFile = new File("nodist/data/exif-example_direction.jpg"); + orientationSampleFile = new File("nodist/data/exif-example_orientation=6.jpg"); } @@ -62,5 +62,5 @@ @Test public void testReadTimeSubSecond1() throws ParseException { - Date date = ExifReader.readTime(new File("data_nodist/IMG_20150711_193419.jpg")); + Date date = ExifReader.readTime(new File("nodist/data/IMG_20150711_193419.jpg")); doTest("2015-07-11T19:34:19.100", date); } @@ -108,5 +108,5 @@ @Test public void testReadSpeed() { - assertEquals(Double.valueOf(12.3), ExifReader.readSpeed(new File("data_nodist/exif-example_speed_ele.jpg"))); + assertEquals(Double.valueOf(12.3), ExifReader.readSpeed(new File("nodist/data/exif-example_speed_ele.jpg"))); } @@ -116,5 +116,5 @@ @Test public void testReadElevation() { - assertEquals(Double.valueOf(23.4), ExifReader.readElevation(new File("data_nodist/exif-example_speed_ele.jpg"))); + assertEquals(Double.valueOf(23.4), ExifReader.readElevation(new File("nodist/data/exif-example_speed_ele.jpg"))); }