Fix mapping localDn to be optional field

Change-Id: I7d1d4b75ac18e42633206dd5870afeb01a3bc504
Issue-ID: DCAEGEN2-1435
Signed-off-by: emartin <ephraim.martin@est.tech>

diff --git a/src/main/resources/mapping.ftl b/src/main/resources/mapping.ftl
index 2819de6..6743a5a 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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/xml_validator_test/test_data/invalid/no_managed_element.xml
similarity index 100%
rename from src/test/resources/mapper_test/mapping_data/invalid_data/no_managed_element.xml
rename to src/test/resources/xml_validator_test/test_data/invalid/no_managed_element.xml