fixes #250

Author: anshooarora

.gitignore

@@ -40,3 +40,4 @@ deploycmd.txt
 
 # 
 pom.nexus.xml
+*.DS_Store

src/main/java/com/aventstack/extentreports/model/Report.java

@@ -25,6 +25,8 @@
 @ToString(includeFieldNames = true)
 public class Report implements Serializable, BaseEntity {
     private static final long serialVersionUID = -8667496631392333349L;
+    
+    private final Object obj = new Object();
 
     @Builder.Default
     private Date startTime = Calendar.getInstance().getTime();
@@ -46,7 +48,7 @@ public final void refresh() {
         categoryCtx.getSet().forEach(x -> x.refresh());
         deviceCtx.getSet().forEach(x -> x.refresh());
         stats.update(testList);
-        synchronized (this) {
+        synchronized (obj) {
             setEndTime(Calendar.getInstance().getTime());
         }
     }
@@ -60,7 +62,7 @@ public final void applyOverrideConf() {
                 .map(t -> t.getEndTime())
                 .max(Date::compareTo)
                 .get();
-        synchronized (this) {
+        synchronized (obj) {
             setStartTime(min);
             setEndTime(max);
         }

src/main/java/com/aventstack/extentreports/model/ReportStats.java

@@ -38,33 +38,35 @@ public final void update(final List<Test> testList) {
         if (testList == null || testList.isEmpty())
             return;
 
-        update(testList, parent, parentPercentage);
-
-        // level 1, for BDD, this would also include Scenario and excludes
-        // ScenarioOutline
-        List<Test> children = testList.stream()
-                .flatMap(x -> x.getChildren().stream())
-                .filter(x -> x.getBddType() != ScenarioOutline.class)
-                .collect(Collectors.toList());
-        List<Test> scenarios = testList.stream()
-                .flatMap(x -> x.getChildren().stream())
-                .flatMap(x -> x.getChildren().stream())
-                .filter(x -> x.getBddType() == Scenario.class)
-                .collect(Collectors.toList());
-        children.addAll(scenarios);
-        update(children, child, childPercentage);
-
-        // level 2, for BDD, this only includes Steps
-        List<Test> grandChildren = children.stream()
-                .flatMap(x -> x.getChildren().stream())
-                .filter(x -> x.getBddType() != Scenario.class)
-                .collect(Collectors.toList());
-        update(grandChildren, grandchild, grandchildPercentage);
-
-        List<Log> logs = testList.stream().flatMap(x -> x.getLogs().stream()).collect(Collectors.toList());
-        logs.addAll(children.stream().flatMap(x -> x.getLogs().stream()).collect(Collectors.toList()));
-        logs.addAll(grandChildren.stream().flatMap(x -> x.getLogs().stream()).collect(Collectors.toList()));
-        update(logs, log, logPercentage);
+        synchronized (testList) {
+            update(testList, parent, parentPercentage);
+    
+            // level 1, for BDD, this would also include Scenario and excludes
+            // ScenarioOutline
+            List<Test> children = testList.stream()
+                    .flatMap(x -> x.getChildren().stream())
+                    .filter(x -> x.getBddType() != ScenarioOutline.class)
+                    .collect(Collectors.toList());
+            List<Test> scenarios = testList.stream()
+                    .flatMap(x -> x.getChildren().stream())
+                    .flatMap(x -> x.getChildren().stream())
+                    .filter(x -> x.getBddType() == Scenario.class)
+                    .collect(Collectors.toList());
+            children.addAll(scenarios);
+            update(children, child, childPercentage);
+    
+            // level 2, for BDD, this only includes Steps
+            List<Test> grandChildren = children.stream()
+                    .flatMap(x -> x.getChildren().stream())
+                    .filter(x -> x.getBddType() != Scenario.class)
+                    .collect(Collectors.toList());
+            update(grandChildren, grandchild, grandchildPercentage);
+    
+            List<Log> logs = testList.stream().flatMap(x -> x.getLogs().stream()).collect(Collectors.toList());
+            logs.addAll(children.stream().flatMap(x -> x.getLogs().stream()).collect(Collectors.toList()));
+            logs.addAll(grandChildren.stream().flatMap(x -> x.getLogs().stream()).collect(Collectors.toList()));
+            update(logs, log, logPercentage);
+        }
     }
 
     private final void update(final List<? extends RunResult> list, final Map<Status, Long> countMap,

src/test/java/com/aventstack/extentreports/entity/ReportStatsConcurrentTest.java

@@ -0,0 +1,28 @@
+package com.aventstack.extentreports.entity;
+
+import java.util.stream.IntStream;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import com.aventstack.extentreports.ExtentReports;
+
+public class ReportStatsConcurrentTest {
+
+    /**
+     * Fix for ConcurrentModificationException caused due to iterating over testList
+     * vector in ReportStats::update
+     * 
+     * Issue details:
+     * https://github.com/extent-framework/extentreports-java/issues/250
+     */
+    @Test
+    public void concurrentUpdateFlush() {
+        ExtentReports extent = new ExtentReports();
+        IntStream.range(0, 100).parallel().forEach(x -> {
+            extent.createTest(String.valueOf(x)).pass("");
+            extent.flush();
+        });
+        Assert.assertEquals(100, extent.getReport().getTestList().size());
+    }
+}