From 255235644c8c302e1e92c41c13be3f3ad5973b16 Mon Sep 17 00:00:00 2001 From: JoeOLeary Date: Tue, 14 Jan 2020 10:54:59 +0000 Subject: Add support for TS 28.550/28.532 Issue-ID: DCAEGEN2-1912 Change-Id: If05c3673a240e6ea5e3d1caca3ff5bf5828590d3 Signed-off-by: JoeOLeary --- .../filter_test/lte/meas_results/expected.xml | 22 +++++++++ .../filter_test/lte/meas_results/test.xml | 24 ++++++++++ .../lte/meas_results_manyinfo/expected.xml | 32 +++++++++++++ .../filter_test/lte/meas_results_manyinfo/test.xml | 44 ++++++++++++++++++ .../filter_test/lte/meas_type_and_r/expected.xml | 24 ++++++++++ .../filter_test/lte/meas_type_and_r/test.xml | 26 +++++++++++ .../meas_type_and_r_many_measvalue/expected.xml | 30 ++++++++++++ .../lte/meas_type_and_r_many_measvalue/test.xml | 36 +++++++++++++++ .../lte/meas_type_and_r_manyinfo/expected.xml | 36 +++++++++++++++ .../lte/meas_type_and_r_manyinfo/test.xml | 54 ++++++++++++++++++++++ src/test/resources/filter_test/meas_results.xml | 24 ---------- .../filter_test/meas_results_filtered.xml | 22 --------- .../filter_test/meas_results_manyInfo.xml | 44 ------------------ .../filter_test/meas_results_manyInfo_filtered.xml | 32 ------------- src/test/resources/filter_test/meas_type_and_r.xml | 26 ----------- .../filter_test/meas_type_and_r_filtered.xml | 24 ---------- .../filter_test/meas_type_and_r_manyInfo.xml | 54 ---------------------- .../meas_type_and_r_manyInfo_filtered.xml | 36 --------------- .../filter_test/meas_type_and_r_manyMeasvalue.xml | 36 --------------- .../meas_type_and_r_manyMeasvalue_filtered.xml | 30 ------------ .../filter_test/nr/meas_results/expected.xml | 22 +++++++++ .../resources/filter_test/nr/meas_results/test.xml | 24 ++++++++++ .../nr/meas_results_manyinfo/expected.xml | 32 +++++++++++++ .../filter_test/nr/meas_results_manyinfo/test.xml | 44 ++++++++++++++++++ .../filter_test/nr/meas_type_and_r/expected.xml | 24 ++++++++++ .../filter_test/nr/meas_type_and_r/test.xml | 26 +++++++++++ .../nr/meas_type_and_r_many_measvalue/expected.xml | 30 ++++++++++++ .../nr/meas_type_and_r_many_measvalue/test.xml | 36 +++++++++++++++ .../nr/meas_type_and_r_manyinfo/expected.xml | 36 +++++++++++++++ .../nr/meas_type_and_r_manyinfo/test.xml | 54 ++++++++++++++++++++++ .../mapping_data/28.550/meas_results/metadata.json | 12 +++++ .../mapping_data/28.550/meas_results/test.xml | 24 ++++++++++ .../28.550/meas_type_and_r/metadata.json | 12 +++++ .../mapping_data/28.550/meas_type_and_r/test.xml | 28 +++++++++++ .../meas_type_and_r_many_meas_values/metadata.json | 12 +++++ .../meas_type_and_r_many_meas_values/test.xml | 34 ++++++++++++++ .../metadata.json | 12 +++++ .../test.xml | 28 +++++++++++ .../mapping_data/28.550/no_measdata/metadata.json | 12 +++++ .../mapping_data/28.550/no_measdata/test.xml | 11 +++++ .../28.550/no_sw_version/metadata.json | 12 +++++ .../mapping_data/28.550/no_sw_version/test.xml | 28 +++++++++++ .../mapping_data/32.435/meas_results/metadata.json | 12 +++++ .../mapping_data/32.435/meas_results/test.xml | 24 ++++++++++ .../32.435/meas_type_and_r/metadata.json | 12 +++++ .../mapping_data/32.435/meas_type_and_r/test.xml | 28 +++++++++++ .../meas_type_and_r_many_meas_values/metadata.json | 12 +++++ .../meas_type_and_r_many_meas_values/test.xml | 34 ++++++++++++++ .../metadata.json | 12 +++++ .../test.xml | 28 +++++++++++ .../mapping_data/32.435/no_measdata/metadata.json | 12 +++++ .../mapping_data/32.435/no_measdata/test.xml | 11 +++++ .../32.435/no_sw_version/metadata.json | 12 +++++ .../mapping_data/32.435/no_sw_version/test.xml | 28 +++++++++++ .../mapping_data/valid_data/meas_results.xml | 24 ---------- .../mapping_data/valid_data/meas_type_and_r.xml | 28 ----------- .../meas_type_and_r_many_meas_values.xml | 34 -------------- ...eas_types_and_meas_results_many_meas_values.xml | 28 ----------- .../mapping_data/valid_data/no_measdata.xml | 11 ----- .../mapping_data/valid_data/no_sw_version.xml | 28 ----------- src/test/resources/metadata/invalid_metadata.json | 11 +++++ src/test/resources/metadata/valid_4g_metadata.json | 12 +++++ src/test/resources/metadata/valid_5g_metadata.json | 12 +++++ .../split_test/lte/type_a_1_event/split.props | 2 + .../split_test/lte/type_a_1_event/test.xml | 23 +++++++++ .../split_test/lte/type_c_3_events/split.props | 2 + .../split_test/lte/type_c_3_events/test.xml | 49 ++++++++++++++++++++ .../split_test/nr/type_a_1_event/split.props | 2 + .../split_test/nr/type_a_1_event/test.xml | 23 +++++++++ .../split_test/nr/type_c_3_events/split.props | 2 + .../split_test/nr/type_c_3_events/test.xml | 49 ++++++++++++++++++++ .../test_data/invalid/no_file_header.xml | 22 --------- .../test_data/invalid/no_managed_element.xml | 27 ----------- .../test_data/lte/no_file_header/test.xml | 22 +++++++++ .../test_data/lte/no_file_header/validity.props | 1 + .../test_data/lte/no_managed_element/test.xml | 27 +++++++++++ .../lte/no_managed_element/validity.props | 1 + .../test_data/lte/no_measdata/test.xml | 10 ++++ .../test_data/lte/no_measdata/validity.props | 1 + .../test_data/nr/no_file_header/test.xml | 22 +++++++++ .../test_data/nr/no_file_header/validity.props | 1 + .../test_data/nr/no_measdata/test.xml | 10 ++++ .../test_data/nr/no_measdata/validity.props | 1 + .../test_data/nr/no_measured_entity/test.xml | 27 +++++++++++ .../test_data/nr/no_measured_entity/validity.props | 1 + .../test_data/valid/no_measdata.xml | 10 ---- 86 files changed, 1417 insertions(+), 540 deletions(-) create mode 100644 src/test/resources/filter_test/lte/meas_results/expected.xml create mode 100644 src/test/resources/filter_test/lte/meas_results/test.xml create mode 100644 src/test/resources/filter_test/lte/meas_results_manyinfo/expected.xml create mode 100644 src/test/resources/filter_test/lte/meas_results_manyinfo/test.xml create mode 100644 src/test/resources/filter_test/lte/meas_type_and_r/expected.xml create mode 100644 src/test/resources/filter_test/lte/meas_type_and_r/test.xml create mode 100644 src/test/resources/filter_test/lte/meas_type_and_r_many_measvalue/expected.xml create mode 100644 src/test/resources/filter_test/lte/meas_type_and_r_many_measvalue/test.xml create mode 100644 src/test/resources/filter_test/lte/meas_type_and_r_manyinfo/expected.xml create mode 100644 src/test/resources/filter_test/lte/meas_type_and_r_manyinfo/test.xml delete mode 100644 src/test/resources/filter_test/meas_results.xml delete mode 100644 src/test/resources/filter_test/meas_results_filtered.xml delete mode 100644 src/test/resources/filter_test/meas_results_manyInfo.xml delete mode 100644 src/test/resources/filter_test/meas_results_manyInfo_filtered.xml delete mode 100644 src/test/resources/filter_test/meas_type_and_r.xml delete mode 100644 src/test/resources/filter_test/meas_type_and_r_filtered.xml delete mode 100644 src/test/resources/filter_test/meas_type_and_r_manyInfo.xml delete mode 100644 src/test/resources/filter_test/meas_type_and_r_manyInfo_filtered.xml delete mode 100644 src/test/resources/filter_test/meas_type_and_r_manyMeasvalue.xml delete mode 100644 src/test/resources/filter_test/meas_type_and_r_manyMeasvalue_filtered.xml create mode 100644 src/test/resources/filter_test/nr/meas_results/expected.xml create mode 100644 src/test/resources/filter_test/nr/meas_results/test.xml create mode 100644 src/test/resources/filter_test/nr/meas_results_manyinfo/expected.xml create mode 100644 src/test/resources/filter_test/nr/meas_results_manyinfo/test.xml create mode 100644 src/test/resources/filter_test/nr/meas_type_and_r/expected.xml create mode 100644 src/test/resources/filter_test/nr/meas_type_and_r/test.xml create mode 100644 src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/expected.xml create mode 100644 src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/test.xml create mode 100644 src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/expected.xml create mode 100644 src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/test.xml create mode 100644 src/test/resources/mapper_test/mapping_data/28.550/meas_results/metadata.json create mode 100644 src/test/resources/mapper_test/mapping_data/28.550/meas_results/test.xml create mode 100644 src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r/metadata.json create mode 100644 src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r/test.xml create mode 100644 src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r_many_meas_values/metadata.json create mode 100644 src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r_many_meas_values/test.xml create mode 100644 src/test/resources/mapper_test/mapping_data/28.550/meas_types_and_meas_results_many_meas_values/metadata.json create mode 100644 src/test/resources/mapper_test/mapping_data/28.550/meas_types_and_meas_results_many_meas_values/test.xml create mode 100644 src/test/resources/mapper_test/mapping_data/28.550/no_measdata/metadata.json create mode 100644 src/test/resources/mapper_test/mapping_data/28.550/no_measdata/test.xml create mode 100644 src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/metadata.json create mode 100644 src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/test.xml create mode 100644 src/test/resources/mapper_test/mapping_data/32.435/meas_results/metadata.json create mode 100644 src/test/resources/mapper_test/mapping_data/32.435/meas_results/test.xml create mode 100644 src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r/metadata.json create mode 100644 src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r/test.xml create mode 100644 src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r_many_meas_values/metadata.json create mode 100644 src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r_many_meas_values/test.xml create mode 100644 src/test/resources/mapper_test/mapping_data/32.435/meas_types_and_meas_results_many_meas_values/metadata.json create mode 100644 src/test/resources/mapper_test/mapping_data/32.435/meas_types_and_meas_results_many_meas_values/test.xml create mode 100644 src/test/resources/mapper_test/mapping_data/32.435/no_measdata/metadata.json create mode 100644 src/test/resources/mapper_test/mapping_data/32.435/no_measdata/test.xml create mode 100644 src/test/resources/mapper_test/mapping_data/32.435/no_sw_version/metadata.json create mode 100644 src/test/resources/mapper_test/mapping_data/32.435/no_sw_version/test.xml delete mode 100644 src/test/resources/mapper_test/mapping_data/valid_data/meas_results.xml delete mode 100644 src/test/resources/mapper_test/mapping_data/valid_data/meas_type_and_r.xml delete mode 100644 src/test/resources/mapper_test/mapping_data/valid_data/meas_type_and_r_many_meas_values.xml delete mode 100644 src/test/resources/mapper_test/mapping_data/valid_data/meas_types_and_meas_results_many_meas_values.xml delete mode 100644 src/test/resources/mapper_test/mapping_data/valid_data/no_measdata.xml delete mode 100644 src/test/resources/mapper_test/mapping_data/valid_data/no_sw_version.xml create mode 100644 src/test/resources/metadata/invalid_metadata.json create mode 100644 src/test/resources/metadata/valid_4g_metadata.json create mode 100644 src/test/resources/metadata/valid_5g_metadata.json create mode 100644 src/test/resources/split_test/lte/type_a_1_event/split.props create mode 100644 src/test/resources/split_test/lte/type_a_1_event/test.xml create mode 100644 src/test/resources/split_test/lte/type_c_3_events/split.props create mode 100644 src/test/resources/split_test/lte/type_c_3_events/test.xml create mode 100644 src/test/resources/split_test/nr/type_a_1_event/split.props create mode 100644 src/test/resources/split_test/nr/type_a_1_event/test.xml create mode 100644 src/test/resources/split_test/nr/type_c_3_events/split.props create mode 100644 src/test/resources/split_test/nr/type_c_3_events/test.xml delete mode 100644 src/test/resources/xml_validator_test/test_data/invalid/no_file_header.xml delete mode 100644 src/test/resources/xml_validator_test/test_data/invalid/no_managed_element.xml create mode 100644 src/test/resources/xml_validator_test/test_data/lte/no_file_header/test.xml create mode 100644 src/test/resources/xml_validator_test/test_data/lte/no_file_header/validity.props create mode 100644 src/test/resources/xml_validator_test/test_data/lte/no_managed_element/test.xml create mode 100644 src/test/resources/xml_validator_test/test_data/lte/no_managed_element/validity.props create mode 100644 src/test/resources/xml_validator_test/test_data/lte/no_measdata/test.xml create mode 100644 src/test/resources/xml_validator_test/test_data/lte/no_measdata/validity.props create mode 100644 src/test/resources/xml_validator_test/test_data/nr/no_file_header/test.xml create mode 100644 src/test/resources/xml_validator_test/test_data/nr/no_file_header/validity.props create mode 100644 src/test/resources/xml_validator_test/test_data/nr/no_measdata/test.xml create mode 100644 src/test/resources/xml_validator_test/test_data/nr/no_measdata/validity.props create mode 100644 src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/test.xml create mode 100644 src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/validity.props delete mode 100644 src/test/resources/xml_validator_test/test_data/valid/no_measdata.xml (limited to 'src/test/resources') diff --git a/src/test/resources/filter_test/lte/meas_results/expected.xml b/src/test/resources/filter_test/lte/meas_results/expected.xml new file mode 100644 index 0000000..af45364 --- /dev/null +++ b/src/test/resources/filter_test/lte/meas_results/expected.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + a b + + 1 2 + false + + + + + + + \ No newline at end of file diff --git a/src/test/resources/filter_test/lte/meas_results/test.xml b/src/test/resources/filter_test/lte/meas_results/test.xml new file mode 100644 index 0000000..5825e7b --- /dev/null +++ b/src/test/resources/filter_test/lte/meas_results/test.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + z a zz b + + 99 1 27 2 + false + + + + + + + diff --git a/src/test/resources/filter_test/lte/meas_results_manyinfo/expected.xml b/src/test/resources/filter_test/lte/meas_results_manyinfo/expected.xml new file mode 100644 index 0000000..4a887d5 --- /dev/null +++ b/src/test/resources/filter_test/lte/meas_results_manyinfo/expected.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + a b + + 1 2 + false + + + + + + + a b + + 1 2 + false + + + + + + + \ No newline at end of file diff --git a/src/test/resources/filter_test/lte/meas_results_manyinfo/test.xml b/src/test/resources/filter_test/lte/meas_results_manyinfo/test.xml new file mode 100644 index 0000000..2b87912 --- /dev/null +++ b/src/test/resources/filter_test/lte/meas_results_manyinfo/test.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + z aa zz bb + + 99 1 27 2 + false + + + + + + + z a zz b + + 99 1 27 2 + false + + + + + + + z a zz b + + 99 1 27 2 + false + + + + + + + diff --git a/src/test/resources/filter_test/lte/meas_type_and_r/expected.xml b/src/test/resources/filter_test/lte/meas_type_and_r/expected.xml new file mode 100644 index 0000000..f2146f7 --- /dev/null +++ b/src/test/resources/filter_test/lte/meas_type_and_r/expected.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + a + b + + 1 + 2 + false + + + + + + + \ No newline at end of file diff --git a/src/test/resources/filter_test/lte/meas_type_and_r/test.xml b/src/test/resources/filter_test/lte/meas_type_and_r/test.xml new file mode 100644 index 0000000..0d99e39 --- /dev/null +++ b/src/test/resources/filter_test/lte/meas_type_and_r/test.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + a + z + b + + 1 + 99 + 2 + false + + + + + + + \ No newline at end of file diff --git a/src/test/resources/filter_test/lte/meas_type_and_r_many_measvalue/expected.xml b/src/test/resources/filter_test/lte/meas_type_and_r_many_measvalue/expected.xml new file mode 100644 index 0000000..9f185a4 --- /dev/null +++ b/src/test/resources/filter_test/lte/meas_type_and_r_many_measvalue/expected.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + a + b + + 1 + 2 + false + + + 111 + 222 + false + + + + + + + \ No newline at end of file diff --git a/src/test/resources/filter_test/lte/meas_type_and_r_many_measvalue/test.xml b/src/test/resources/filter_test/lte/meas_type_and_r_many_measvalue/test.xml new file mode 100644 index 0000000..691882c --- /dev/null +++ b/src/test/resources/filter_test/lte/meas_type_and_r_many_measvalue/test.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + a + b + c + + 1 + 2 + false + + + 88 + 99 + false + + + 111 + 222 + false + + + + + + + \ No newline at end of file diff --git a/src/test/resources/filter_test/lte/meas_type_and_r_manyinfo/expected.xml b/src/test/resources/filter_test/lte/meas_type_and_r_manyinfo/expected.xml new file mode 100644 index 0000000..b517a7d --- /dev/null +++ b/src/test/resources/filter_test/lte/meas_type_and_r_manyinfo/expected.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + a + b + + 1 + 2 + false + + + + + + + a + b + + 1 + 2 + false + + + + + + + \ No newline at end of file diff --git a/src/test/resources/filter_test/lte/meas_type_and_r_manyinfo/test.xml b/src/test/resources/filter_test/lte/meas_type_and_r_manyinfo/test.xml new file mode 100644 index 0000000..dd35dfc --- /dev/null +++ b/src/test/resources/filter_test/lte/meas_type_and_r_manyinfo/test.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + a + z + b + + 1 + 99 + 2 + false + + + + + + + aa + z + bb + + 1 + 99 + 2 + false + + + + + + + a + z + b + + 1 + 99 + 2 + false + + + + + + + \ No newline at end of file diff --git a/src/test/resources/filter_test/meas_results.xml b/src/test/resources/filter_test/meas_results.xml deleted file mode 100644 index 5825e7b..0000000 --- a/src/test/resources/filter_test/meas_results.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - z a zz b - - 99 1 27 2 - false - - - - - - - diff --git a/src/test/resources/filter_test/meas_results_filtered.xml b/src/test/resources/filter_test/meas_results_filtered.xml deleted file mode 100644 index af45364..0000000 --- a/src/test/resources/filter_test/meas_results_filtered.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - a b - - 1 2 - false - - - - - - - \ No newline at end of file diff --git a/src/test/resources/filter_test/meas_results_manyInfo.xml b/src/test/resources/filter_test/meas_results_manyInfo.xml deleted file mode 100644 index 2b87912..0000000 --- a/src/test/resources/filter_test/meas_results_manyInfo.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - z aa zz bb - - 99 1 27 2 - false - - - - - - - z a zz b - - 99 1 27 2 - false - - - - - - - z a zz b - - 99 1 27 2 - false - - - - - - - diff --git a/src/test/resources/filter_test/meas_results_manyInfo_filtered.xml b/src/test/resources/filter_test/meas_results_manyInfo_filtered.xml deleted file mode 100644 index 4a887d5..0000000 --- a/src/test/resources/filter_test/meas_results_manyInfo_filtered.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - a b - - 1 2 - false - - - - - - - a b - - 1 2 - false - - - - - - - \ No newline at end of file diff --git a/src/test/resources/filter_test/meas_type_and_r.xml b/src/test/resources/filter_test/meas_type_and_r.xml deleted file mode 100644 index 0d99e39..0000000 --- a/src/test/resources/filter_test/meas_type_and_r.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - a - z - b - - 1 - 99 - 2 - false - - - - - - - \ No newline at end of file diff --git a/src/test/resources/filter_test/meas_type_and_r_filtered.xml b/src/test/resources/filter_test/meas_type_and_r_filtered.xml deleted file mode 100644 index f2146f7..0000000 --- a/src/test/resources/filter_test/meas_type_and_r_filtered.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - a - b - - 1 - 2 - false - - - - - - - \ No newline at end of file diff --git a/src/test/resources/filter_test/meas_type_and_r_manyInfo.xml b/src/test/resources/filter_test/meas_type_and_r_manyInfo.xml deleted file mode 100644 index dd35dfc..0000000 --- a/src/test/resources/filter_test/meas_type_and_r_manyInfo.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - a - z - b - - 1 - 99 - 2 - false - - - - - - - aa - z - bb - - 1 - 99 - 2 - false - - - - - - - a - z - b - - 1 - 99 - 2 - false - - - - - - - \ No newline at end of file diff --git a/src/test/resources/filter_test/meas_type_and_r_manyInfo_filtered.xml b/src/test/resources/filter_test/meas_type_and_r_manyInfo_filtered.xml deleted file mode 100644 index b517a7d..0000000 --- a/src/test/resources/filter_test/meas_type_and_r_manyInfo_filtered.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - a - b - - 1 - 2 - false - - - - - - - a - b - - 1 - 2 - false - - - - - - - \ No newline at end of file diff --git a/src/test/resources/filter_test/meas_type_and_r_manyMeasvalue.xml b/src/test/resources/filter_test/meas_type_and_r_manyMeasvalue.xml deleted file mode 100644 index 691882c..0000000 --- a/src/test/resources/filter_test/meas_type_and_r_manyMeasvalue.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - a - b - c - - 1 - 2 - false - - - 88 - 99 - false - - - 111 - 222 - false - - - - - - - \ No newline at end of file diff --git a/src/test/resources/filter_test/meas_type_and_r_manyMeasvalue_filtered.xml b/src/test/resources/filter_test/meas_type_and_r_manyMeasvalue_filtered.xml deleted file mode 100644 index 9f185a4..0000000 --- a/src/test/resources/filter_test/meas_type_and_r_manyMeasvalue_filtered.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - a - b - - 1 - 2 - false - - - 111 - 222 - false - - - - - - - \ No newline at end of file diff --git a/src/test/resources/filter_test/nr/meas_results/expected.xml b/src/test/resources/filter_test/nr/meas_results/expected.xml new file mode 100644 index 0000000..834b54a --- /dev/null +++ b/src/test/resources/filter_test/nr/meas_results/expected.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + a b + + 1 2 + false + + + + + + + \ No newline at end of file diff --git a/src/test/resources/filter_test/nr/meas_results/test.xml b/src/test/resources/filter_test/nr/meas_results/test.xml new file mode 100644 index 0000000..0b84ff6 --- /dev/null +++ b/src/test/resources/filter_test/nr/meas_results/test.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + z a zz b + + 99 1 27 2 + false + + + + + + + diff --git a/src/test/resources/filter_test/nr/meas_results_manyinfo/expected.xml b/src/test/resources/filter_test/nr/meas_results_manyinfo/expected.xml new file mode 100644 index 0000000..1f9cfbf --- /dev/null +++ b/src/test/resources/filter_test/nr/meas_results_manyinfo/expected.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + a b + + 1 2 + false + + + + + + + a b + + 1 2 + false + + + + + + + \ No newline at end of file diff --git a/src/test/resources/filter_test/nr/meas_results_manyinfo/test.xml b/src/test/resources/filter_test/nr/meas_results_manyinfo/test.xml new file mode 100644 index 0000000..217d339 --- /dev/null +++ b/src/test/resources/filter_test/nr/meas_results_manyinfo/test.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + z aa zz bb + + 99 1 27 2 + false + + + + + + + z a zz b + + 99 1 27 2 + false + + + + + + + z a zz b + + 99 1 27 2 + false + + + + + + + diff --git a/src/test/resources/filter_test/nr/meas_type_and_r/expected.xml b/src/test/resources/filter_test/nr/meas_type_and_r/expected.xml new file mode 100644 index 0000000..74090c6 --- /dev/null +++ b/src/test/resources/filter_test/nr/meas_type_and_r/expected.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + a + b + + 1 + 2 + false + + + + + + + \ No newline at end of file diff --git a/src/test/resources/filter_test/nr/meas_type_and_r/test.xml b/src/test/resources/filter_test/nr/meas_type_and_r/test.xml new file mode 100644 index 0000000..e55d303 --- /dev/null +++ b/src/test/resources/filter_test/nr/meas_type_and_r/test.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + a + z + b + + 1 + 99 + 2 + false + + + + + + + \ No newline at end of file diff --git a/src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/expected.xml b/src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/expected.xml new file mode 100644 index 0000000..afc8e6f --- /dev/null +++ b/src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/expected.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + a + b + + 1 + 2 + false + + + 111 + 222 + false + + + + + + + \ No newline at end of file diff --git a/src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/test.xml b/src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/test.xml new file mode 100644 index 0000000..f268ca2 --- /dev/null +++ b/src/test/resources/filter_test/nr/meas_type_and_r_many_measvalue/test.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + a + b + c + + 1 + 2 + false + + + 88 + 99 + false + + + 111 + 222 + false + + + + + + + \ No newline at end of file diff --git a/src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/expected.xml b/src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/expected.xml new file mode 100644 index 0000000..03c42ab --- /dev/null +++ b/src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/expected.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + a + b + + 1 + 2 + false + + + + + + + a + b + + 1 + 2 + false + + + + + + + \ No newline at end of file diff --git a/src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/test.xml b/src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/test.xml new file mode 100644 index 0000000..beda93f --- /dev/null +++ b/src/test/resources/filter_test/nr/meas_type_and_r_manyinfo/test.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + a + z + b + + 1 + 99 + 2 + false + + + + + + + aa + z + bb + + 1 + 99 + 2 + false + + + + + + + a + z + b + + 1 + 99 + 2 + false + + + + + + + \ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/28.550/meas_results/metadata.json b/src/test/resources/mapper_test/mapping_data/28.550/meas_results/metadata.json new file mode 100644 index 0000000..3456b7c --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/28.550/meas_results/metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "NrRadio", + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.28.550#measData", + "fileFormatVersion": "V9" +} \ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/28.550/meas_results/test.xml b/src/test/resources/mapper_test/mapping_data/28.550/meas_results/test.xml new file mode 100644 index 0000000..29747dc --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/28.550/meas_results/test.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + a b c + + 76 27 98 + false + + + + + + + diff --git a/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r/metadata.json b/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r/metadata.json new file mode 100644 index 0000000..3456b7c --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r/metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "NrRadio", + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.28.550#measData", + "fileFormatVersion": "V9" +} \ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r/test.xml b/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r/test.xml new file mode 100644 index 0000000..1757f4a --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r/test.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + a + b + c + + 86 + 67 + 14 + false + + + + + + + diff --git a/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r_many_meas_values/metadata.json b/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r_many_meas_values/metadata.json new file mode 100644 index 0000000..3456b7c --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r_many_meas_values/metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "NrRadio", + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.28.550#measData", + "fileFormatVersion": "V9" +} \ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r_many_meas_values/test.xml b/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r_many_meas_values/test.xml new file mode 100644 index 0000000..3a0c608 --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/28.550/meas_type_and_r_many_meas_values/test.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + a + b + c + + 86 + 67 + 14 + false + + + 5 + 6 + 14 + false + + + + + + + diff --git a/src/test/resources/mapper_test/mapping_data/28.550/meas_types_and_meas_results_many_meas_values/metadata.json b/src/test/resources/mapper_test/mapping_data/28.550/meas_types_and_meas_results_many_meas_values/metadata.json new file mode 100644 index 0000000..3456b7c --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/28.550/meas_types_and_meas_results_many_meas_values/metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "NrRadio", + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.28.550#measData", + "fileFormatVersion": "V9" +} \ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/28.550/meas_types_and_meas_results_many_meas_values/test.xml b/src/test/resources/mapper_test/mapping_data/28.550/meas_types_and_meas_results_many_meas_values/test.xml new file mode 100644 index 0000000..23f9429 --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/28.550/meas_types_and_meas_results_many_meas_values/test.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + a b c + + 76 27 98 + false + + + 1 2 9 + false + + + + + + + diff --git a/src/test/resources/mapper_test/mapping_data/28.550/no_measdata/metadata.json b/src/test/resources/mapper_test/mapping_data/28.550/no_measdata/metadata.json new file mode 100644 index 0000000..3456b7c --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/28.550/no_measdata/metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "NrRadio", + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.28.550#measData", + "fileFormatVersion": "V9" +} \ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/28.550/no_measdata/test.xml b/src/test/resources/mapper_test/mapping_data/28.550/no_measdata/test.xml new file mode 100644 index 0000000..30bb82b --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/28.550/no_measdata/test.xml @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/metadata.json b/src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/metadata.json new file mode 100644 index 0000000..3456b7c --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "NrRadio", + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.28.550#measData", + "fileFormatVersion": "V9" +} \ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/test.xml b/src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/test.xml new file mode 100644 index 0000000..92fd1ff --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/28.550/no_sw_version/test.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + a + b + c + + 86 + 67 + 14 + false + + + + + + + diff --git a/src/test/resources/mapper_test/mapping_data/32.435/meas_results/metadata.json b/src/test/resources/mapper_test/mapping_data/32.435/meas_results/metadata.json new file mode 100644 index 0000000..5a84d99 --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/32.435/meas_results/metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "lteRadio", + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.32.435#measCollec", + "fileFormatVersion": "V9" +} \ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/32.435/meas_results/test.xml b/src/test/resources/mapper_test/mapping_data/32.435/meas_results/test.xml new file mode 100644 index 0000000..269fdf1 --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/32.435/meas_results/test.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + a b c + + 76 27 98 + false + + + + + + + diff --git a/src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r/metadata.json b/src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r/metadata.json new file mode 100644 index 0000000..5a84d99 --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r/metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "lteRadio", + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.32.435#measCollec", + "fileFormatVersion": "V9" +} \ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r/test.xml b/src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r/test.xml new file mode 100644 index 0000000..8ff79df --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r/test.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + a + b + c + + 86 + 67 + 14 + false + + + + + + + diff --git a/src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r_many_meas_values/metadata.json b/src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r_many_meas_values/metadata.json new file mode 100644 index 0000000..5a84d99 --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r_many_meas_values/metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "lteRadio", + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.32.435#measCollec", + "fileFormatVersion": "V9" +} \ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r_many_meas_values/test.xml b/src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r_many_meas_values/test.xml new file mode 100644 index 0000000..1b1dc26 --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r_many_meas_values/test.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + a + b + c + + 86 + 67 + 14 + false + + + 5 + 6 + 14 + false + + + + + + + diff --git a/src/test/resources/mapper_test/mapping_data/32.435/meas_types_and_meas_results_many_meas_values/metadata.json b/src/test/resources/mapper_test/mapping_data/32.435/meas_types_and_meas_results_many_meas_values/metadata.json new file mode 100644 index 0000000..5a84d99 --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/32.435/meas_types_and_meas_results_many_meas_values/metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "lteRadio", + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.32.435#measCollec", + "fileFormatVersion": "V9" +} \ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/32.435/meas_types_and_meas_results_many_meas_values/test.xml b/src/test/resources/mapper_test/mapping_data/32.435/meas_types_and_meas_results_many_meas_values/test.xml new file mode 100644 index 0000000..4ed9f95 --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/32.435/meas_types_and_meas_results_many_meas_values/test.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + a b c + + 76 27 98 + false + + + 1 2 9 + false + + + + + + + diff --git a/src/test/resources/mapper_test/mapping_data/32.435/no_measdata/metadata.json b/src/test/resources/mapper_test/mapping_data/32.435/no_measdata/metadata.json new file mode 100644 index 0000000..5a84d99 --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/32.435/no_measdata/metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "lteRadio", + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.32.435#measCollec", + "fileFormatVersion": "V9" +} \ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/32.435/no_measdata/test.xml b/src/test/resources/mapper_test/mapping_data/32.435/no_measdata/test.xml new file mode 100644 index 0000000..855b2e9 --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/32.435/no_measdata/test.xml @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/src/test/resources/mapper_test/mapping_data/32.435/no_sw_version/metadata.json b/src/test/resources/mapper_test/mapping_data/32.435/no_sw_version/metadata.json new file mode 100644 index 0000000..5a84d99 --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/32.435/no_sw_version/metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "lteRadio", + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.32.435#measCollec", + "fileFormatVersion": "V9" +} \ No newline at end of file diff --git a/src/test/resources/mapper_test/mapping_data/32.435/no_sw_version/test.xml b/src/test/resources/mapper_test/mapping_data/32.435/no_sw_version/test.xml new file mode 100644 index 0000000..bc435c0 --- /dev/null +++ b/src/test/resources/mapper_test/mapping_data/32.435/no_sw_version/test.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + a + b + c + + 86 + 67 + 14 + false + + + + + + + diff --git a/src/test/resources/mapper_test/mapping_data/valid_data/meas_results.xml b/src/test/resources/mapper_test/mapping_data/valid_data/meas_results.xml deleted file mode 100644 index 269fdf1..0000000 --- a/src/test/resources/mapper_test/mapping_data/valid_data/meas_results.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - a b c - - 76 27 98 - false - - - - - - - diff --git a/src/test/resources/mapper_test/mapping_data/valid_data/meas_type_and_r.xml b/src/test/resources/mapper_test/mapping_data/valid_data/meas_type_and_r.xml deleted file mode 100644 index 8ff79df..0000000 --- a/src/test/resources/mapper_test/mapping_data/valid_data/meas_type_and_r.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - a - b - c - - 86 - 67 - 14 - false - - - - - - - diff --git a/src/test/resources/mapper_test/mapping_data/valid_data/meas_type_and_r_many_meas_values.xml b/src/test/resources/mapper_test/mapping_data/valid_data/meas_type_and_r_many_meas_values.xml deleted file mode 100644 index 1b1dc26..0000000 --- a/src/test/resources/mapper_test/mapping_data/valid_data/meas_type_and_r_many_meas_values.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - a - b - c - - 86 - 67 - 14 - false - - - 5 - 6 - 14 - false - - - - - - - diff --git a/src/test/resources/mapper_test/mapping_data/valid_data/meas_types_and_meas_results_many_meas_values.xml b/src/test/resources/mapper_test/mapping_data/valid_data/meas_types_and_meas_results_many_meas_values.xml deleted file mode 100644 index 4ed9f95..0000000 --- a/src/test/resources/mapper_test/mapping_data/valid_data/meas_types_and_meas_results_many_meas_values.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - a b c - - 76 27 98 - false - - - 1 2 9 - false - - - - - - - diff --git a/src/test/resources/mapper_test/mapping_data/valid_data/no_measdata.xml b/src/test/resources/mapper_test/mapping_data/valid_data/no_measdata.xml deleted file mode 100644 index 855b2e9..0000000 --- a/src/test/resources/mapper_test/mapping_data/valid_data/no_measdata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/src/test/resources/mapper_test/mapping_data/valid_data/no_sw_version.xml b/src/test/resources/mapper_test/mapping_data/valid_data/no_sw_version.xml deleted file mode 100644 index bc435c0..0000000 --- a/src/test/resources/mapper_test/mapping_data/valid_data/no_sw_version.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - a - b - c - - 86 - 67 - 14 - false - - - - - - - diff --git a/src/test/resources/metadata/invalid_metadata.json b/src/test/resources/metadata/invalid_metadata.json new file mode 100644 index 0000000..31600b0 --- /dev/null +++ b/src/test/resources/metadata/invalid_metadata.json @@ -0,0 +1,11 @@ +{ + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.32.435#measCollec", + "fileFormatVersion": "V9" +} \ No newline at end of file diff --git a/src/test/resources/metadata/valid_4g_metadata.json b/src/test/resources/metadata/valid_4g_metadata.json new file mode 100644 index 0000000..5a84d99 --- /dev/null +++ b/src/test/resources/metadata/valid_4g_metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "lteRadio", + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.32.435#measCollec", + "fileFormatVersion": "V9" +} \ No newline at end of file diff --git a/src/test/resources/metadata/valid_5g_metadata.json b/src/test/resources/metadata/valid_5g_metadata.json new file mode 100644 index 0000000..3456b7c --- /dev/null +++ b/src/test/resources/metadata/valid_5g_metadata.json @@ -0,0 +1,12 @@ +{ + "productName": "NrRadio", + "vendorName": "Ericsson", + "lastEpochMicrosec": "1538478000000", + "sourceName": "oteNB5309", + "startEpochMicrosec": "1538478900000", + "timeZoneOffset": "UTC+05.00", + "location": "ftpes://192.168.0.101:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.28.550#measData", + "fileFormatVersion": "V9" +} \ No newline at end of file diff --git a/src/test/resources/split_test/lte/type_a_1_event/split.props b/src/test/resources/split_test/lte/type_a_1_event/split.props new file mode 100644 index 0000000..3598e18 --- /dev/null +++ b/src/test/resources/split_test/lte/type_a_1_event/split.props @@ -0,0 +1,2 @@ +eventCount=1 +measInfoIds=Singular measInfoId \ No newline at end of file diff --git a/src/test/resources/split_test/lte/type_a_1_event/test.xml b/src/test/resources/split_test/lte/type_a_1_event/test.xml new file mode 100644 index 0000000..b49f7f0 --- /dev/null +++ b/src/test/resources/split_test/lte/type_a_1_event/test.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + z a zz b + + 99 1 27 2 + false + + + + + + + diff --git a/src/test/resources/split_test/lte/type_c_3_events/split.props b/src/test/resources/split_test/lte/type_c_3_events/split.props new file mode 100644 index 0000000..35d90f4 --- /dev/null +++ b/src/test/resources/split_test/lte/type_c_3_events/split.props @@ -0,0 +1,2 @@ +eventCount=3 +measInfoIds=First measInfoId,Second measInfoId,Third measInfoId \ No newline at end of file diff --git a/src/test/resources/split_test/lte/type_c_3_events/test.xml b/src/test/resources/split_test/lte/type_c_3_events/test.xml new file mode 100644 index 0000000..7680f9d --- /dev/null +++ b/src/test/resources/split_test/lte/type_c_3_events/test.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + z1 a1 zz1 b1 + + 1 11 111 1111 + false + + + + + + + + + + z2 a2 zz2 b2 + + 2 22 222 2222 + false + + + + + + + + + + z3 a3 zz3 b3 + + 3 33 333 3333 + false + + + + + + + diff --git a/src/test/resources/split_test/nr/type_a_1_event/split.props b/src/test/resources/split_test/nr/type_a_1_event/split.props new file mode 100644 index 0000000..3598e18 --- /dev/null +++ b/src/test/resources/split_test/nr/type_a_1_event/split.props @@ -0,0 +1,2 @@ +eventCount=1 +measInfoIds=Singular measInfoId \ No newline at end of file diff --git a/src/test/resources/split_test/nr/type_a_1_event/test.xml b/src/test/resources/split_test/nr/type_a_1_event/test.xml new file mode 100644 index 0000000..f88e0c5 --- /dev/null +++ b/src/test/resources/split_test/nr/type_a_1_event/test.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + z a zz b + + 99 1 27 2 + false + + + + + + + diff --git a/src/test/resources/split_test/nr/type_c_3_events/split.props b/src/test/resources/split_test/nr/type_c_3_events/split.props new file mode 100644 index 0000000..35d90f4 --- /dev/null +++ b/src/test/resources/split_test/nr/type_c_3_events/split.props @@ -0,0 +1,2 @@ +eventCount=3 +measInfoIds=First measInfoId,Second measInfoId,Third measInfoId \ No newline at end of file diff --git a/src/test/resources/split_test/nr/type_c_3_events/test.xml b/src/test/resources/split_test/nr/type_c_3_events/test.xml new file mode 100644 index 0000000..ccbb09b --- /dev/null +++ b/src/test/resources/split_test/nr/type_c_3_events/test.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + z1 a1 zz1 b1 + + 1 11 111 1111 + false + + + + + + + + + + z2 a2 zz2 b2 + + 2 22 222 2222 + false + + + + + + + + + + z3 a3 zz3 b3 + + 3 33 333 3333 + false + + + + + + + diff --git a/src/test/resources/xml_validator_test/test_data/invalid/no_file_header.xml b/src/test/resources/xml_validator_test/test_data/invalid/no_file_header.xml deleted file mode 100644 index 8e5669f..0000000 --- a/src/test/resources/xml_validator_test/test_data/invalid/no_file_header.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - a - b - c - - 86 - 67 - 14 - false - - - - - - - diff --git a/src/test/resources/xml_validator_test/test_data/invalid/no_managed_element.xml b/src/test/resources/xml_validator_test/test_data/invalid/no_managed_element.xml deleted file mode 100644 index b1b3d68..0000000 --- a/src/test/resources/xml_validator_test/test_data/invalid/no_managed_element.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - a - b - c - - 86 - 67 - 14 - false - - - - - - - diff --git a/src/test/resources/xml_validator_test/test_data/lte/no_file_header/test.xml b/src/test/resources/xml_validator_test/test_data/lte/no_file_header/test.xml new file mode 100644 index 0000000..8e5669f --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/lte/no_file_header/test.xml @@ -0,0 +1,22 @@ + + + + + + + + a + b + c + + 86 + 67 + 14 + false + + + + + + + diff --git a/src/test/resources/xml_validator_test/test_data/lte/no_file_header/validity.props b/src/test/resources/xml_validator_test/test_data/lte/no_file_header/validity.props new file mode 100644 index 0000000..80da24e --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/lte/no_file_header/validity.props @@ -0,0 +1 @@ +valid=false \ No newline at end of file diff --git a/src/test/resources/xml_validator_test/test_data/lte/no_managed_element/test.xml b/src/test/resources/xml_validator_test/test_data/lte/no_managed_element/test.xml new file mode 100644 index 0000000..b1b3d68 --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/lte/no_managed_element/test.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + a + b + c + + 86 + 67 + 14 + false + + + + + + + diff --git a/src/test/resources/xml_validator_test/test_data/lte/no_managed_element/validity.props b/src/test/resources/xml_validator_test/test_data/lte/no_managed_element/validity.props new file mode 100644 index 0000000..80da24e --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/lte/no_managed_element/validity.props @@ -0,0 +1 @@ +valid=false \ No newline at end of file diff --git a/src/test/resources/xml_validator_test/test_data/lte/no_measdata/test.xml b/src/test/resources/xml_validator_test/test_data/lte/no_measdata/test.xml new file mode 100644 index 0000000..5b8eb5a --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/lte/no_measdata/test.xml @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/src/test/resources/xml_validator_test/test_data/lte/no_measdata/validity.props b/src/test/resources/xml_validator_test/test_data/lte/no_measdata/validity.props new file mode 100644 index 0000000..6e5af27 --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/lte/no_measdata/validity.props @@ -0,0 +1 @@ +valid=true \ No newline at end of file diff --git a/src/test/resources/xml_validator_test/test_data/nr/no_file_header/test.xml b/src/test/resources/xml_validator_test/test_data/nr/no_file_header/test.xml new file mode 100644 index 0000000..3450b98 --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/nr/no_file_header/test.xml @@ -0,0 +1,22 @@ + + + + + + + + a + b + c + + 86 + 67 + 14 + false + + + + + + + diff --git a/src/test/resources/xml_validator_test/test_data/nr/no_file_header/validity.props b/src/test/resources/xml_validator_test/test_data/nr/no_file_header/validity.props new file mode 100644 index 0000000..80da24e --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/nr/no_file_header/validity.props @@ -0,0 +1 @@ +valid=false \ No newline at end of file diff --git a/src/test/resources/xml_validator_test/test_data/nr/no_measdata/test.xml b/src/test/resources/xml_validator_test/test_data/nr/no_measdata/test.xml new file mode 100644 index 0000000..fb141ad --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/nr/no_measdata/test.xml @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/src/test/resources/xml_validator_test/test_data/nr/no_measdata/validity.props b/src/test/resources/xml_validator_test/test_data/nr/no_measdata/validity.props new file mode 100644 index 0000000..6e5af27 --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/nr/no_measdata/validity.props @@ -0,0 +1 @@ +valid=true \ No newline at end of file diff --git a/src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/test.xml b/src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/test.xml new file mode 100644 index 0000000..0d4216e --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/test.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + a + b + c + + 86 + 67 + 14 + false + + + + + + + diff --git a/src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/validity.props b/src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/validity.props new file mode 100644 index 0000000..80da24e --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/nr/no_measured_entity/validity.props @@ -0,0 +1 @@ +valid=false \ No newline at end of file diff --git a/src/test/resources/xml_validator_test/test_data/valid/no_measdata.xml b/src/test/resources/xml_validator_test/test_data/valid/no_measdata.xml deleted file mode 100644 index 5b8eb5a..0000000 --- a/src/test/resources/xml_validator_test/test_data/valid/no_measdata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - -- cgit 1.2.3-korg