From 255235644c8c302e1e92c41c13be3f3ad5973b16 Mon Sep 17 00:00:00 2001
From: JoeOLeary <joseph.o.leary@est.tech>
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 <joseph.o.leary@est.tech>
---
 .../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 ++++++++++++++++++++++
 30 files changed, 656 insertions(+), 328 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

(limited to 'src/test/resources/filter_test')

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 @@
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
+        <fileSender localDn="Dublin"/>
+        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <managedElement 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>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="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>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
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 @@
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
+        <fileSender localDn="Dublin"/>
+        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <managedElement 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>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
\ 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="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>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
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 @@
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
+        <fileSender localDn="Dublin"/>
+        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <managedElement 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>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
\ 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 @@
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
+        <fileSender localDn="Dublin"/>
+        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <managedElement 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>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
\ 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 @@
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
+        <fileSender localDn="Dublin"/>
+        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <managedElement 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>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
\ 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 @@
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
+        <fileSender localDn="Dublin"/>
+        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <managedElement 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>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
\ 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 @@
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
+        <fileSender localDn="Dublin"/>
+        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <managedElement 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>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
\ 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 @@
+<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
+    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
+        <fileSender localDn="Dublin"/>
+        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
+    </fileHeader>
+    <measData>
+        <managedElement 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>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
\ 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="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>
-        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
-    </fileFooter>
-</measCollecFile>
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 @@
-<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
-    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
-        <fileSender localDn="Dublin"/>
-        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
-    </fileHeader>
-    <measData>
-        <managedElement 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>
-        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
-    </fileFooter>
-</measCollecFile>
\ 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="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>
-        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
-    </fileFooter>
-</measCollecFile>
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 @@
-<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
-    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
-        <fileSender localDn="Dublin"/>
-        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
-    </fileHeader>
-    <measData>
-        <managedElement 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>
-        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
-    </fileFooter>
-</measCollecFile>
\ 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 @@
-<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
-    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
-        <fileSender localDn="Dublin"/>
-        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
-    </fileHeader>
-    <measData>
-        <managedElement 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>
-        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
-    </fileFooter>
-</measCollecFile>
\ 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 @@
-<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
-    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
-        <fileSender localDn="Dublin"/>
-        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
-    </fileHeader>
-    <measData>
-        <managedElement 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>
-        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
-    </fileFooter>
-</measCollecFile>
\ 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 @@
-<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
-    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
-        <fileSender localDn="Dublin"/>
-        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
-    </fileHeader>
-    <measData>
-        <managedElement 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>
-        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
-    </fileFooter>
-</measCollecFile>
\ 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 @@
-<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
-    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
-        <fileSender localDn="Dublin"/>
-        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
-    </fileHeader>
-    <measData>
-        <managedElement 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>
-        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
-    </fileFooter>
-</measCollecFile>
\ 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 @@
-<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
-    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
-        <fileSender localDn="Dublin"/>
-        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
-    </fileHeader>
-    <measData>
-        <managedElement 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>
-        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
-    </fileFooter>
-</measCollecFile>
\ 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 @@
-<measCollecFile xmlns="http://www.3gpp.org/ftp/specs/archive/32_series/32.435#measCollec">
-    <fileHeader fileFormatVersion="32.435 V10.0" vendorName="FooBar Ltd" dnPrefix="some dnPrefix">
-        <fileSender localDn="Dublin"/>
-        <measCollec beginTime="2018-10-02T12:00:00+01:00"/>
-    </fileHeader>
-    <measData>
-        <managedElement 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>
-        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
-    </fileFooter>
-</measCollecFile>
\ 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 @@
+<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
-- 
cgit 1.2.3-korg