Amend tests for applying diffs with special object ordering

Test ordering of visible objects before deleted ones that are otherwise the same. This tests the changes in cff8ff42 in libosmium. It will fail for versions of libosmium before that.
osmcode · Dec 14, 2024 · 1c62771 · 1c62771
1 parent d7086bd
commit 1c62771
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/test/apply-changes/input-version+timestamp.osm b/test/apply-changes/input-version+timestamp.osm
@@ -6,6 +6,7 @@
   </node>
   <node id="2" version="2" timestamp="2017-01-03T00:00:00Z" lat="50" lon="10.01"/>
   <node id="3" version="1" timestamp="2017-01-03T00:00:00Z" lat="50" lon="10.02"/>
+  <node id="5" version="1" timestamp="2017-01-03T00:00:00Z" lat="50" lon="10.03"/>
   <way id="1" version="1" timestamp="2017-01-03T00:00:00Z">
     <nd ref="1"/>
     <nd ref="2"/>

diff --git a/test/apply-changes/input-version.osc b/test/apply-changes/input-version.osc
@@ -9,6 +9,9 @@
   <delete>
     <node id="3" version="1" visible="false"/>
   </delete>
+  <delete>
+    <node id="5" version="2" visible="false"/>
+  </delete>
   <create>
     <node id="4" version="1" lat="50.0" lon="10.02"/>
   </create>

diff --git a/test/apply-changes/output-version-applied-on-version+timestamp.osm b/test/apply-changes/output-version-applied-on-version+timestamp.osm
@@ -5,6 +5,7 @@
     <tag k="name" v="School"/>
   </node>
   <node id="2" version="2" timestamp="2017-01-03T00:00:00Z" lat="50" lon="10.01"/>
+  <node id="3" version="1" timestamp="2017-01-03T00:00:00Z" lat="50" lon="10.02"/>
   <node id="4" version="1" lat="50" lon="10.02"/>
   <way id="1" version="2">
     <nd ref="1"/>