Skip to content

Commit 6685c54

Browse files
committed
Add further tests to run with GitHub Actions
1 parent 0de7660 commit 6685c54

2 files changed

Lines changed: 28 additions & 0 deletions

File tree

dynadjust/CMakeLists.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1106,6 +1106,28 @@ if (BUILD_TESTING)
11061106
add_test (NAME reftran-source-test COMMAND $<TARGET_FILE:${DNAREFTRAN_TARGET}> srctest -r itrf2014 -e 01.01.2020 --export-xml)
11071107
add_test (NAME check-source-reftran COMMAND bash check_source_tags.sh srctest.ITRF2014.01.01.2020msr.xml CAMPAIGN_2023A CAMPAIGN_2023B EMPTY)
11081108

1109+
# 8a. XML import with and without xsi:noNamespaceSchemaLocation (issue #346)
1110+
# Verify dnaimport handles XML files regardless of whether the schema location
1111+
# attribute is present. Strip the attribute and import each sample data pair.
1112+
1113+
# gnss-network: with schema location (original files)
1114+
add_test (NAME import-xml-gnss-with-xsd COMMAND $<TARGET_FILE:${DNAIMPORT_TARGET}> -n xsd_gnss gnss-networkstn.xml gnss-networkmsr.xml -r GDA2020)
1115+
# gnss-network: without schema location
1116+
add_test (NAME import-xml-gnss-strip COMMAND bash strip_schema_location.sh gnss-networkstn.xml gnss-networkstn-noxsd.xml)
1117+
add_test (NAME import-xml-gnss-strip-msr COMMAND bash strip_schema_location.sh gnss-networkmsr.xml gnss-networkmsr-noxsd.xml)
1118+
add_test (NAME import-xml-gnss-without-xsd COMMAND $<TARGET_FILE:${DNAIMPORT_TARGET}> -n xsd_gnss gnss-networkstn-noxsd.xml gnss-networkmsr-noxsd.xml -r GDA2020)
1119+
set_tests_properties(import-xml-gnss-strip import-xml-gnss-strip-msr PROPERTIES FIXTURES_SETUP gnss_strip)
1120+
set_tests_properties(import-xml-gnss-without-xsd PROPERTIES FIXTURES_REQUIRED gnss_strip)
1121+
1122+
# urban-network: with schema location
1123+
add_test (NAME import-xml-urban-with-xsd COMMAND $<TARGET_FILE:${DNAIMPORT_TARGET}> -n xsd_urban urban-networkstn.xml urban-networkmsr.xml -r GDA2020)
1124+
# urban-network: without schema location
1125+
add_test (NAME import-xml-urban-strip COMMAND bash strip_schema_location.sh urban-networkstn.xml urban-networkstn-noxsd.xml)
1126+
add_test (NAME import-xml-urban-strip-msr COMMAND bash strip_schema_location.sh urban-networkmsr.xml urban-networkmsr-noxsd.xml)
1127+
add_test (NAME import-xml-urban-without-xsd COMMAND $<TARGET_FILE:${DNAIMPORT_TARGET}> -n xsd_urban urban-networkstn-noxsd.xml urban-networkmsr-noxsd.xml -r GDA2020)
1128+
set_tests_properties(import-xml-urban-strip import-xml-urban-strip-msr PROPERTIES FIXTURES_SETUP urban_strip)
1129+
set_tests_properties(import-xml-urban-without-xsd PROPERTIES FIXTURES_REQUIRED urban_strip)
1130+
11091131
# 9. gnss reference frame transformations
11101132
add_test (NAME ref-gnss01-network COMMAND $<TARGET_FILE:${DNAREFTRAN_TARGET}> gnss -r itrf2014 -e 01.01.2020)
11111133
add_test (NAME ref-gnss02-network COMMAND $<TARGET_FILE:${DNAREFTRAN_TARGET}> gnss -r itrf1988 -e 03.12.1995)
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
# Strip xsi:noNamespaceSchemaLocation attribute from DynaML XML files.
3+
# Usage: strip_schema_location.sh <input.xml> <output.xml>
4+
[ $# -ne 2 ] && { echo "Usage: $0 <input.xml> <output.xml>"; exit 1; }
5+
[ -f "$1" ] || { echo "FAIL: $1 not found"; exit 1; }
6+
sed 's/ xsi:noNamespaceSchemaLocation="DynaML\.xsd"//' "$1" > "$2"

0 commit comments

Comments
 (0)