From 7364bd888a2c827e605be21493d672639ffd6868 Mon Sep 17 00:00:00 2001 From: klingbolt Date: Wed, 11 Sep 2024 22:23:11 -0400 Subject: [PATCH] Previous test worked by accident. Made an addition to a previous test that does similar things --- .../input/pack/texture_one.png | Bin .../input/pack/trail.trl | Bin 0 -> 44 bytes .../input/pack/xml_file.xml | 3 ++- .../output_proto/markers.bin | Bin 159 -> 242 bytes .../output_proto/texture_one.png | Bin .../output_xml/037aa160e392f1c8.trl | Bin 0 -> 44 bytes .../output_xml/texture_one.png | Bin .../output_xml/xml_file.xml | 7 ++++--- .../xml_inheritance/input/pack/xml_file.xml | 9 --------- .../xml_inheritance/output_proto/markers.bin | Bin 58 -> 0 bytes .../xml_inheritance/output_xml/xml_file.xml | 9 --------- .../test_cases/xml_inheritance/testcase.yaml | 5 ----- xml_converter/src/packaging_xml.cpp | 2 +- 13 files changed, 7 insertions(+), 28 deletions(-) rename xml_converter/integration_tests/test_cases/{xml_inheritance => xml_category_inheritance}/input/pack/texture_one.png (100%) create mode 100644 xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/trail.trl rename xml_converter/integration_tests/test_cases/{xml_inheritance => xml_category_inheritance}/output_proto/texture_one.png (100%) create mode 100644 xml_converter/integration_tests/test_cases/xml_category_inheritance/output_xml/037aa160e392f1c8.trl rename xml_converter/integration_tests/test_cases/{xml_inheritance => xml_category_inheritance}/output_xml/texture_one.png (100%) delete mode 100644 xml_converter/integration_tests/test_cases/xml_inheritance/input/pack/xml_file.xml delete mode 100644 xml_converter/integration_tests/test_cases/xml_inheritance/output_proto/markers.bin delete mode 100644 xml_converter/integration_tests/test_cases/xml_inheritance/output_xml/xml_file.xml delete mode 100644 xml_converter/integration_tests/test_cases/xml_inheritance/testcase.yaml diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/input/pack/texture_one.png b/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/texture_one.png similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_inheritance/input/pack/texture_one.png rename to xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/texture_one.png diff --git a/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/trail.trl b/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/trail.trl new file mode 100644 index 0000000000000000000000000000000000000000..201ab83c8671d0e579b91b4f4f911c933b6a9de9 GIT binary patch literal 44 ncmZQzU|=u;Vg`l=dmwgTV0Zw;3_!d9L^}eRK>7d>3pfG*cS!~W literal 0 HcmV?d00001 diff --git a/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/xml_file.xml index 108f244a..eb80027f 100644 --- a/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/xml_file.xml +++ b/xml_converter/integration_tests/test_cases/xml_category_inheritance/input/pack/xml_file.xml @@ -1,7 +1,7 @@ - + @@ -17,5 +17,6 @@ + diff --git a/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_proto/markers.bin index 98788ad4502a7215e229ba79f32a38f148cfe7ff..caee33dc1c36d4cbe7e3d3c3da87ddb4d3e362e8 100644 GIT binary patch delta 174 zcmbQw_=$0XPkle5P?=DKl&Aosf{_zHF9X9pCs785IA>XghGou5rXXP}Eg>ETh6Z~E z1_lQpa*zV?fUE^Te852o$a?@}F*q_X2spZe6gqJf=!9Hpz2C7!N&svw7s6a8jvce^ z?ATtBbzX`aD5q}Z#0r*l;?SA2{B4#4pOp}UkRTU-Noqw&X;Er?eqO3xL0&ol1i&gd delta 69 zcmeywIG=HXk6MtBwUE4&u!4~jKQ9BrJtt8HhB#+ghK6O%P87d>3pfG*cS!~W literal 0 HcmV?d00001 diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/output_xml/texture_one.png b/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_xml/texture_one.png similarity index 100% rename from xml_converter/integration_tests/test_cases/xml_inheritance/output_xml/texture_one.png rename to xml_converter/integration_tests/test_cases/xml_category_inheritance/output_xml/texture_one.png diff --git a/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_xml/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_xml/xml_file.xml index 95f2e009..ed194efb 100644 --- a/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_xml/xml_file.xml +++ b/xml_converter/integration_tests/test_cases/xml_category_inheritance/output_xml/xml_file.xml @@ -13,8 +13,9 @@ - - - + + + + diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/input/pack/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_inheritance/input/pack/xml_file.xml deleted file mode 100644 index 6d6285d8..00000000 --- a/xml_converter/integration_tests/test_cases/xml_inheritance/input/pack/xml_file.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/output_proto/markers.bin b/xml_converter/integration_tests/test_cases/xml_inheritance/output_proto/markers.bin deleted file mode 100644 index a1b8ed6bf1c0a5c9eab5ba745754fc357379d58d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 58 zcmd;5=Hm9PRB%o#Nlni$s+3|8U{o+t0+UW08ZXYU9hw|BO^88Akc+=0wW6f7C^bGm KFIBG~FC74>V-Q&Y diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/output_xml/xml_file.xml b/xml_converter/integration_tests/test_cases/xml_inheritance/output_xml/xml_file.xml deleted file mode 100644 index c6f53a62..00000000 --- a/xml_converter/integration_tests/test_cases/xml_inheritance/output_xml/xml_file.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/xml_converter/integration_tests/test_cases/xml_inheritance/testcase.yaml b/xml_converter/integration_tests/test_cases/xml_inheritance/testcase.yaml deleted file mode 100644 index 9510c793..00000000 --- a/xml_converter/integration_tests/test_cases/xml_inheritance/testcase.yaml +++ /dev/null @@ -1,5 +0,0 @@ -input_paths: - "pack": "xml" -expected_stdout: | -expected_stderr: | -expected_returncode: 0 diff --git a/xml_converter/src/packaging_xml.cpp b/xml_converter/src/packaging_xml.cpp index 9e235ad2..b2806d37 100644 --- a/xml_converter/src/packaging_xml.cpp +++ b/xml_converter/src/packaging_xml.cpp @@ -166,7 +166,7 @@ vector parse_pois(rapidxml::xml_node<>* root_node, mapicon_attributes.size(); i++) { + for (size_t i = 0; i < categories[category_index]->trail_attributes.size(); i++) { trail->init_xml_attribute( categories[category_index]->trail_attributes[i], &ignored_errors,