make getTotalNumberOfCompletedTests more robust

PhilippSalvisberg · PhilippSalvisberg · commit bfe8f1957ddd · 2020-06-02T19:53:30.000+02:00
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.java b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.java
@@ -103,7 +103,13 @@ public int getTotalNumberOfCompletedTests() {
                 || counter.getError() == null) {
             return -1;
         }
-        return counter.getDisabled() + counter.getSuccess() + counter.getFailure() + counter.getError();
+        int total = counter.getDisabled() + counter.getSuccess() + counter.getFailure() + counter.getError();
+        if (totalNumberOfTests != null && total > totalNumberOfTests) {
+            // can happen when run is cancelled and two processes are updating the run in parallel
+            // not worth to ensure consistency for this case, using synchronized will not be enough
+            total = totalNumberOfTests;
+        }
+        return total;
     }
 
     public String getReporterId() {

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,13 @@ public int getTotalNumberOfCompletedTests() {`
`103`	`103`	`\|\| counter.getError() == null) {`
`104`	`104`	`return -1;`
`105`	`105`	`}`
`106`		`- return counter.getDisabled() + counter.getSuccess() + counter.getFailure() + counter.getError();`
	`106`	`+ int total = counter.getDisabled() + counter.getSuccess() + counter.getFailure() + counter.getError();`
	`107`	`+ if (totalNumberOfTests != null && total > totalNumberOfTests) {`
	`108`	`+ // can happen when run is cancelled and two processes are updating the run in parallel`
	`109`	`+ // not worth to ensure consistency for this case, using synchronized will not be enough`
	`110`	`+ total = totalNumberOfTests;`
	`111`	`+ }`
	`112`	`+ return total;`
`107`	`113`	`}`
`108`	`114`
`109`	`115`	`public String getReporterId() {`