extend model with currentTestNumber to handle progress status

PhilippSalvisberg · PhilippSalvisberg · commit 824e8564dc6c · 2019-06-29T14:34:41.000+02:00
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.xtend b/sqldev/src/main/java/org/utplsql/sqldev/model/runner/Run.xtend
@@ -25,6 +25,7 @@ class Run extends AbstractModel {
 	String reporterId
 	String connectionName
 	List<String> pathList
+	Integer currentTestNumber
 	Integer totalNumberOfTests
 	String startTime
 	String endTime
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/runner/UtplsqlRunner.xtend b/sqldev/src/main/java/org/utplsql/sqldev/runner/UtplsqlRunner.xtend
@@ -110,6 +110,7 @@ class UtplsqlRunner implements RealtimeReporterEventConsumer {
 		run.counter.warning = 0
 		run.infoCount = 0
 		run.totalNumberOfTests = -1
+		run.currentTestNumber = 0
 		run.status = UtplsqlResources.getString("RUNNER_INITIALIZING_TEXT")
 		panel.model = run
 		panel.update(reporterId)
@@ -148,6 +149,7 @@ class UtplsqlRunner implements RealtimeReporterEventConsumer {
 			test.startTime = sysdate
 		}
 		run.status = event.id
+		run.currentTestNumber = event.testNumber
 		panel.update(reporterId)
 	}
 
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/RunnerPanel.xtend b/sqldev/src/main/java/org/utplsql/sqldev/ui/runner/RunnerPanel.xtend
@@ -334,7 +334,7 @@ class RunnerPanel implements ActionListener, MouseListener, HyperlinkListener {
 
 	def synchronized update(String reporterId) {
 		setCurrentRun(runs.get(reporterId))
-		val row = currentRun.totalNumberOfCompletedTests - 1
+		val row = currentRun.currentTestNumber - 1
 		val header = testOverviewTableModel.testIdColumnName
 		val idColumn = testOverviewTable.columnModel.getColumn(3)
 		if (idColumn.headerValue != header) {
diff --git a/sqldev/src/test/java/org/utplsql/sqldev/test/runner/UtplsqlRunnerPanelTest.xtend b/sqldev/src/test/java/org/utplsql/sqldev/test/runner/UtplsqlRunnerPanelTest.xtend
@@ -39,6 +39,7 @@ class UtplsqlRunnerPanelTest {
 		run.counter.error = 0
 		run.counter.warning = 0
 		run.totalNumberOfTests = 5
+		run.currentTestNumber = 0
 	}
 	
 	@Test 

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ class UtplsqlRunner implements RealtimeReporterEventConsumer {`
`110`	`110`	`run.counter.warning = 0`
`111`	`111`	`run.infoCount = 0`
`112`	`112`	`run.totalNumberOfTests = -1`
	`113`	`+ run.currentTestNumber = 0`
`113`	`114`	`run.status = UtplsqlResources.getString("RUNNER_INITIALIZING_TEXT")`
`114`	`115`	`panel.model = run`
`115`	`116`	`panel.update(reporterId)`
`@@ -148,6 +149,7 @@ class UtplsqlRunner implements RealtimeReporterEventConsumer {`
`148`	`149`	`test.startTime = sysdate`
`149`	`150`	`}`
`150`	`151`	`run.status = event.id`
	`152`	`+ run.currentTestNumber = event.testNumber`
`151`	`153`	`panel.update(reporterId)`
`152`	`154`	`}`
`153`	`155`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ class UtplsqlRunnerPanelTest {`
`39`	`39`	`run.counter.error = 0`
`40`	`40`	`run.counter.warning = 0`
`41`	`41`	`run.totalNumberOfTests = 5`
	`42`	`+ run.currentTestNumber = 0`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`@Test`