fixes #290

Author: anshooarora

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

@@ -25,8 +25,6 @@
 @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();
@@ -47,66 +45,93 @@ public final void refresh() {
         authorCtx.getSet().forEach(x -> x.refresh());
         categoryCtx.getSet().forEach(x -> x.refresh());
         deviceCtx.getSet().forEach(x -> x.refresh());
-        stats.update(testList);
-        synchronized (obj) {
+        synchronized (testList) {
+            stats.update(testList);
             setEndTime(Calendar.getInstance().getTime());
         }
     }
+    
+    public void addTest(Test test) {
+        testList.add(test);
+    }
+    
+    public boolean removeTest(Test test) {
+        synchronized (testList) {
+            return removeTest(testList, test);
+        }
+    }
 
+    private boolean removeTest(List<Test> testList, Test test) {
+        boolean removed = testList.removeIf(x -> x.getId() == test.getId());
+        if (!removed)
+            testList.forEach(x -> removeTest(x.getChildren(), test));
+        return removed;
+    }
+    
     public final void applyOverrideConf() {
-        Date min = testList.stream()
-                .map(t -> t.getStartTime())
-                .min(Date::compareTo)
-                .get();
-        Date max = testList.stream()
-                .map(t -> t.getEndTime())
-                .max(Date::compareTo)
-                .get();
-        synchronized (obj) {
+        synchronized (testList) {
+            Date min = testList.stream()
+                    .map(t -> t.getStartTime())
+                    .min(Date::compareTo)
+                    .get();
+            Date max = testList.stream()
+                    .map(t -> t.getEndTime())
+                    .max(Date::compareTo)
+                    .get();
             setStartTime(min);
             setEndTime(max);
         }
     }
 
     public final boolean isBDD() {
-        return !testList.isEmpty() && testList.stream().allMatch(Test::isBDD);
+        synchronized (testList) {
+            return !testList.isEmpty() && testList.stream().allMatch(Test::isBDD);
+        }
     }
 
     public final boolean anyTestHasStatus(Status status) {
-        return testList.stream()
+        synchronized (testList) {
+            return testList.stream()
                 .anyMatch(x -> x.getStatus() == status);
+        }
     }
 
     public Optional<Test> findTest(List<Test> list, String name) {
-        Optional<Test> test = list.stream().filter(x -> x.getName().equals(name)).findFirst();
-        if (!test.isPresent())
-            for (Test t : list)
-                return findTest(t.getChildren(), name);
-        return test;
+        synchronized (testList) {
+            Optional<Test> test = list.stream().filter(x -> x.getName().equals(name)).findFirst();
+            if (!test.isPresent())
+                for (Test t : list)
+                    return findTest(t.getChildren(), name);
+            return test;
+        }
     }
 
     public List<ExceptionInfo> aggregateExceptions(List<Test> testList) {
-        List<ExceptionInfo> list = new ArrayList<>();
-        for (Test test : testList) {
-            list.addAll(test.aggregateExceptions());
-            if (!test.getChildren().isEmpty())
-                aggregateExceptions(test.getChildren());
+        synchronized (testList) {
+            List<ExceptionInfo> list = new ArrayList<>();
+            for (Test test : testList) {
+                list.addAll(test.aggregateExceptions());
+                if (!test.getChildren().isEmpty())
+                    aggregateExceptions(test.getChildren());
+            }
+            return list;
         }
-        return list;
     }
 
     public final long timeTaken() {
         return endTime.getTime() - startTime.getTime();
     }
 
     public final Status getStatus() {
-        List<Status> list = testList
+        synchronized (testList) {
+            List<Status> list = testList
                 .stream()
                 .map(x -> x.getStatus())
                 .collect(Collectors.toList());
-        Status s = Status.max(list);
-        if (s == Status.SKIP && anyTestHasStatus(Status.PASS))
-            s = Status.PASS;
-        return s;
+            Status s = Status.max(list);
+            if (s == Status.SKIP && anyTestHasStatus(Status.PASS))
+                s = Status.PASS;
+            return s;
+        }
     }
 }

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

@@ -6,6 +6,7 @@
 import org.testng.annotations.Test;
 
 import com.aventstack.extentreports.ExtentReports;
+import com.aventstack.extentreports.ExtentTest;
 
 public class ReportStatsConcurrentTest {
 
@@ -17,12 +18,34 @@ public class ReportStatsConcurrentTest {
      * https://github.com/extent-framework/extentreports-java/issues/250
      */
     @Test
-    public void concurrentUpdateFlush() {
+    public void concurrentAddUpdateFlush() {
         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());
     }
+    
+    @Test
+    public void concurrentAddRemoveUpdateFlush() {
+        ExtentReports extent = new ExtentReports();
+        IntStream.range(0, 100).parallel().forEach(x -> {
+            extent.createTest(String.valueOf(x)).pass("");
+            extent.removeTest(String.valueOf(x));
+            extent.flush();
+        });
+        Assert.assertEquals(0, extent.getReport().getTestList().size());
+    }
+    
+    @Test
+    public void concurrentAddModifyUpdateFlush() {
+        ExtentReports extent = new ExtentReports();
+        IntStream.range(0, 100).parallel().forEach(x -> {
+            ExtentTest test = extent.createTest(String.valueOf(x)).pass("");
+            test.createNode("Node").pass("");
+            extent.flush();
+        });
+        Assert.assertEquals(100, extent.getReport().getTestList().size());
+    }
 }