Merge "Add support for TS 28.550/28.532"1.3.0

67 files changed, 877 insertions, 0 deletions

diff --git a/src/test/resources/filter_test/meas_results_filtered.xml b/src/test/resources/filter_test/lte/meas_results/expected.xml
index af45364..af45364 100644
--- a/src/test/resources/filter_test/meas_results_filtered.xml
+++ b/src/test/resources/filter_test/lte/meas_results/expected.xml
diff --git a/src/test/resources/filter_test/meas_results.xml b/src/test/resources/filter_test/lte/meas_results/test.xml
index 5825e7b..5825e7b 100644
--- a/src/test/resources/filter_test/meas_results.xml
+++ b/src/test/resources/filter_test/lte/meas_results/test.xml
diff --git a/src/test/resources/filter_test/meas_results_manyInfo_filtered.xml b/src/test/resources/filter_test/lte/meas_results_manyinfo/expected.xml
index 4a887d5..4a887d5 100644
--- a/src/test/resources/filter_test/meas_results_manyInfo_filtered.xml
+++ b/src/test/resources/filter_test/lte/meas_results_manyinfo/expected.xml
diff --git a/src/test/resources/filter_test/meas_results_manyInfo.xml b/src/test/resources/filter_test/lte/meas_results_manyinfo/test.xml
index 2b87912..2b87912 100644
--- a/src/test/resources/filter_test/meas_results_manyInfo.xml
+++ b/src/test/resources/filter_test/lte/meas_results_manyinfo/test.xml
diff --git a/src/test/resources/filter_test/meas_type_and_r_filtered.xml b/src/test/resources/filter_test/lte/meas_type_and_r/expected.xml
index f2146f7..f2146f7 100644
--- a/src/test/resources/filter_test/meas_type_and_r_filtered.xml
+++ b/src/test/resources/filter_test/lte/meas_type_and_r/expected.xml
diff --git a/src/test/resources/filter_test/meas_type_and_r.xml b/src/test/resources/filter_test/lte/meas_type_and_r/test.xml
index 0d99e39..0d99e39 100644
--- a/src/test/resources/filter_test/meas_type_and_r.xml
+++ b/src/test/resources/filter_test/lte/meas_type_and_r/test.xml
diff --git a/src/test/resources/filter_test/meas_type_and_r_manyMeasvalue_filtered.xml b/src/test/resources/filter_test/lte/meas_type_and_r_many_measvalue/expected.xml
index 9f185a4..9f185a4 100644
--- a/src/test/resources/filter_test/meas_type_and_r_manyMeasvalue_filtered.xml
+++ b/src/test/resources/filter_test/lte/meas_type_and_r_many_measvalue/expected.xml
diff --git a/src/test/resources/filter_test/meas_type_and_r_manyMeasvalue.xml b/src/test/resources/filter_test/lte/meas_type_and_r_many_measvalue/test.xml
index 691882c..691882c 100644
--- a/src/test/resources/filter_test/meas_type_and_r_manyMeasvalue.xml
+++ b/src/test/resources/filter_test/lte/meas_type_and_r_many_measvalue/test.xml
diff --git a/src/test/resources/filter_test/meas_type_and_r_manyInfo_filtered.xml b/src/test/resources/filter_test/lte/meas_type_and_r_manyinfo/expected.xml
index b517a7d..b517a7d 100644
--- a/src/test/resources/filter_test/meas_type_and_r_manyInfo_filtered.xml
+++ b/src/test/resources/filter_test/lte/meas_type_and_r_manyinfo/expected.xml
diff --git a/src/test/resources/filter_test/meas_type_and_r_manyInfo.xml b/src/test/resources/filter_test/lte/meas_type_and_r_manyinfo/test.xml
index dd35dfc..dd35dfc 100644
--- a/src/test/resources/filter_test/meas_type_and_r_manyInfo.xml
+++ b/src/test/resources/filter_test/lte/meas_type_and_r_manyinfo/test.xml
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 @@
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">
+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
+        <fileSender senderName="Dublin"/>
+        <MeasData beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <measuredEntity localDn="Dublin" swVersion="r0.1"/>
+        <measInfo measInfoId="some measInfoId">
+            <job jobId="jobId"/>
+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>a b</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>1 2</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <fileFooter>
+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</MeasDataFile>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#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"/>
+    </fileHeader>
+    <measData>
+        <measuredEntity swVersion="r0.1" localDn="Dublin"/>
+        <measInfo measInfoId="some measInfoId">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>z a zz b</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>99 1 27 2</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <fileFooter>
+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</MeasDataFile>
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 @@
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">
+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
+        <fileSender senderName="Dublin"/>
+        <MeasData beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <measuredEntity localDn="Dublin" swVersion="r0.1"/>
+        <measInfo measInfoId="some measInfoId">
+            <job jobId="jobId"/>
+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>a b</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>1 2</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+        <measInfo measInfoId="some measInfoId2">
+            <job jobId="jobId"/>
+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>a b</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>1 2</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <fileFooter>
+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</MeasDataFile>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#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"/>
+    </fileHeader>
+    <measData>
+        <measuredEntity swVersion="r0.1" localDn="Dublin"/>
+        <measInfo measInfoId="this will be filtered out">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>z aa zz bb</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>99 1 27 2</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+        <measInfo measInfoId="some measInfoId">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>z a zz b</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>99 1 27 2</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+        <measInfo measInfoId="some measInfoId2">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>z a zz b</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>99 1 27 2</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <fileFooter>
+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</MeasDataFile>
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 @@
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">

+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">

+        <fileSender senderName="Dublin"/>

+        <MeasData beginTime="2018-10-02T12:00:00+01:00"/>

+    </fileHeader>

+    <measData>

+        <measuredEntity localDn="Dublin" swVersion="r0.1"/>

+        <measInfo measInfoId="some measInfoId">

+            <job jobId="jobId"/>

+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>

+            <repPeriod duration="PT900S"/>

+            <measType p="1">a</measType>

+            <measType p="3">b</measType>

+            <measValue measObjLdn="some measObjLdn">

+                <r p="1">1</r>

+                <r p="3">2</r>

+                <suspect>false</suspect>

+            </measValue>

+        </measInfo>

+    </measData>

+    <fileFooter>

+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>

+    </fileFooter>

+</MeasDataFile>
\ 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 @@
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">

+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">

+        <fileSender senderName="Dublin"/>

+        <MeasData beginTime="2018-10-02T12:00:00+01:00"/>

+    </fileHeader>

+    <measData>

+        <measuredEntity localDn="Dublin" swVersion="r0.1"/>

+        <measInfo measInfoId="some measInfoId">

+            <job jobId="jobId"/>

+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>

+            <repPeriod duration="PT900S"/>

+            <measType p="1">a</measType>

+            <measType p="2">z</measType>

+            <measType p="3">b</measType>

+            <measValue measObjLdn="some measObjLdn">

+                <r p="1">1</r>

+                <r p="2">99</r>

+                <r p="3">2</r>

+                <suspect>false</suspect>

+            </measValue>

+        </measInfo>

+    </measData>

+    <fileFooter>

+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>

+    </fileFooter>

+</MeasDataFile>
\ 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 @@
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">

+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">

+        <fileSender senderName="Dublin"/>

+        <MeasData beginTime="2018-10-02T12:00:00+01:00"/>

+    </fileHeader>

+    <measData>

+        <measuredEntity localDn="Dublin" swVersion="r0.1"/>

+        <measInfo measInfoId="some measInfoId">

+            <job jobId="jobId"/>

+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>

+            <repPeriod duration="PT900S"/>

+            <measTypes></measTypes>

+            <measType p="1">a</measType>

+            <measType p="2">b</measType>

+            <measValue measObjLdn="some measObjLdn 1">

+                <r p="1">1</r>

+                <r p="2">2</r>

+                <suspect>false</suspect>

+            </measValue>

+            <measValue measObjLdn="some measObjLdn 3">

+                <r p="1">111</r>

+                <r p="2">222</r>

+                <suspect>false</suspect>

+            </measValue>

+        </measInfo>

+    </measData>

+    <fileFooter>

+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>

+    </fileFooter>

+</MeasDataFile>
\ 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 @@
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">

+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">

+        <fileSender senderName="Dublin"/>

+        <MeasData beginTime="2018-10-02T12:00:00+01:00"/>

+    </fileHeader>

+    <measData>

+        <measuredEntity localDn="Dublin" swVersion="r0.1"/>

+        <measInfo measInfoId="some measInfoId">

+            <job jobId="jobId"/>

+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>

+            <repPeriod duration="PT900S"/>

+            <measTypes></measTypes>

+            <measType p="1">a</measType>

+            <measType p="2">b</measType>

+            <measType p="3">c</measType>

+            <measValue measObjLdn="some measObjLdn 1">

+                <r p="1">1</r>

+                <r p="2">2</r>

+                <suspect>false</suspect>

+            </measValue>

+            <measValue measObjLdn="some measObjLdn 2">

+                <r p="88">88</r>

+                <r p="99">99</r>

+                <suspect>false</suspect>

+            </measValue>

+            <measValue measObjLdn="some measObjLdn 3">

+                <r p="1">111</r>

+                <r p="2">222</r>

+                <suspect>false</suspect>

+            </measValue>

+        </measInfo>

+    </measData>

+    <fileFooter>

+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>

+    </fileFooter>

+</MeasDataFile>
\ 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 @@
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">

+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">

+        <fileSender senderName="Dublin"/>

+        <MeasData beginTime="2018-10-02T12:00:00+01:00"/>

+    </fileHeader>

+    <measData>

+        <measuredEntity localDn="Dublin" swVersion="r0.1"/>

+        <measInfo measInfoId="some measInfoId">

+            <job jobId="jobId"/>

+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>

+            <repPeriod duration="PT900S"/>

+            <measType p="1">a</measType>

+            <measType p="3">b</measType>

+            <measValue measObjLdn="some measObjLdn">

+                <r p="1">1</r>

+                <r p="3">2</r>

+                <suspect>false</suspect>

+            </measValue>

+        </measInfo>

+        <measInfo measInfoId="some measInfoId2">

+            <job jobId="jobId"/>

+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>

+            <repPeriod duration="PT900S"/>

+            <measType p="1">a</measType>

+            <measType p="3">b</measType>

+            <measValue measObjLdn="some measObjLdn">

+                <r p="1">1</r>

+                <r p="3">2</r>

+                <suspect>false</suspect>

+            </measValue>

+        </measInfo>

+    </measData>

+    <fileFooter>

+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>

+    </fileFooter>

+</MeasDataFile>
\ 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 @@
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">

+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">

+        <fileSender senderName="Dublin"/>

+        <MeasData beginTime="2018-10-02T12:00:00+01:00"/>

+    </fileHeader>

+    <measData>

+        <measuredEntity localDn="Dublin" swVersion="r0.1"/>

+        <measInfo measInfoId="some measInfoId">

+            <job jobId="jobId"/>

+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>

+            <repPeriod duration="PT900S"/>

+            <measType p="1">a</measType>

+            <measType p="2">z</measType>

+            <measType p="3">b</measType>

+            <measValue measObjLdn="some measObjLdn">

+                <r p="1">1</r>

+                <r p="2">99</r>

+                <r p="3">2</r>

+                <suspect>false</suspect>

+            </measValue>

+        </measInfo>

+        <measInfo measInfoId="filter will disregard this measInfo">

+            <job jobId="jobId"/>

+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>

+            <repPeriod duration="PT900S"/>

+            <measType p="1">aa</measType>

+            <measType p="2">z</measType>

+            <measType p="3">bb</measType>

+            <measValue measObjLdn="some measObjLdn">

+                <r p="1">1</r>

+                <r p="2">99</r>

+                <r p="3">2</r>

+                <suspect>false</suspect>

+            </measValue>

+        </measInfo>

+        <measInfo measInfoId="some measInfoId2">

+            <job jobId="jobId"/>

+            <granPeriod duration="PT900S" endTime="2018-10-02T12:15:00Z"/>

+            <repPeriod duration="PT900S"/>

+            <measType p="1">a</measType>

+            <measType p="2">z</measType>

+            <measType p="3">b</measType>

+            <measValue measObjLdn="some measObjLdn">

+                <r p="1">1</r>

+                <r p="2">99</r>

+                <r p="3">2</r>

+                <suspect>false</suspect>

+            </measValue>

+        </measInfo>

+    </measData>

+    <fileFooter>

+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>

+    </fileFooter>

+</MeasDataFile>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">
+    <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd"
+                fileFormatVersion="28.550 V1">
+        <fileSender senderName="Dublin"/>
+        <MeasData beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <measuredEntity swVersion="r0.1" localDn="Dublin"/>
+        <measInfo measInfoId="some measInfoId">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>a b c</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>76 27 98</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <fileFooter>
+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</MeasDataFile>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">
+    <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd"
+                fileFormatVersion="28.550 V1">
+        <fileSender senderName="Dublin"/>
+        <MeasData beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <measuredEntity swVersion="r0.1" localDn="Dublin"/>
+        <measInfo measInfoId="some measInfoId">
+            <job jobId="some Job Id"/>
+            <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/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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">
+    <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd"
+                fileFormatVersion="28.550 V1">
+        <fileSender senderName="Dublin"/>
+        <MeasData beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <measuredEntity swVersion="r0.1" localDn="Dublin"/>
+        <measInfo measInfoId="some measInfoId">
+            <job jobId="some Job Id"/>
+            <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>
+            <measValue measObjLdn="some other measObjLdn">
+                <r p="1">5</r>
+                <r p="2">6</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/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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">
+    <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd"
+                fileFormatVersion="28.550 V1">
+        <fileSender senderName="Dublin"/>
+        <MeasData beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <measuredEntity swVersion="r0.1" localDn="Dublin"/>
+        <measInfo measInfoId="some measInfoId">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>a b c</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>76 27 98</measResults>
+                <suspect>false</suspect>
+            </measValue>
+            <measValue measObjLdn="some other objLdn">
+                <measResults>1 2 9</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <fileFooter>
+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</MeasDataFile>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">
+    <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd"
+                fileFormatVersion="28.550 V1">
+        <fileSender senderName="Dublin"/>
+        <MeasData beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <fileFooter>
+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</MeasDataFile>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">
+    <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd"
+                fileFormatVersion="28.550 V1">
+        <fileSender senderName="Dublin"/>
+        <MeasData beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <measuredEntity localDn="Dublin"/>
+        <measInfo measInfoId="some measInfoId">
+            <job jobId="some Job Id"/>
+            <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/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/valid_data/meas_results.xml b/src/test/resources/mapper_test/mapping_data/32.435/meas_results/test.xml
index 269fdf1..269fdf1 100644
--- a/src/test/resources/mapper_test/mapping_data/valid_data/meas_results.xml
+++ b/src/test/resources/mapper_test/mapping_data/32.435/meas_results/test.xml
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/valid_data/meas_type_and_r.xml b/src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r/test.xml
index 8ff79df..8ff79df 100644
--- a/src/test/resources/mapper_test/mapping_data/valid_data/meas_type_and_r.xml
+++ b/src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r/test.xml
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/valid_data/meas_type_and_r_many_meas_values.xml b/src/test/resources/mapper_test/mapping_data/32.435/meas_type_and_r_many_meas_values/test.xml
index 1b1dc26..1b1dc26 100644
--- 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/32.435/meas_type_and_r_many_meas_values/test.xml
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/valid_data/meas_types_and_meas_results_many_meas_values.xml b/src/test/resources/mapper_test/mapping_data/32.435/meas_types_and_meas_results_many_meas_values/test.xml
index 4ed9f95..4ed9f95 100644
--- 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/32.435/meas_types_and_meas_results_many_meas_values/test.xml
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/valid_data/no_measdata.xml b/src/test/resources/mapper_test/mapping_data/32.435/no_measdata/test.xml
index 855b2e9..855b2e9 100644
--- a/src/test/resources/mapper_test/mapping_data/valid_data/no_measdata.xml
+++ b/src/test/resources/mapper_test/mapping_data/32.435/no_measdata/test.xml
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/valid_data/no_sw_version.xml b/src/test/resources/mapper_test/mapping_data/32.435/no_sw_version/test.xml
index bc435c0..bc435c0 100644
--- a/src/test/resources/mapper_test/mapping_data/valid_data/no_sw_version.xml
+++ b/src/test/resources/mapper_test/mapping_data/32.435/no_sw_version/test.xml
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 @@
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+    <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd"
+                fileFormatVersion="32.435 V10.0">
+        <fileSender localDn="Dublin"/>
+        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <managedElement swVersion="r0.1" localDn="Dublin"/>
+        <measInfo measInfoId="Singular measInfoId">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>z a zz b</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>99 1 27 2</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <fileFooter>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
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 @@
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+    <fileHeader dnPrefix="some dnPrefix" vendorName="FooBar Ltd"
+                fileFormatVersion="32.435 V10.0">
+        <fileSender localDn="Dublin"/>
+        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <managedElement swVersion="r0.1" localDn="Dublin1"/>
+        <measInfo measInfoId="First measInfoId">
+            <job jobId="jobId1"/>
+            <granPeriod endTime="2001-10-02T12:15:00Z" duration="PT100S"/>
+            <repPeriod duration="PT100S"/>
+            <measTypes>z1 a1 zz1 b1</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>1 11 111 1111</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <measData>
+        <managedElement swVersion="r0.2" localDn="Dublin2"/>
+        <measInfo measInfoId="Second measInfoId">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2002-10-02T12:15:00Z" duration="PT200S"/>
+            <repPeriod duration="PT200S"/>
+            <measTypes>z2 a2 zz2 b2</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>2 22 222 2222</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <measData>
+        <managedElement swVersion="r0.3" localDn="Dublin3"/>
+        <measInfo measInfoId="Third measInfoId">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2003-10-02T12:15:00Z" duration="PT300S"/>
+            <repPeriod duration="PT300S"/>
+            <measTypes>z3 a3 zz3 b3</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>3 33 333 3333</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <fileFooter>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
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 @@
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#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"/>
+    </fileHeader>
+    <measData>
+        <measuredEntity swVersion="r0.1" localDn="Dublin"/>
+        <measInfo measInfoId="Singular measInfoId">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="PT900S"/>
+            <repPeriod duration="PT900S"/>
+            <measTypes>z a zz b</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>99 1 27 2</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <fileFooter>
+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</MeasDataFile>
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 @@
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#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"/>
+    </fileHeader>
+    <measData>
+        <measuredEntity swVersion="r0.1" localDn="Dublin1"/>
+        <measInfo measInfoId="First measInfoId">
+            <job jobId="jobId1"/>
+            <granPeriod endTime="2001-10-02T12:15:00Z" duration="PT100S"/>
+            <repPeriod duration="PT100S"/>
+            <measTypes>z1 a1 zz1 b1</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>1 11 111 1111</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <measData>
+        <measuredEntity swVersion="r0.2" localDn="Dublin2"/>
+        <measInfo measInfoId="Second measInfoId">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2002-10-02T12:15:00Z" duration="PT200S"/>
+            <repPeriod duration="PT200S"/>
+            <measTypes>z2 a2 zz2 b2</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>2 22 222 2222</measResults>
+                <suspect>false</suspect>
+            </measValue>
+        </measInfo>
+    </measData>
+    <measData>
+        <measuredEntity swVersion="r0.3" localDn="Dublin3"/>
+        <measInfo measInfoId="Third measInfoId">
+            <job jobId="jobId"/>
+            <granPeriod endTime="2003-10-02T12:15:00Z" duration="PT300S"/>
+            <repPeriod duration="PT300S"/>
+            <measTypes>z3 a3 zz3 b3</measTypes>
+            <measValue measObjLdn="objLdn">
+                <measResults>3 33 333 3333</measResults>
+                <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/invalid/no_file_header.xml b/src/test/resources/xml_validator_test/test_data/lte/no_file_header/test.xml
index 8e5669f..8e5669f 100644
--- a/src/test/resources/xml_validator_test/test_data/invalid/no_file_header.xml
+++ b/src/test/resources/xml_validator_test/test_data/lte/no_file_header/test.xml
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/invalid/no_managed_element.xml b/src/test/resources/xml_validator_test/test_data/lte/no_managed_element/test.xml
index b1b3d68..b1b3d68 100644
--- a/src/test/resources/xml_validator_test/test_data/invalid/no_managed_element.xml
+++ b/src/test/resources/xml_validator_test/test_data/lte/no_managed_element/test.xml
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/valid/no_measdata.xml b/src/test/resources/xml_validator_test/test_data/lte/no_measdata/test.xml
index 5b8eb5a..5b8eb5a 100644
--- a/src/test/resources/xml_validator_test/test_data/valid/no_measdata.xml
+++ b/src/test/resources/xml_validator_test/test_data/lte/no_measdata/test.xml
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 @@
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#measData">
+    <measData>
+        <measuredEntity 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/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 @@
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#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"/>
+    </fileHeader>
+    <fileFooter>
+        <MeasData endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</MeasDataFile>
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MeasDataFile xmlns="http://www.3gpp.org/ftp/specs/archive/28_series/28.550#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"/>
+    </fileHeader>
+    <measData>
+        <measInfo measInfoId="some measInfoId">
+            <job jobId="some job Id"/>
+            <granPeriod endTime="2018-10-02T12:15:00Z" duration="some duration"/>
+            <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/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