Add integration tests for sort

Author: afarber

test/sort/CMakeLists.txt

@@ -16,6 +16,27 @@ function(check_sort1 _name _input _output _format)
     check_output(sort ${_name}_mp "sort --generator=test -f ${_format} -s multipass sort/${_input}" "sort/${_output}")
 endfunction()
 
+function(check_sort_warning _name _input _format _expected_stderr)
+    set(_cmd "$<TARGET_FILE:osmium> sort --no-progress --generator=test sort/${_input} -f ${_format} -o /tmp/test-sort-warning-output.osm --overwrite")
+    add_test(
+        NAME "sort-${_name}"
+        COMMAND ${CMAKE_COMMAND}
+        -D cmd:FILEPATH=${_cmd}
+        -D dir:PATH=${PROJECT_SOURCE_DIR}/test
+        -D expected_stderr:STRING=${_expected_stderr}
+        -P ${CMAKE_SOURCE_DIR}/test/sort/run_test_check_stderr.cmake
+    )
+    set(_cmd_mp "$<TARGET_FILE:osmium> sort --no-progress --generator=test -s multipass sort/${_input} -f ${_format} -o /tmp/test-sort-warning-output-mp.osm --overwrite")
+    add_test(
+        NAME "sort-${_name}-mp"
+        COMMAND ${CMAKE_COMMAND}
+        -D cmd:FILEPATH=${_cmd_mp}
+        -D dir:PATH=${PROJECT_SOURCE_DIR}/test
+        -D expected_stderr:STRING=${_expected_stderr}
+        -P ${CMAKE_SOURCE_DIR}/test/sort/run_test_check_stderr.cmake
+    )
+endfunction()
+
 
 #-----------------------------------------------------------------------------
 
@@ -32,4 +53,8 @@ check_sort1(mixed-metadata input-simple-onefile.osm output-simple-onefile.osm os
 check_sort1(history-partially-only-version input-history-partially-only-version.osm output-history-partially-only-version.osm osm)
 check_sort1(history-only-version input-history-only-version.osm output-history-only-version.osm osm)
 
+check_sort_warning(warning-xml input-with-locations.osm xml "Warning! Input file contains locations on ways that will be lost in output.")
+check_sort_warning(warning-pbf input-with-locations.osm pbf "Warning! Input file contains locations on ways that will be lost in output.")
+check_sort_warning(warning-opl input-with-locations.osm opl "Warning! Input file contains locations on ways that will be lost in output.")
+
 #-----------------------------------------------------------------------------

test/sort/input-with-locations.osm

@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<osm version="0.6" upload="false" generator="testdata">
+  <node id="10" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="1" lon="1"/>
+  <node id="11" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1"/>
+  <node id="12" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="3" lon="1"/>
+  <way id="20" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
+    <nd ref="10" lat="1" lon="1"/>
+    <nd ref="11" lat="2" lon="1"/>
+    <nd ref="12" lat="3" lon="1"/>
+    <tag k="highway" v="primary"/>
+  </way>
+</osm>

test/sort/run_test_check_stderr.cmake

@@ -0,0 +1,38 @@
+#
+# Runs a test command and checks that stderr contains expected warning message.
+# Used for testing warning functionality.
+#
+
+if(NOT cmd)
+    message(FATAL_ERROR "Variable 'cmd' not defined")
+endif()
+
+if(NOT dir)
+    message(FATAL_ERROR "Variable 'dir' not defined")
+endif()
+
+if(NOT expected_stderr)
+    message(FATAL_ERROR "Variable 'expected_stderr' not defined")
+endif()
+
+message("Executing: ${cmd}")
+separate_arguments(cmd)
+
+execute_process(
+    COMMAND ${cmd}
+    WORKING_DIRECTORY ${dir}
+    RESULT_VARIABLE _return_code
+    OUTPUT_VARIABLE _stdout
+    ERROR_VARIABLE _stderr
+)
+
+if(NOT _return_code EQUAL 0)
+    message(FATAL_ERROR "Command failed with return code ${_return_code}")
+endif()
+
+string(FIND "${_stderr}" "${expected_stderr}" _found_pos)
+if(_found_pos EQUAL -1)
+    message(FATAL_ERROR "Expected stderr message '${expected_stderr}' not found in stderr output: '${_stderr}'")
+endif()
+
+message(STATUS "Test passed: Found expected stderr message")