Changeset 12806 in josm for trunk/test/unit/org/openstreetmap/josm/io

Timestamp:

2017-09-09T17:48:13+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - remove GUI references from GeoJSONWriter

File:

• trunk/test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java (modified) (5 diffs)

trunk/test/unit/org/openstreetmap/josm/io/GeoJSONWriterTest.java

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
 /**
@@ -41 +40 @@
         final DataSet ds = new DataSet();
         ds.addPrimitive(node);
-        final OsmDataLayer layer = new OsmDataLayer(ds, "foo", null);
-        final GeoJSONWriter writer = new GeoJSONWriter(layer);
+        final GeoJSONWriter writer = new GeoJSONWriter(ds);
         assertEquals(("" +
                 "{\n" +
@@ -80 +78 @@
         way.setNodes(Arrays.asList(n1, n2));
         ds.addPrimitive(way);
-        final OsmDataLayer layer = new OsmDataLayer(ds, "foo", null);
-        final GeoJSONWriter writer = new GeoJSONWriter(layer);
+        final GeoJSONWriter writer = new GeoJSONWriter(ds);
         assertEquals(("" +
                 "{\n" +
@@ -118 +115 @@
         try (FileInputStream in = new FileInputStream(TestUtils.getTestDataRoot() + "multipolygon.osm")) {
             DataSet ds = OsmReader.parseDataSet(in, null);
-            final OsmDataLayer layer = new OsmDataLayer(ds, "foo", null);
-            final GeoJSONWriter writer = new GeoJSONWriter(layer);
+            final GeoJSONWriter writer = new GeoJSONWriter(ds);
             assertTrue(writer.write().contains("MultiPolygon"));
         }
@@ -132 +128 @@
         try (FileInputStream in = new FileInputStream("data_nodist/multipolygon.osm")) {
             DataSet ds = OsmReader.parseDataSet(in, null);
-            final OsmDataLayer layer = new OsmDataLayer(ds, "foo", null);
-            final GeoJSONWriter writer = new GeoJSONWriter(layer);
+            final GeoJSONWriter writer = new GeoJSONWriter(ds);
             assertTrue(writer.write().contains("MultiPolygon"));
         }