ISSUE-659 # adjust iteration numbers for those csvSource with headers

Author: luke-zhou

core/src/main/java/org/jsmart/zerocode/core/domain/Parameterized.java

@@ -11,6 +11,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;

core/src/main/java/org/jsmart/zerocode/core/engine/preprocessor/ZeroCodeParameterizedProcessorImpl.java

@@ -15,7 +15,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.IntStream;
-import java.util.stream.Stream;
 
 import static org.jsmart.zerocode.core.constants.ZerocodeConstants.DSL_FORMAT;
 import static org.jsmart.zerocode.core.di.provider.CsvParserProvider.LINE_SEPARATOR;
@@ -136,9 +135,8 @@ private ScenarioSpec resolveParamsCsv(ScenarioSpec scenario, int paramIndex) {
 
     private String[] retrieveCsvHeaders(String csvHeaderLine) {
         String[] parsedHeaderLine = csvParser.parseLine(csvHeaderLine + LINE_SEPARATOR);
-        Stream<String> headers = Arrays.stream(parsedHeaderLine);
-        boolean hasHeader = parsedHeaderLine.length > 0 && headers.allMatch(s -> s.matches("^\\|.*\\|$"));
-        return !hasHeader ? null : headers.map(s -> s.substring(1,s.length()-1)).toArray(String[]::new);
+        boolean hasHeader = parsedHeaderLine.length > 0 && Arrays.stream(parsedHeaderLine).allMatch(s -> s.matches("^\\|.*\\|$"));
+        return !hasHeader ? null : Arrays.stream(parsedHeaderLine).map(s -> s.substring(1,s.length()-1)).toArray(String[]::new);
     }
 
     private Map<String, Object> resolveCsvLine(String csvLine, String[] headers) {

core/src/main/java/org/jsmart/zerocode/core/runner/ZeroCodeMultiStepsScenarioRunnerImpl.java

@@ -10,9 +10,13 @@
 import static java.util.Optional.ofNullable;
 import static org.apache.commons.collections4.CollectionUtils.isEmpty;
 import static org.jsmart.zerocode.core.constants.ZerocodeConstants.KAFKA_TOPIC;
+
+import org.jsmart.zerocode.core.domain.Parameterized;
 import org.jsmart.zerocode.core.domain.ScenarioSpec;
 import org.jsmart.zerocode.core.domain.Step;
 import org.jsmart.zerocode.core.domain.builders.ZeroCodeExecReportBuilder;
+
+import static org.jsmart.zerocode.core.di.provider.CsvParserProvider.LINE_SEPARATOR;
 import static org.jsmart.zerocode.core.domain.builders.ZeroCodeExecReportBuilder.newInstance;
 import org.jsmart.zerocode.core.domain.builders.ZeroCodeIoWriteBuilder;
 import org.jsmart.zerocode.core.engine.assertion.FieldAssertionMatcher;
@@ -30,18 +34,14 @@
 import org.jsmart.zerocode.core.utils.ApiTypeUtils;
 import static org.jsmart.zerocode.core.utils.ApiTypeUtils.apiType;
 import static org.jsmart.zerocode.core.utils.RunnerUtils.getFullyQualifiedUrl;
-import static org.jsmart.zerocode.core.utils.RunnerUtils.getParameterSize;
 import static org.jsmart.zerocode.core.utils.SmartUtils.prettyPrintJson;
 import org.junit.runner.Description;
 import org.junit.runner.notification.RunNotifier;
 import org.slf4j.Logger;
 import static org.slf4j.LoggerFactory.getLogger;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.BiConsumer;
 
 @Singleton
@@ -551,6 +551,24 @@ private int deriveScenarioLoopTimes(ScenarioSpec scenario) {
         return scenarioLoopTimes;
     }
 
+    private int getParameterSize(Parameterized parameterized) {
+        if (parameterized == null) {
+            return 0;
+        }
+
+        List<Object> valueSource = parameterized.getValueSource();
+        List<String> csvSource = parameterized.getCsvSource();
+        int csvSourceSize = 0;
+
+        if (csvSource != null && !csvSource.isEmpty()){
+            String[] parsedHeaderLine = csvParser.parseLine(csvSource.get(0) + LINE_SEPARATOR);
+            boolean hasHeader = parsedHeaderLine.length > 0 && Arrays.stream(parsedHeaderLine).allMatch(s -> s.matches("^\\|.*\\|$"));
+            csvSourceSize = hasHeader ? csvSource.size() -1 : csvSource.size();
+        }
+
+        return valueSource != null ? valueSource.size() : csvSourceSize;
+    }
+
     private List<FieldAssertionMatcher> compareStepResults(Step thisStep, String actualResult, String expectedResult, String resolvedScenarioState) {
         List<FieldAssertionMatcher> failureResults = new ArrayList<>();
 

core/src/main/java/org/jsmart/zerocode/core/utils/RunnerUtils.java

@@ -120,18 +120,6 @@ public static int loopCount(Step thisStep) {
         return stepLoopTimes > 0 ? stepLoopTimes: MIN_COUNT;
     }
 
-    public static int getParameterSize(Parameterized parameterized) {
-        if (parameterized == null) {
-            return 0;
-        }
-
-        List<Object> valueSource = parameterized.getValueSource();
-        List<String> csvSource = parameterized.getCsvSource();
-
-        return valueSource != null ? valueSource.size() :
-                (csvSource != null ? csvSource.size() : 0);
-    }
-
     public static void handleTestCompleted(RunListener reportListener, Logger logger) {
         if (CHARTS_AND_CSV.equals(getProperty(ZEROCODE_JUNIT))) {
             /**

core/src/test/java/org/jsmart/zerocode/parameterized/ParameterisedCsvDemoTest.java

@@ -14,4 +14,9 @@ public class ParameterisedCsvDemoTest {
     @JsonTestCase("integration_test_files/parameterized/parameterized_sample_csv_test.json")
     public void testParameterizedCsv() throws Exception {
     }
+
+    @Test
+    @JsonTestCase("integration_test_files/parameterized/parameterized_sample_csv_with_headers_test.json")
+    public void testParameterizedCsvWithHeaders() throws Exception {
+    }
 }