clean up illegal argument statements, parameterize tests

Signed-off-by: Kat Shen <[email protected]>
opensearch-project · Aug 7, 2023 · b2c772c · b2c772c
1 parent fa8d2f2
commit b2c772c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/...rc/main/java/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessor.java b/...rc/main/java/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessor.java
@@ -167,12 +167,12 @@ private void validateKeySets(final Set<String> includeSet, final Set<String> exc
 
         includeIntersectionSet.retainAll(excludeSet);
         if (!includeIntersectionSet.isEmpty()) {
-            throw new IllegalArgumentException("Include keys and exclude keys set cannot have any overlap", null);
+            throw new IllegalArgumentException("Include keys and exclude keys set cannot have any overlap");
         }
 
         defaultIntersectionSet.retainAll(excludeSet);
         if (!defaultIntersectionSet.isEmpty()) {
-            throw new IllegalArgumentException("Cannot exclude a default key!", null);
+            throw new IllegalArgumentException("Cannot exclude a default key!");
         }
     }
 

diff --git a/...st/java/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessorTests.java b/...st/java/org/opensearch/dataprepper/plugins/processor/keyvalue/KeyValueProcessorTests.java
@@ -13,6 +13,8 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
@@ -317,7 +319,7 @@ void testIncludeExcludeKeysOverlapKeyValueProcessor() {
     }
 
     @Test
-    void testDefaultKeysKeyValueProcessor() {
+    void testDefaultKeysNoOverlapsBetweenEventKvProcessor() {
         final Map<String, Object> defaultMap = Map.of("dKey", "dValue");
         when(mockConfig.getDefaultValues()).thenReturn(defaultMap);
         keyValueProcessor = new KeyValueProcessor(pluginMetrics, mockConfig);
@@ -331,10 +333,12 @@ void testDefaultKeysKeyValueProcessor() {
         assertThatKeyEquals(parsed_message, "dKey", "dValue");
     }
 
-    @Test
-    void testDefaultKeysAlreadyInMessageKeyValueProcessor() {
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void testDefaultKeysAlreadyInMessageKvProcessor(boolean skipDuplicateValues) {
         final Map<String, Object> defaultMap = Map.of("dKey", "dValue");
         when(mockConfig.getDefaultValues()).thenReturn(defaultMap);
+        when(mockConfig.getSkipDuplicateValues()).thenReturn(skipDuplicateValues);
         keyValueProcessor = new KeyValueProcessor(pluginMetrics, mockConfig);
 
         final Record<Event> record = getMessage("key1=value1&dKey=abc");
@@ -346,12 +350,14 @@ void testDefaultKeysAlreadyInMessageKeyValueProcessor() {
         assertThatKeyEquals(parsed_message, "dKey", "abc");
     }
 
-    @Test
-    void testDefaultIncludeKeysOverlapKeyValueProcessor() {
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void testDefaultIncludeKeysOverlapKvProcessor(boolean skipDuplicateValues) {
         final Map<String, Object> defaultMap = Map.of("key1", "abc");
         final List<String> includeKeys = List.of("key1");
         when(mockConfig.getDefaultValues()).thenReturn(defaultMap);
         when(mockConfig.getIncludeKeys()).thenReturn(includeKeys);
+        when(mockConfig.getSkipDuplicateValues()).thenReturn(skipDuplicateValues);
         keyValueProcessor = new KeyValueProcessor(pluginMetrics, mockConfig);
 
         final Record<Event> record = getMessage("key1=value1&key2=value2");
@@ -362,12 +368,14 @@ void testDefaultIncludeKeysOverlapKeyValueProcessor() {
         assertThatKeyEquals(parsed_message, "key1", "value1");
     }
 
-    @Test
-    void testDefaultPrioritizeIncludeKeysKeyValueProcessor() {
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void testDefaultPrioritizeIncludeKeysKvProcessor(boolean skipDuplicateValues) {
         final Map<String, Object> defaultMap = Map.of("key2", "value2");
         final List<String> includeKeys = List.of("key1");
         when(mockConfig.getDefaultValues()).thenReturn(defaultMap);
         when(mockConfig.getIncludeKeys()).thenReturn(includeKeys);
+        when(mockConfig.getSkipDuplicateValues()).thenReturn(skipDuplicateValues);
         keyValueProcessor = new KeyValueProcessor(pluginMetrics, mockConfig);
 
         final Record<Event> record = getMessage("key1=value1&key2=abc");
@@ -379,12 +387,14 @@ void testDefaultPrioritizeIncludeKeysKeyValueProcessor() {
         assertThatKeyEquals(parsed_message, "key2", "value2");
     }
 
-    @Test
-    void testIncludeKeysNotInRecordMessageKeyValueProcessor() {
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void testIncludeKeysNotInRecordMessageKvProcessor(boolean skipDuplicateValues) {
         final Map<String, Object> defaultMap = Map.of("key2", "value2");
         final List<String> includeKeys = List.of("key1");
         when(mockConfig.getDefaultValues()).thenReturn(defaultMap);
         when(mockConfig.getIncludeKeys()).thenReturn(includeKeys);
+        when(mockConfig.getSkipDuplicateValues()).thenReturn(skipDuplicateValues);
         keyValueProcessor = new KeyValueProcessor(pluginMetrics, mockConfig);
 
         final Record<Event> record = getMessage("key2=abc");
@@ -534,10 +544,10 @@ void testCapitalizeTransformKvProcessor() {
 
         final Record<Event> record = getMessage("key1=value1");
         final List<Record<Event>> editedRecords = (List<Record<Event>>) keyValueProcessor.doExecute(Collections.singletonList(record));
-        final LinkedHashMap<String, Object> parsed_message = getLinkedHashMap(editedRecords);
+        final LinkedHashMap<String, Object> parsedMessage = getLinkedHashMap(editedRecords);
 
-        assertThat(parsed_message.size(), equalTo(1));
-        assertThatKeyEquals(parsed_message, "KEY1", "value1");
+        assertThat(parsedMessage.size(), equalTo(1));
+        assertThatKeyEquals(parsedMessage, "KEY1", "value1");
     }
 
     @Test