Revert "2340: Enhance karate summary report"

This reverts commit c7cc672.

karate-core/src/main/java/com/intuit/karate/Results.java

@@ -28,7 +28,6 @@
 import com.intuit.karate.core.TagResults;
 import com.intuit.karate.core.TimelineResults;
 import com.intuit.karate.report.ReportUtils;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,6 +37,7 @@
 import java.util.stream.Stream;
 
 /**
+ *
  * @author pthomas3
  */
 public class Results {
@@ -48,8 +48,6 @@ public class Results {
     private final int featuresSkipped;
     private final int scenariosPassed;
     private final int scenariosFailed;
-    private final int scenariosSkipped;
-    private final int scenariosTotal;
     private final double timeTakenMillis;
     private final long endTime;
     private final List<String> errors = new ArrayList();
@@ -68,8 +66,6 @@ private Results(Suite suite) {
         AtomicInteger ff = new AtomicInteger();
         AtomicInteger sp = new AtomicInteger();
         AtomicInteger sf = new AtomicInteger();
-        AtomicInteger ss = new AtomicInteger();
-        AtomicInteger st = new AtomicInteger();
         AtomicInteger time = new AtomicInteger();
         TimelineResults timeline = new TimelineResults();
         TagResults tags = new TagResults();
@@ -88,17 +84,12 @@ private Results(Suite suite) {
             }
             sp.addAndGet(fr.getPassedCount());
             sf.addAndGet(fr.getFailedCount());
-            st.addAndGet(fr.getTotalCount());
-            ss.addAndGet(fr.getSkippedCount());
-
             errors.addAll(fr.getErrors());
         });
         featuresPassed = fp.get();
         featuresFailed = ff.get();
         scenariosPassed = sp.get();
         scenariosFailed = sf.get();
-        scenariosSkipped = ss.get();
-        scenariosTotal = st.get();
         timeTakenMillis = time.get();
         saveStatsJson();
         printStats();
@@ -109,9 +100,9 @@ private Results(Suite suite) {
             // last so that path can be printed to the console
             File file = suite.suiteReports.summaryReport(suite, this).render();
             System.out.println("\nHTML report: (paste into browser to view) | Karate version: "
-                + FileUtils.KARATE_VERSION + displayEnv
-                + file.toPath().toUri()
-                + "\n===================================================================\n");
+                    + FileUtils.KARATE_VERSION + displayEnv
+                    + file.toPath().toUri()
+                    + "\n===================================================================\n");
         }
     }
 
@@ -134,10 +125,10 @@ private void printStats() {
         System.out.println("Karate version: " + FileUtils.KARATE_VERSION + displayEnv);
         System.out.println("======================================================");
         System.out.println(String.format("elapsed: %6.2f | threads: %4d | thread time: %.2f ",
-            getElapsedTime() / 1000, suite.threadCount, timeTakenMillis / 1000));
+                getElapsedTime() / 1000, suite.threadCount, timeTakenMillis / 1000));
         System.out.println(String.format("features: %5d | skipped: %4d | efficiency: %.2f", getFeaturesTotal(), featuresSkipped, getEfficiency()));
         System.out.println(String.format("scenarios: %4d | passed: %5d | failed: %d",
-            getRunScenariosTotal(), scenariosPassed, scenariosFailed));
+                getScenariosTotal(), scenariosPassed, scenariosFailed));
         System.out.println("======================================================");
         if (!errors.isEmpty()) {
             System.out.println(">>> failed features:");
@@ -155,9 +146,7 @@ public Map<String, Object> toKarateJson() {
         map.put("featuresFailed", featuresFailed);
         map.put("featuresSkipped", featuresSkipped);
         map.put("scenariosPassed", scenariosPassed);
-        map.put("scenariosFailed", getScenariosFailed());
-        map.put("scenariosSkipped", scenariosSkipped);
-        map.put("scenariosTotal", scenariosTotal);
+        map.put("scenariosfailed", errors.size());
         map.put("elapsedTime", getElapsedTime());
         map.put("totalTime", getTimeTakenMillis());
         map.put("efficiency", getEfficiency());
@@ -190,7 +179,7 @@ public int getScenariosFailed() {
         return scenariosFailed;
     }
 
-    public int getRunScenariosTotal() {
+    public int getScenariosTotal() {
         return scenariosPassed + scenariosFailed;
     }
 

karate-core/src/main/java/com/intuit/karate/Suite.java

@@ -280,7 +280,7 @@ public void saveFeatureResults(FeatureResult fr) {
     }
 
     private void onFeatureDone(FeatureResult fr, int index) {
-        if (fr.getRunCount() > 0) { // possible that zero scenarios matched tags
+        if (fr.getScenarioCount() > 0) { // possible that zero scenarios matched tags
             try { // edge case that reports are not writable     
                 saveFeatureResults(fr);
                 String status = fr.isFailed() ? "fail" : "pass";

karate-core/src/main/java/com/intuit/karate/core/FeatureResult.java

@@ -37,6 +37,7 @@
 import java.util.Map;
 
 /**
+ *
  * @author pthomas3
  */
 public class FeatureResult {
@@ -52,7 +53,6 @@ public class FeatureResult {
     private Config config;
     private int loopIndex = -1;
     private int callDepth;
-    private int skippedCount;
 
     public FeatureResult(Feature feature) {
         this.feature = feature;
@@ -64,7 +64,7 @@ public void printStats() {
         StringBuilder sb = new StringBuilder();
         sb.append("---------------------------------------------------------\n");
         sb.append("feature: ").append(featureName).append('\n');
-        sb.append(String.format("scenarios: %2d | passed: %2d | failed: %2d | time: %.4f\n", getRunCount(), getPassedCount(), getFailedCount(), getDurationMillis() / 1000));
+        sb.append(String.format("scenarios: %2d | passed: %2d | failed: %2d | time: %.4f\n", getScenarioCount(), getPassedCount(), getFailedCount(), getDurationMillis() / 1000));
         sb.append("---------------------------------------------------------\n");
         System.out.println(sb);
     }
@@ -92,14 +92,13 @@ public static FeatureResult fromKarateJson(File workingDir, Map<String, Object>
         fr.loopIndex = (Integer) map.get("loopIndex");
         fr.resultDate = (String) map.get("resultDate");
         fr.callDepth = (Integer) map.get("callDepth");
-        fr.setSkippedCount((Integer) map.get("skippedCount"));
         List<Map<String, Object>> list = (List) map.get("scenarioResults");
         if (list != null) {
             for (Map<String, Object> srMap : list) {
                 ScenarioResult sr = ScenarioResult.fromKarateJson(workingDir, feature, srMap);
                 if (!sr.getStepResults().isEmpty()) {
                     fr.addResult(sr);
-                }
+                }                
             }
         }
         return fr;
@@ -126,10 +125,7 @@ public Map<String, Object> toSummaryJson() {
         map.put("durationMillis", getDurationMillis());
         map.put("passedCount", getPassedCount());
         map.put("failedCount", getFailedCount());
-        map.put("skippedCount", getSkippedCount());
-        map.put("totalRunCount", getRunCount());
-        map.put("totalCount", getTotalCount());
-        map.put("scenarioCount", getRunCount());
+        map.put("scenarioCount", getScenarioCount());
         map.put("packageQualifiedName", feature.getPackageQualifiedName());
         map.put("relativePath", feature.getResource().getRelativePath());
         return map;
@@ -144,9 +140,6 @@ public Map<String, Object> toKarateJson() {
         map.put("durationMillis", getDurationMillis());
         map.put("passedCount", getPassedCount());
         map.put("failedCount", getFailedCount());
-        map.put("skippedCount", getSkippedCount());
-        map.put("totalRunCount", getRunCount());
-        map.put("totalCount", getTotalCount());
         map.put("packageQualifiedName", feature.getPackageQualifiedName());
         map.put("relativePath", feature.getResource().getRelativePath());
         //======================================================================
@@ -280,12 +273,12 @@ public boolean isEmpty() {
         return scenarioResults.isEmpty();
     }
 
-    public int getRunCount() {
+    public int getScenarioCount() {
         return scenarioResults.size();
     }
 
     public int getPassedCount() {
-        return getRunCount() - getFailedCount();
+        return getScenarioCount() - getFailedCount();
     }
 
     public boolean isFailed() {
@@ -336,15 +329,4 @@ public String toString() {
         return displayName;
     }
 
-    public int getTotalCount() {
-        return getRunCount() + getSkippedCount();
-    }
-
-    public int getSkippedCount() {
-        return skippedCount;
-    }
-
-    public void setSkippedCount(int skippedCount) {
-        this.skippedCount = skippedCount;
-    }
 }

karate-core/src/main/java/com/intuit/karate/core/FeatureRuntime.java

@@ -29,17 +29,16 @@
 import com.intuit.karate.http.HttpClientFactory;
 import com.intuit.karate.resource.MemoryResource;
 import com.intuit.karate.resource.Resource;
-
 import java.io.File;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
+import java.util.concurrent.CompletableFuture;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
+ *
  * @author pthomas3
  */
 public class FeatureRuntime implements Runnable {
@@ -64,7 +63,6 @@ public class FeatureRuntime implements Runnable {
     public final Map<String, Map<String, Object>> SETUPONCE_CACHE = new HashMap();
 
     private Runnable next;
-    private AtomicInteger skippedCount = new AtomicInteger(0);
 
     public Resource resolveFromThis(String path) {
         return featureCall.feature.getResource().resolve(path);
@@ -210,7 +208,6 @@ public synchronized void afterFeature() {
             result.setVariables(lastExecutedScenario.engine.getAllVariablesAsMap());
             result.setConfig(lastExecutedScenario.engine.getConfig());
         }
-        result.setSkippedCount(this.skippedCount.get());
         if (!result.isEmpty()) {
             for (RuntimeHook hook : suite.hooks) {
                 hook.afterFeature(this);
@@ -220,9 +217,6 @@ public synchronized void afterFeature() {
             next.run();
         }
     }
-    public void incrementSkippedCount() {
-        this.skippedCount.incrementAndGet();
-    }
 
     @Override
     public String toString() {

karate-core/src/main/java/com/intuit/karate/core/ScenarioRuntime.java

@@ -30,6 +30,7 @@
 import com.intuit.karate.ScenarioActions;
 import com.intuit.karate.StringUtils;
 import com.intuit.karate.graal.JsEngine;
+import com.intuit.karate.graal.JsValue;
 import com.intuit.karate.http.ResourceType;
 import com.intuit.karate.shell.StringLogAppender;
 
@@ -281,8 +282,8 @@ public Map<String, Object> getScenarioInfo() {
     protected void logError(String message) {
         if (currentStep != null) {
             message = currentStep.getDebugInfo()
-                + "\n" + currentStep.toString()
-                + "\n" + message;
+                    + "\n" + currentStep.toString()
+                    + "\n" + message;
         }
         logger.error("{}", message);
     }
@@ -356,7 +357,6 @@ private static boolean isSelectedForExecution(FeatureRuntime fr, Scenario scenar
     public void beforeRun() {
         if (featureRuntime.caller.isNone() && featureRuntime.suite.isAborted()) {
             skipped = true;
-            featureRuntime.incrementSkippedCount();
             return;
         }
         steps = skipBackground ? scenario.getSteps() : scenario.getStepsIncludingBackground();
@@ -372,10 +372,9 @@ public void beforeRun() {
                 evalConfigJs(featureRuntime.suite.karateConfigEnv, "karate-config-" + featureRuntime.suite.env + ".js");
             }
             skipped = !featureRuntime.suite.hooks.stream()
-                .map(h -> h.beforeScenario(this))
-                .reduce(Boolean.TRUE, Boolean::logicalAnd);
+                    .map(h -> h.beforeScenario(this))
+                    .reduce(Boolean.TRUE, Boolean::logicalAnd);
             if (skipped) {
-                featureRuntime.incrementSkippedCount();
                 logger.debug("beforeScenario hook returned false, will skip scenario: {}", scenario);
             } else {
                 evaluateScenarioName();
@@ -543,9 +542,9 @@ public String toString() {
     public void evaluateScenarioName() {
         String scenarioName = scenario.getName();
         boolean wrappedByBackTick = scenarioName != null
-            && scenarioName.length() > 1
-            && '`' == scenarioName.charAt(0)
-            && '`' == scenarioName.charAt((scenarioName.length() - 1));
+                && scenarioName.length() > 1
+                && '`' == scenarioName.charAt(0)
+                && '`' == scenarioName.charAt((scenarioName.length() - 1));
         boolean hasJavascriptPlaceholder = ScenarioEngine.hasJavaScriptPlacehoder(scenarioName);
         if (wrappedByBackTick || hasJavascriptPlaceholder) {
             String eval = scenarioName;

karate-core/src/main/java/com/intuit/karate/report/ReportUtils.java

@@ -194,7 +194,7 @@ public static File saveJunitXml(String targetDir, FeatureResult result, String f
         Document doc = XmlUtils.newDocument();
         Element root = doc.createElement("testsuite");
         doc.appendChild(root);
-        root.setAttribute("tests", result.getRunCount() + "");
+        root.setAttribute("tests", result.getScenarioCount() + "");
         root.setAttribute("failures", result.getFailedCount() + "");
         root.setAttribute("time", formatter.format(result.getDurationMillis() / 1000));
         root.setAttribute("name", result.getDisplayName()); // will be uri