From ea5f0af6c28863b5f8ee220e105b6c3221c68b03 Mon Sep 17 00:00:00 2001
From: emartin <ephraim.martin@est.tech>
Date: Mon, 15 Apr 2019 11:03:19 +0000
Subject: Fix mapping localDn to be optional field

Change-Id: I7d1d4b75ac18e42633206dd5870afeb01a3bc504
Issue-ID: DCAEGEN2-1435
Signed-off-by: emartin <ephraim.martin@est.tech>
---
 src/main/resources/mapping.ftl                     |  2 +-
 .../onap/dcaegen2/services/pmmapper/AppTest.java   |  2 +-
 .../services/pmmapper/mapping/MapperTest.java      |  7 ------
 .../invalid_data/no_managed_element.xml            | 27 ----------------------
 .../test_data/invalid/no_managed_element.xml       | 27 ++++++++++++++++++++++
 5 files changed, 29 insertions(+), 36 deletions(-)
 delete mode 100644 src/test/resources/mapper_test/mapping_data/invalid_data/no_managed_element.xml
 create mode 100644 src/test/resources/xml_validator_test/test_data/invalid/no_managed_element.xml

diff --git a/src/main/resources/mapping.ftl b/src/main/resources/mapping.ftl
index 2819de6..6743a5a 100644
--- a/src/main/resources/mapping.ftl
+++ b/src/main/resources/mapping.ftl
@@ -116,7 +116,7 @@
 {
     "granularityPeriod": ${measData.measInfo.granPeriod.@endTime[0]!?datetime?long?c},
     "measuredEntityUserName": "${measData.managedElement.@userLabel[0]!}",
-    "measuredEntityDn": "${measData.managedElement.@localDn}",
+    "measuredEntityDn": "${measData.managedElement.@localDn[0]!}",
     "measuredEntitySoftwareVersion": "${measData.managedElement.@swVersion[0]!}",
     "measInfoList": <@measInfoList/>
 }
diff --git a/src/test/java/org/onap/dcaegen2/services/pmmapper/AppTest.java b/src/test/java/org/onap/dcaegen2/services/pmmapper/AppTest.java
index 7c5340a..2db24b4 100644
--- a/src/test/java/org/onap/dcaegen2/services/pmmapper/AppTest.java
+++ b/src/test/java/org/onap/dcaegen2/services/pmmapper/AppTest.java
@@ -171,7 +171,7 @@ class AppTest {
         String metadataFileContents = new String(Files.readAllBytes(metadata));
         eventMetadata = new Gson().fromJson(metadataFileContents, EventMetadata.class);
 
-        Path testFile = Paths.get(dataDirectory + "/invalid_data/no_managed_element.xml");
+        Path testFile = Paths.get("src/test/resources/xml_validator_test/test_data/invalid/no_managed_element.xml");
         Event mockEvent = EventUtils.makeMockEvent(EventUtils.fileContentsToString(testFile), eventMetadata);
 
         boolean result = App.validate(mockValidator, mockEvent, mockConfig);
diff --git a/src/test/java/org/onap/dcaegen2/services/pmmapper/mapping/MapperTest.java b/src/test/java/org/onap/dcaegen2/services/pmmapper/mapping/MapperTest.java
index 8670bed..7a8602e 100644
--- a/src/test/java/org/onap/dcaegen2/services/pmmapper/mapping/MapperTest.java
+++ b/src/test/java/org/onap/dcaegen2/services/pmmapper/mapping/MapperTest.java
@@ -98,13 +98,6 @@ class MapperTest {
         vesSchema.validate(new JSONObject(objUnderTest.map(testEvent)));
     }
 
-    @ParameterizedTest
-    @MethodSource("getInvalidEvents")
-    void testInvalidEvent(Event testEvent) {
-        when(converter.convert(any(MeasCollecFile.class))).thenReturn(testEvent.getBody());
-        assertThrows(MappingException.class, () -> objUnderTest.map(testEvent));
-    }
-
     @Test
     void testFailureToProcess() throws IOException, TemplateException {
         Template mappingTemplateMock = mock(Template.class, RETURNS_DEEP_STUBS);
diff --git a/src/test/resources/mapper_test/mapping_data/invalid_data/no_managed_element.xml b/src/test/resources/mapper_test/mapping_data/invalid_data/no_managed_element.xml
deleted file mode 100644
index b1b3d68..0000000
--- a/src/test/resources/mapper_test/mapping_data/invalid_data/no_managed_element.xml
+++ /dev/null
@@ -1,27 +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>
-        <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>
-        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
-    </fileFooter>
-</measCollecFile>
diff --git a/src/test/resources/xml_validator_test/test_data/invalid/no_managed_element.xml b/src/test/resources/xml_validator_test/test_data/invalid/no_managed_element.xml
new file mode 100644
index 0000000..b1b3d68
--- /dev/null
+++ b/src/test/resources/xml_validator_test/test_data/invalid/no_managed_element.xml
@@ -0,0 +1,27 @@
+<?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>
+        <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>
+        <measCollec endTime="2018-10-02T12:15:00+01:00"/>
+    </fileFooter>
+</measCollecFile>
-- 
cgit 1.2.3-korg