6 files changed, 27 insertions, 12 deletions
diff --git a/src/test/java/org/onap/dcaegen2/services/pmmapper/filtering/MeasFilterHandlerTest.java b/src/test/java/org/onap/dcaegen2/services/pmmapper/filtering/MeasFilterHandlerTest.java
index 0462616..ac12386 100644
--- a/src/test/java/org/onap/dcaegen2/services/pmmapper/filtering/MeasFilterHandlerTest.java
+++ b/src/test/java/org/onap/dcaegen2/services/pmmapper/filtering/MeasFilterHandlerTest.java
@@ -48,12 +48,10 @@ import org.onap.dcaegen2.services.pmmapper.model.measurement.common.MeasurementF
 import org.onap.dcaegen2.services.pmmapper.utils.MeasConverter;
 
 import io.undertow.server.HttpServerExchange;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import utils.ArgumentCreator;
 import utils.EventUtils;
 
 @ExtendWith(MockitoExtension.class)
-@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.parsers.*", "org.xml.*", "javax.management.*"})
 class MeasFilterHandlerTest {
 
     private static final Path FILTER_DIRECTORY = Paths.get("src/test/resources/filter_test/");
@@ -183,7 +181,7 @@ class MeasFilterHandlerTest {
             testEvent.setFilter(generateValidFilter());
             return Arguments.of(expectedEvent, testEvent);
         };
-        return EventUtils.generateEventArguments(FILTER_DIRECTORY, "nr", creator);
+        return EventUtils.generateEventArguments(FILTER_DIRECTORY, creator);
 
     }
 
diff --git a/src/test/java/org/onap/dcaegen2/services/pmmapper/filtering/MetadataFilterTest.java b/src/test/java/org/onap/dcaegen2/services/pmmapper/filtering/MetadataFilterTest.java
index bf232ea..7ee13b7 100644
--- a/src/test/java/org/onap/dcaegen2/services/pmmapper/filtering/MetadataFilterTest.java
+++ b/src/test/java/org/onap/dcaegen2/services/pmmapper/filtering/MetadataFilterTest.java
@@ -123,6 +123,6 @@ public class MetadataFilterTest {
 
             return Arguments.of(testEvent);
         };
-        return EventUtils.generateEventArguments(DATA_DIRECTORY, "/nr", creator);
+        return EventUtils.generateEventArguments(DATA_DIRECTORY, creator);
     }
 }
 \ No newline at end of file
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 2356a57..7ddc929 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
@@ -120,9 +120,9 @@ class MapperTest {
         doThrow(new TemplateException(mock(Environment.class))).when(mappingTemplateMock)
                 .process(any(), any());
         HashMap<String, Template> templates = new HashMap<>();
-        templates.put("org.3GPP.28.550#measData", mappingTemplateMock);
+        templates.put("org.3GPP.28.532#measData", mappingTemplateMock);
         Whitebox.setInternalState(objUnderTest, "templates", templates);
-        Path testFile = Paths.get(dataDirectory + "/28.550/no_measdata/test.xml");
+        Path testFile = Paths.get(dataDirectory + "/28.532/no_measdata/test.xml");
         Event testEvent = EventUtils.makeMockEvent(EventUtils.fileContentsToString(testFile), fifthGenerationMetadata);
         assertThrows(MappingException.class, () -> objUnderTest.map(testEvent));
     }
@@ -185,7 +185,7 @@ class MapperTest {
             Event testEvent = EventUtils.makeMockEvent(EventUtils.fileContentsToString(testEventPath), eventMetadata);
             return Arguments.of(testEvent);
         };
-        return EventUtils.generateEventArguments(dataDirectory, "/28.550", creator);
+        return EventUtils.generateEventArguments(dataDirectory, creator);
     }
 }
 
diff --git a/src/test/java/org/onap/dcaegen2/services/pmmapper/utils/MeasSplitterTest.java b/src/test/java/org/onap/dcaegen2/services/pmmapper/utils/MeasSplitterTest.java
index 120bea1..5ab0d38 100644
--- a/src/test/java/org/onap/dcaegen2/services/pmmapper/utils/MeasSplitterTest.java
+++ b/src/test/java/org/onap/dcaegen2/services/pmmapper/utils/MeasSplitterTest.java
@@ -38,6 +38,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.onap.dcaegen2.services.pmmapper.model.Event;
 import org.onap.dcaegen2.services.pmmapper.model.EventMetadata;
@@ -95,6 +96,6 @@ class MeasSplitterTest {
             Event testEvent = EventUtils.makeMockEvent(EventUtils.fileContentsToString(testEventPath), metadata);
             return Arguments.of(numberOfEvents, measInfoIds, testEvent);
         };
-        return EventUtils.generateEventArguments(Paths.get(baseDir), "nr", splitterCreator);
+        return EventUtils.generateEventArguments(Paths.get(baseDir), splitterCreator);
     }
 }
diff --git a/src/test/java/org/onap/dcaegen2/services/pmmapper/utils/XMLValidatorTest.java b/src/test/java/org/onap/dcaegen2/services/pmmapper/utils/XMLValidatorTest.java
index 655fc7a..56bd18d 100644
--- a/src/test/java/org/onap/dcaegen2/services/pmmapper/utils/XMLValidatorTest.java
+++ b/src/test/java/org/onap/dcaegen2/services/pmmapper/utils/XMLValidatorTest.java
@@ -102,6 +102,6 @@ class XMLValidatorTest {
                     EventUtils.fileContentsToString(testEventPath), metadata, new HashMap<>(), "");
             return Arguments.of(valid, testEvent);
         };
-        return EventUtils.generateEventArguments(dataDirectory, "nr", creator);
+        return EventUtils.generateEventArguments(dataDirectory, creator);
     }
 }
diff --git a/src/test/java/utils/EventUtils.java b/src/test/java/utils/EventUtils.java
index ffa02b0..934c191 100644
--- a/src/test/java/utils/EventUtils.java
+++ b/src/test/java/utils/EventUtils.java
@@ -26,6 +26,8 @@ import static org.mockito.Mockito.mock;
 
 import com.google.gson.Gson;
 import io.undertow.server.HttpServerExchange;
+
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -43,6 +45,8 @@ import org.onap.dcaegen2.services.pmmapper.utils.MeasConverter;
 
 public class EventUtils {
 
+    private static final String LTE_QUALIFIER = File.separator + "lte";
+    private static final String NR_QUALIFIER = File.separator + "nr";
 
     /**
      * Reads contents of files inside the eventBodyDirectory, combines contents with metadata to make an Event Object.
@@ -59,18 +63,18 @@ public class EventUtils {
                        .map(contents -> EventUtils.makeMockEvent(contents, eventMetadata))
                        .collect(Collectors.toList());
     }
+
     /**
      * Create a List of Arguments containing an Event (Defaults to LTE events), and an expected outcome.
      * Fails test in the event of failure to read a file.
      * @param baseDirectory Directory containing multiple formats of events separated by a directory.
-     * @param nrQualifier String representing a unique part of the path that will exist only in the NR path.
      * @param argCreator Callback to method that will generate the appropriate set of arguments for each test.
      */
-    public static List<Arguments> generateEventArguments(Path baseDirectory, String nrQualifier, ArgumentCreator argCreator ) {
+    public static List<Arguments> generateEventArguments(Path baseDirectory, ArgumentCreator argCreator ) {
         List<Arguments> events = new ArrayList<>();
         try (Stream<Path> paths = Files.list(baseDirectory)) {
             paths.filter(Files::isDirectory).forEach(path -> {
-                String fileFormatType = path.toString().contains(nrQualifier) ? MeasConverter.NR_FILE_TYPE : MeasConverter.LTE_FILE_TYPE;
+                String fileFormatType = readFileFormatFromPath(path.toString());
                 EventMetadata eventMetadata = new EventMetadata();
                 eventMetadata.setFileFormatType(fileFormatType);
                 events.addAll(getEventsArgument(path, eventMetadata, argCreator));
@@ -81,6 +85,18 @@ public class EventUtils {
         return events;
     }
 
+    private static String readFileFormatFromPath(String path) {
+        if (path.contains(NR_QUALIFIER)) {
+            return MeasConverter.NR_FILE_TYPE;
+        }
+        else if (path.contains(LTE_QUALIFIER)) {
+            return MeasConverter.LTE_FILE_TYPE;
+        }
+        else {
+            return MeasConverter.NOT_SUPPORTED_TYPE;
+        }
+    }
+
     /**
      * reads contents of file into a string.
      * fails a tests in the event failure occurs.