Changeset 19078 in josm for trunk/test


Ignore:
Timestamp:
2024-05-13T20:34:55+02:00 (9 months ago)
Author:
taylor.smock
Message:

Fix #4142: Track fully downloaded objects (patch by stoecker, GerdP, and myself)

The serialization move from PrimitiveData to AbstractPrimitive should be
reverted prior to 24.05 (see #23677).

The serialization move was required since we want to ensure that all downstream
users of AbstractPrimitive were not using the flags field, which was done by
making the field private instead of protected. They may still be using that
field (via updateFlags) which would not be caught by compile-time or runtime
errors.

Additionally, a good chunk of common functionality was moved up from
OsmPrimitive, even though much of it wasn't useful for PrimitiveData.

Location:
trunk/test/unit/org/openstreetmap/josm
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/test/unit/org/openstreetmap/josm/actions/AlignInCircleActionTest.java

    r18870 r19078  
    4545        DataSet ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "alignCircleBefore.osm")), null);
    4646        DataSet ds2 = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "alignCircleAfter1.osm")), null);
     47        ds.allPrimitives().forEach(p -> p.setReferrersDownloaded(true));
     48        ds2.allPrimitives().forEach(p -> p.setReferrersDownloaded(true));
    4749
    4850        Way roundabout = null;
    … …  
    7678    void testTicket20041() throws Exception {
    7779        DataSet ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "alignCircleAfter1.osm")), null);
     80        ds.allPrimitives().forEach(p -> p.setReferrersDownloaded(true));
    7881
    7982        Way roundabout = null;
    … …  
    97100        DataSet ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "alignCircleBefore.osm")), null);
    98101        DataSet ds2 = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "alignCircleAfter2.osm")), null);
     102        ds.allPrimitives().forEach(p -> p.setReferrersDownloaded(true));
     103        ds2.allPrimitives().forEach(p -> p.setReferrersDownloaded(true));
    99104
    100105        Way circularWay = null;
    … …  
    129134        DataSet ds = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "alignCircleTwoWaysBefore.osm")), null);
    130135        DataSet ds2 = OsmReader.parseDataSet(Files.newInputStream(Paths.get(TestUtils.getTestDataRoot(), "alignCircleTwoWaysAfter.osm")), null);
     136        ds.allPrimitives().forEach(p -> p.setReferrersDownloaded(true));
     137        ds2.allPrimitives().forEach(p -> p.setReferrersDownloaded(true));
    131138
    132139        Set<Way> junctions = ds.getWays().stream().filter(w -> "roundabout".equals(w.get("junction"))).collect(Collectors.toSet());

  • trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java

    r18870 r19078  
    5757        try (InputStream is = TestUtils.getRegressionDataStream(9599, "ex5.osm")) {
    5858            DataSet ds = OsmReader.parseDataSet(is, null);
     59            ds.allPrimitives().forEach(p -> p.setReferrersDownloaded(true));
    5960            Layer layer = new OsmDataLayer(ds, null, null);
    6061            MainApplication.getLayerManager().addLayer(layer);
    … …  
    8182            DataSet ds = OsmReader.parseDataSet(is, null);
    8283            ds.addDataSource(new DataSource(new Bounds(-90, -180, 90, 180), "Everywhere"));
     84            ds.allPrimitives().forEach(p -> p.setReferrersDownloaded(true));
    8385            Layer layer = new OsmDataLayer(ds, null, null);
    8486            MainApplication.getLayerManager().addLayer(layer);
    … …  
    153155            DataSet ds = OsmReader.parseDataSet(is, null);
    154156            ds.addDataSource(new DataSource(new Bounds(-90, -180, 90, 180), "Everywhere"));
     157            ds.allPrimitives().forEach(p -> p.setReferrersDownloaded(true));
    155158            Layer layer = new OsmDataLayer(ds, null, null);
    156159            MainApplication.getLayerManager().addLayer(layer);

  • trunk/test/unit/org/openstreetmap/josm/command/CommandTest.java

    r19050 r19078  
    9090            node.setCoor(LatLon.ZERO);
    9191            node.put("existing", "existing");
     92            node.setReferrersDownloaded(true);
    9293            layer.data.addPrimitive(node);
    9394            return node;
    … …  
    105106            way.setNodes(Arrays.asList(nodes));
    106107            way.put("existing", "existing");
     108            way.setReferrersDownloaded(true);
    107109            layer.data.addPrimitive(way);
    108110            return way;
    … …  
    121123            }
    122124            relation.put("existing", "existing");
     125            relation.setReferrersDownloaded(true);
    123126            layer.data.addPrimitive(relation);
    124127            return relation;

  • trunk/test/unit/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialogTest.java

    r18870 r19078  
    7878        assertEqualsNewline(
    7979            "Way: 1\n" +
     80                "  State: referrers-not-all-downloaded\n" +
    8081                "  Data Set: "+Integer.toHexString(ds.hashCode())+"\n" +
    8182                "  Edited at: <new object>\n" +
Note: See TracChangeset for help on using the changeset viewer.