2 files changed, 35 insertions, 6 deletions

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 ce051e4..0b8cdfc 100644
--- a/src/test/java/org/onap/dcaegen2/services/pmmapper/AppTest.java
+++ b/src/test/java/org/onap/dcaegen2/services/pmmapper/AppTest.java
@@ -33,13 +33,14 @@ import static org.mockserver.integration.ClientAndServer.startClientAndServer;
 import static org.mockserver.model.HttpResponse.response;
 import static utils.ConfigUtils.getMapperConfigFromFile;
 
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Collections;
 
 import com.google.gson.Gson;
 import io.undertow.server.HttpServerExchange;
@@ -261,7 +262,7 @@ class AppTest {
     @Test
     void testFilter_success() {
         Event mockEvent = Mockito.mock(Event.class);
-        List<Event> mockEvents = Arrays.asList(mockEvent);
+        List<Event> mockEvents = new LinkedList<>(Collections.singletonList(mockEvent));
         MapperConfig mockConfig = Mockito.mock(MapperConfig.class);
         boolean result = App.filter(new MeasFilterHandler(new MeasConverter()), mockEvents, mockConfig);
         assertTrue(result);
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 ac12386..b4fce87 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
@@ -30,6 +30,7 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import org.junit.jupiter.api.BeforeEach;
@@ -56,7 +57,7 @@ class MeasFilterHandlerTest {
 
     private static final Path FILTER_DIRECTORY = Paths.get("src/test/resources/filter_test/");
     private static final String baseDir = "src/test/resources/filter_test/";
-    private static MeasConverter converter = new MeasConverter();
+    private static final MeasConverter converter = new MeasConverter();
     private MeasFilterHandler objUnderTest;
     @Mock
     private HttpServerExchange exchange;
@@ -99,10 +100,25 @@ class MeasFilterHandlerTest {
     }
 
     @Test
+    void remove_all_events_that_does_not_match_filter() {
+        String inputPath = baseDir + "lte/meas_type_and_r_manyinfo/test.xml";
+
+        Filter noMatchFilter = new MeasFilterConfig().new Filter();
+        noMatchFilter.setMeasTypes(Arrays.asList("ad", "bs"));
+        Event eventNoMatch = generateEvent(inputPath, noMatchFilter);
+
+        List<Event> events = new ArrayList<>();
+        events.add(eventNoMatch);
+        events.add(eventNoMatch);
+        assertFalse(objUnderTest.filterByMeasType(events));
+        assertEquals(0, events.size());
+    }
+
+    @Test
     void skip_mapping_when_MeasData_isEmpty() {
         String inputPath = baseDir + "lte/meas_results/test.xml";
         Event event = generateEvent(inputPath, generateValidFilter());
-        event.getMeasurement().replacementMeasurementData(Arrays.asList());
+        event.getMeasurement().replacementMeasurementData(Collections.emptyList());
 
         assertFalse(objUnderTest.filterByMeasType(event));
     }
@@ -112,7 +128,7 @@ class MeasFilterHandlerTest {
         String inputPath = baseDir + "lte/meas_results/test.xml";
 
         Filter emptyMeastypesFilter = new MeasFilterConfig().new Filter();
-        emptyMeastypesFilter.setMeasTypes(Arrays.asList());
+        emptyMeastypesFilter.setMeasTypes(Collections.emptyList());
 
         Event event = generateEvent(inputPath, emptyMeastypesFilter);
         MeasurementFile originalMeasCollec = event.getMeasurement();
@@ -146,6 +162,18 @@ class MeasFilterHandlerTest {
         });
     }
 
+    @Test
+    void invalid_pattern_test() {
+        String inputPath = baseDir + "lte/meas_type_and_r_manyinfo/test.xml";
+        Filter matchFilter = new MeasFilterConfig().new Filter();
+        matchFilter.setMeasTypes(Arrays.asList("a", "b", "......****"));
+        Event eventMatch = generateEvent(inputPath, matchFilter);
+        List<Event> events = new ArrayList<>();
+        events.add(eventMatch);
+        assertTrue(objUnderTest.filterByMeasType(events));
+        assertEquals(1, events.size());
+    }
+
     @ParameterizedTest
     @MethodSource("getEvents")
     void filter_valid_measurements(Event expectedEvent, Event testEvent) {
@@ -168,7 +196,7 @@ class MeasFilterHandlerTest {
         Filter filter;
         filter = new MeasFilterConfig().new Filter();
         filter.setDictionaryVersion("1.0");
-        filter.setMeasTypes(Arrays.asList("a", "b"));
+        filter.setMeasTypes(Arrays.asList("a", "b", "aab.*", ".*3", ".******test"));
         return filter;
     }