Refactoring

Signed-off-by: Christian Oertel <[email protected]>
TNG · Dec 10, 2021 · 2b71c0a · 2b71c0a
1 parent 7780151
commit 2b71c0a
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/jgiven-core/src/main/java/com/tngtech/jgiven/impl/ScenarioModelBuilder.java b/jgiven-core/src/main/java/com/tngtech/jgiven/impl/ScenarioModelBuilder.java
@@ -58,11 +58,6 @@ public class ScenarioModelBuilder implements ScenarioListener {
     private StepModel currentStep;
     private final Stack<StepModel> parentSteps = new Stack<>();
 
-    /**
-     * In case the current step is a step with nested steps, this list contains these steps.
-     */
-    private List<StepModel> nestedSteps;
-
     private final SentenceBuilder sentenceBuilder = new SentenceBuilder();
 
     private long scenarioStartedNanos;
@@ -224,9 +219,11 @@ private void incrementDiscrepancy() {
     }
 
     private void decrementDiscrepancy() {
-        int discrepancyOnCurrentLayer = discrepancyOnLayer.pop();
-        discrepancyOnCurrentLayer--;
-        discrepancyOnLayer.push(discrepancyOnCurrentLayer);
+        if (discrepancyOnLayer.peek() > 0) {
+            int discrepancyOnCurrentLayer = discrepancyOnLayer.pop();
+            discrepancyOnCurrentLayer--;
+            discrepancyOnLayer.push(discrepancyOnCurrentLayer);
+        }
     }
 
     @Override
@@ -344,9 +341,8 @@ public void stepMethodFinished(long durationInNanos, boolean hasNestedSteps) {
             currentStep = parentSteps.peek();
         }
 
-        if (discrepancyOnLayer.peek() > 0) {
-            decrementDiscrepancy();
-        }
+        decrementDiscrepancy();
+
     }
 
     private StepStatus getStatusFromNestedSteps(List<StepModel> nestedSteps) {