Add no-warning tests

Author: afarber

test/cat/CMakeLists.txt

@@ -26,6 +26,17 @@ function(check_warning _name _input _format _expected_stderr)
     )
 endfunction()
 
+function(check_no_warning _name _input _format)
+    set(_cmd "$<TARGET_FILE:osmium> cat --no-progress --generator=test cat/${_input} -f ${_format} -o ${CMAKE_BINARY_DIR}/test/cat/no-warning-${_name}.osm --overwrite")
+    add_test(
+        NAME "cat-${_name}"
+        COMMAND ${CMAKE_COMMAND}
+        -D cmd:FILEPATH=${_cmd}
+        -D dir:PATH=${PROJECT_SOURCE_DIR}/test
+        -P ${CMAKE_SOURCE_DIR}/test/cat/run_test_check_no_stderr.cmake
+    )
+endfunction()
+
 
 #-----------------------------------------------------------------------------
 
@@ -41,5 +52,8 @@ check_convert(opl output1.osm.opl output1.osm.opl opl)
 check_warning(warning-pbf-to-xml input-with-locations.osm.pbf xml "Warning! Input file contains locations on ways that will be lost in output.")
 check_warning(warning-pbf-to-opl input-with-locations.osm.pbf opl "Warning! Input file contains locations on ways that will be lost in output.")
 
+check_no_warning(no-warning-pbf-to-xml input-without-locations.osm.pbf xml)
+check_no_warning(no-warning-pbf-to-opl input-without-locations.osm.pbf opl)
+
 
 #-----------------------------------------------------------------------------

test/cat/input-without-locations.osm.pbf

@@ -0,0 +1,34 @@
+#
+# Runs a test command and checks that stderr is empty (no warning message).
+# Used for testing that no false positive warnings appear.
+#
+
+if(NOT cmd)
+    message(FATAL_ERROR "Variable 'cmd' not defined")
+endif()
+
+if(NOT dir)
+    message(FATAL_ERROR "Variable 'dir' 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}" "Warning! Input file contains locations on ways" _found_pos)
+if(NOT _found_pos EQUAL -1)
+    message(FATAL_ERROR "Unexpected warning message found in stderr output: '${_stderr}'")
+endif()
+
+message(STATUS "Test passed: No warning message found")

test/cat/run_test_check_no_stderr.cmake

@@ -37,6 +37,25 @@ function(check_sort_warning _name _input _format _expected_stderr)
     )
 endfunction()
 
+function(check_sort_no_warning _name _input _format)
+    set(_cmd "$<TARGET_FILE:osmium> sort --no-progress --generator=test sort/${_input} -f ${_format} -o ${CMAKE_BINARY_DIR}/test/sort/no-warning-${_name}.osm --overwrite")
+    add_test(
+        NAME "sort-${_name}"
+        COMMAND ${CMAKE_COMMAND}
+        -D cmd:FILEPATH=${_cmd}
+        -D dir:PATH=${PROJECT_SOURCE_DIR}/test
+        -P ${CMAKE_SOURCE_DIR}/test/sort/run_test_check_no_stderr.cmake
+    )
+    set(_cmd_mp "$<TARGET_FILE:osmium> sort --no-progress --generator=test -s multipass sort/${_input} -f ${_format} -o ${CMAKE_BINARY_DIR}/test/sort/no-warning-${_name}-mp.osm --overwrite")
+    add_test(
+        NAME "sort-${_name}-mp"
+        COMMAND ${CMAKE_COMMAND}
+        -D cmd:FILEPATH=${_cmd_mp}
+        -D dir:PATH=${PROJECT_SOURCE_DIR}/test
+        -P ${CMAKE_SOURCE_DIR}/test/sort/run_test_check_no_stderr.cmake
+    )
+endfunction()
+
 
 #-----------------------------------------------------------------------------
 
@@ -56,4 +75,7 @@ check_sort1(history-only-version input-history-only-version.osm output-history-o
 check_sort_warning(warning-pbf-to-xml input-with-locations.osm.pbf xml "Warning! Input file contains locations on ways that will be lost in output.")
 check_sort_warning(warning-pbf-to-opl input-with-locations.osm.pbf opl "Warning! Input file contains locations on ways that will be lost in output.")
 
+check_sort_no_warning(no-warning-pbf-to-xml input-without-locations.osm.pbf xml)
+check_sort_no_warning(no-warning-pbf-to-opl input-without-locations.osm.pbf opl)
+
 #-----------------------------------------------------------------------------

test/sort/CMakeLists.txt

@@ -0,0 +1,34 @@
+#
+# Runs a test command and checks that stderr is empty (no warning message).
+# Used for testing that no false positive warnings appear.
+#
+
+if(NOT cmd)
+    message(FATAL_ERROR "Variable 'cmd' not defined")
+endif()
+
+if(NOT dir)
+    message(FATAL_ERROR "Variable 'dir' 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}" "Warning! Input file contains locations on ways" _found_pos)
+if(NOT _found_pos EQUAL -1)
+    message(FATAL_ERROR "Unexpected warning message found in stderr output: '${_stderr}'")
+endif()
+
+message(STATUS "Test passed: No warning message found")