diff options
author | Joseph O'Leary <joseph.o.leary@est.tech> | 2020-07-20 10:26:16 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-07-20 10:26:16 +0000 |
commit | bd0a411d6f04f92d222af6a63bd2b7ecc3edd0a2 (patch) | |
tree | 34a84a1f044bb102225abed856412656fbfa117d /src/test/resources/xml_validator_test/test_data | |
parent | ba384eeb3cc007ff1d48db04fecc9356069456c5 (diff) | |
parent | c62f765c1ed65829e126807e1e7a91388bb1c322 (diff) |
Merge "Adjust pm-mapper to accept new schema."
Diffstat (limited to 'src/test/resources/xml_validator_test/test_data')
5 files changed, 35 insertions, 12 deletions
diff --git a/src/test/resources/xml_validator_test/test_data/not_supported_type/no_file_header/test.xml b/src/test/resources/xml_validator_test/test_data/not_supported_type/no_file_header/test.xml new file mode 100644 index 0000000..b5f85de --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/not_supported_type/no_file_header/test.xml @@ -0,0 +1,22 @@ +<measDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec"> + <measData> + <measEntity swVersion="r0.1" localDn="Dublin"/> + <measInfo measInfoId="some meas info id"> + <job jobId="some jobId"/> + <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> + <repPeriod duration="PT900S"/> + <measType p="1">a</measType> + <measType p="2">b</measType> + <measType p="3">c</measType> + <measValue measObjLdn="some measObjLdn"> + <r p="1">86</r> + <r p="2">67</r> + <r p="3">14</r> + <suspect>false</suspect> + </measValue> + </measInfo> + </measData> + <fileFooter> + <measData endTime="2018-10-02T12:15:00+01:00"/> + </fileFooter> +</measDataFile> diff --git a/src/test/resources/xml_validator_test/test_data/not_supported_type/no_file_header/validity.props b/src/test/resources/xml_validator_test/test_data/not_supported_type/no_file_header/validity.props new file mode 100644 index 0000000..80da24e --- /dev/null +++ b/src/test/resources/xml_validator_test/test_data/not_supported_type/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_file_header/test.xml b/src/test/resources/xml_validator_test/test_data/nr/no_file_header/test.xml index 3450b98..73ce2b3 100644 --- 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 @@ -1,6 +1,6 @@ -<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData"> +<measDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.532#measData"> <measData> - <measuredEntity swVersion="r0.1" localDn="Dublin"/> + <measEntity swVersion="r0.1" localDn="Dublin"/> <measInfo measInfoId="some meas info id"> <job jobId="some jobId"/> <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/> @@ -17,6 +17,6 @@ </measInfo> </measData> <fileFooter> - <MeasData endTime="2018-10-02T12:15:00+01:00"/> + <measData endTime="2018-10-02T12:15:00+01:00"/> </fileFooter> -</MeasDataFile> +</measDataFile> 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 index fb141ad..b8a31eb 100644 --- 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 @@ -1,10 +1,10 @@ -<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData"> +<measDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.532#measData"> <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd" fileFormatVersion="32.435 V10.0"> <fileSender senderName="Dublin"/> - <MeasData beginTime="2018-10-02T12:00:00+01:00"/> + <measData beginTime="2018-10-02T12:00:00+01:00"/> </fileHeader> <fileFooter> - <MeasData endTime="2018-10-02T12:15:00+01:00"/> + <measData endTime="2018-10-02T12:15:00+01:00"/> </fileFooter> -</MeasDataFile> +</measDataFile> 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 index 0d4216e..aace7dc 100644 --- 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 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> -<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData"> +<measDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.532#measData"> <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd" fileFormatVersion="32.435 V10.0"> <fileSender senderName="Dublin"/> - <MeasData beginTime="2018-10-02T12:00:00+01:00"/> + <measData beginTime="2018-10-02T12:00:00+01:00"/> </fileHeader> <measData> <measInfo measInfoId="some measInfoId"> @@ -22,6 +22,6 @@ </measInfo> </measData> <fileFooter> - <MeasData endTime="2018-10-02T12:15:00+01:00"/> + <measData endTime="2018-10-02T12:15:00+01:00"/> </fileFooter> -</MeasDataFile> +</measDataFile> |