[GitHub] [nifi] nandorsoma commented on a diff in pull request #5905: NIFI-9817 Add a Validator for the PutCloudWatchMetric Processor's Unit Field

[GitBox <gi...@apache.org>]

nandorsoma commented on code in PR #5905:
URL: https://github.com/apache/nifi/pull/5905#discussion_r927532892


##########
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/cloudwatch/TestPutCloudWatchMetric.java:
##########
@@ -16,20 +16,24 @@
  */
 package org.apache.nifi.processors.aws.cloudwatch;
 
-import com.amazonaws.services.cloudwatch.model.Dimension;
-import com.amazonaws.services.cloudwatch.model.InvalidParameterValueException;
-import com.amazonaws.services.cloudwatch.model.MetricDatum;
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.util.TestRunner;
-import org.apache.nifi.util.TestRunners;
-import org.junit.jupiter.api.Test;
-
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.HashMap;
+import java.util.stream.Stream;
+
+import org.apache.nifi.components.PropertyDescriptor;

Review Comment:
   ```suggestion
   import org.apache.commons.lang3.StringUtils;
   import org.apache.nifi.components.PropertyDescriptor;
   ```



##########
nifi-nar-bundles/nifi-aws-bundle/nifi-aws-processors/src/test/java/org/apache/nifi/processors/aws/cloudwatch/TestPutCloudWatchMetric.java:
##########
@@ -268,23 +272,34 @@ public void testMetricExpressionInvalidRoutesToFailure() throws Exception {
         runner.assertAllFlowFilesTransferred(PutCloudWatchMetric.REL_FAILURE, 1);
     }
 
-    @Test
-    public void testInvalidUnitRoutesToFailure() throws Exception {
+    @ParameterizedTest
+    @CsvSource({"nan","percent","count"})
+    public void testInvalidUnit(String unit) throws Exception {
         MockPutCloudWatchMetric mockPutCloudWatchMetric = new MockPutCloudWatchMetric();
-        mockPutCloudWatchMetric.throwException = new InvalidParameterValueException("Unit error message");
         final TestRunner runner = TestRunners.newTestRunner(mockPutCloudWatchMetric);
 
         runner.setProperty(PutCloudWatchMetric.NAMESPACE, "TestNamespace");
         runner.setProperty(PutCloudWatchMetric.METRIC_NAME, "TestMetric");
-        runner.setProperty(PutCloudWatchMetric.UNIT, "BogusUnit");
-        runner.setProperty(PutCloudWatchMetric.VALUE, "1");
-        runner.assertValid();
+        runner.setProperty(PutCloudWatchMetric.UNIT, unit);
+        runner.setProperty(PutCloudWatchMetric.VALUE, "1.0");
+        runner.assertNotValid();
+    }
 
-        runner.enqueue(new byte[] {});
-        runner.run();
+    private static Stream<Arguments> data() {
+        return PutCloudWatchMetric.units.stream().map(Arguments::of);
+    }
 
-        assertEquals(1, mockPutCloudWatchMetric.putMetricDataCallCount);
-        runner.assertAllFlowFilesTransferred(PutCloudWatchMetric.REL_FAILURE, 1);
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testValidUnit(String unit) {
+        MockPutCloudWatchMetric mockPutCloudWatchMetric = new MockPutCloudWatchMetric();
+        final TestRunner runner = TestRunners.newTestRunner(mockPutCloudWatchMetric);
+
+        runner.setProperty(PutCloudWatchMetric.NAMESPACE, "TestNamespace");
+        runner.setProperty(PutCloudWatchMetric.METRIC_NAME, "TestMetric");
+        runner.setProperty(PutCloudWatchMetric.UNIT, unit);
+        runner.setProperty(PutCloudWatchMetric.VALUE, "1");
+        runner.assertValid();
     }
 

Review Comment:
   ```suggestion
       // because of backward compatibility we need to ensure that empty string is still supported
       @Test
       public void testEmptyUnit() {
           MockPutCloudWatchMetric mockPutCloudWatchMetric = new MockPutCloudWatchMetric();
           final TestRunner runner = TestRunners.newTestRunner(mockPutCloudWatchMetric);
   
           runner.setProperty(PutCloudWatchMetric.NAMESPACE, "TestNamespace");
           runner.setProperty(PutCloudWatchMetric.METRIC_NAME, "TestMetric");
           runner.setProperty(PutCloudWatchMetric.UNIT, StringUtils.EMPTY);
           runner.setProperty(PutCloudWatchMetric.VALUE, "1");
           runner.assertValid();
       }
   ```



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: issues-unsubscribe@nifi.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org