use new update interface, passing reporterId

PhilippSalvisberg · PhilippSalvisberg · commit dc2bfb16cb69 · 2019-06-10T10:22:48.000+02:00
this allows to run mulitple utPLSQL tests in parallel
diff --git a/sqldev/src/main/java/org/utplsql/sqldev/runner/UtplsqlRunner.xtend b/sqldev/src/main/java/org/utplsql/sqldev/runner/UtplsqlRunner.xtend
@@ -92,20 +92,25 @@ class UtplsqlRunner implements RealtimeReporterEventConsumer {
       
 	}
 	
-	private def dispatch doProcess(PreRunEvent event) {
+	private def initRun() {
 		run = new Run(reporterId, connectionName)
 		run.startTime = sysdate
 		run.counter.disabled = 0
 		run.counter.success = 0
 		run.counter.failure = 0
 		run.counter.error = 0
 		run.counter.warning = 0
+		run.totalNumberOfTests = -1
+		run.status = UtplsqlResources.getString("RUNNER_INITIALIZING_TEXT")
+		panel.model = run
+		panel.update(reporterId)
+	}
+	
+	private def dispatch doProcess(PreRunEvent event) {
 		run.totalNumberOfTests = event.totalNumberOfTests
 		run.put(event.items)
-		panel.model = run
-		panel.status = UtplsqlResources.getString("RUNNER_INITIALIZING_TEXT")
-		panel.updateCounter
-		
+		run.status = UtplsqlResources.getString("RUNNER_RUNNING_TEXT")
+		panel.update(reporterId)	
 	}
 
 	private def dispatch doProcess(PostRunEvent event) {
@@ -115,8 +120,8 @@ class UtplsqlRunner implements RealtimeReporterEventConsumer {
 		run.counter = event.counter
 		run.errorStack = event.errorStack
 		run.serverOutput = event.serverOutput
-		panel.status = String.format(UtplsqlResources.getString("RUNNER_FINNISHED_TEXT"), event.executionTime)
-		panel.updateCounter
+		run.status = String.format(UtplsqlResources.getString("RUNNER_FINNISHED_TEXT"), event.executionTime)
+		panel.update(reporterId)
 	}
 	
 	private def dispatch doProcess(PreSuiteEvent event) {
@@ -134,8 +139,8 @@ class UtplsqlRunner implements RealtimeReporterEventConsumer {
 		} else {
 			test.startTime = sysdate
 		}
-		panel.status = '''«event.id»'''
-		panel.updateCounter
+		run.status = event.id
+		panel.update(reporterId)
 	}
 
 	private def dispatch doProcess(PostTestEvent event) {
@@ -155,7 +160,7 @@ class UtplsqlRunner implements RealtimeReporterEventConsumer {
 		run.counter.failure = run.counter.failure + event.counter.failure
 		run.counter.error = run.counter.error + event.counter.error
 		run.counter.warning = run.counter.warning + event.counter.warning
-		panel.updateCounter
+		panel.update(reporterId)
 	}
 
 	private def void produce() {
@@ -183,18 +188,23 @@ class UtplsqlRunner implements RealtimeReporterEventConsumer {
 	def runTestAsync() {
 		// show dockable
 		val dockable = RunnerFactory.dockable as RunnerView
-		RunnerFactory.showDockable;
-		panel = dockable?.runnerPanel
-		// the producer
-		val Runnable producer = [|produce]
-		producerThread = new Thread(producer)
-		producerThread.name = "realtime producer"
-		producerThread.start
-		// the consumer
-		val Runnable consumer = [|consume]
-		consumerThread = new Thread(consumer)
-		consumerThread.name = "realtime consumer"
-		consumerThread.start
+		if (dockable === null) {
+			logger.severe('''Error getting utPLSQL dockable. Cannot run utPLSQL test.''')
+		} else {
+			RunnerFactory.showDockable;
+			panel = dockable.runnerPanel
+			initRun
+			// the producer
+			val Runnable producer = [|produce]
+			producerThread = new Thread(producer)
+			producerThread.name = "realtime producer"
+			producerThread.start
+			// the consumer
+			val Runnable consumer = [|consume]
+			consumerThread = new Thread(consumer)
+			consumerThread.name = "realtime consumer"
+			consumerThread.start
+		}
 	}
 	
 	def getProducerThread() {
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
@@ -60,34 +60,35 @@ class UtplsqlRunnerPanelTest {
 			}
 		});
 
-		panel.status = "starting"
-		panel.updateCounter
+		run.status="starting"
+		panel.update(run.reporterId)
 		Thread.sleep(3000);
 
 		run.counter.success = run.counter.success + 1
-		panel.status = "utplsql.test.a"
-		panel.updateCounter
+		run.status="utplsql.test.a"
+		panel.update(run.reporterId)
 		Thread.sleep(500);
 
 		run.counter.success = run.counter.success + 1
-		panel.status = "utplsql.test.b"
-		panel.updateCounter
+		run.status="utplsql.test.b"
+		panel.update(run.reporterId)
 		Thread.sleep(500);
 
 		run.counter.success = run.counter.success + 1
-		panel.status = "utplsql.test.c"
-		panel.updateCounter
+		run.status="utplsql.test.c"
+		panel.update(run.reporterId)
 		Thread.sleep(500);
 
 		run.counter.failure = run.counter.failure + 1
-		panel.status = "utplsql.test.d"
-		panel.updateCounter
+		run.status="utplsql.test.d"
+		panel.update(run.reporterId)
 		Thread.sleep(500);
 		
 		run.counter.success = run.counter.success + 1
+		run.status="utplsql.test.e"
 		val end = System.currentTimeMillis
-		panel.status = String.format(UtplsqlResources.getString("RUNNER_FINNISHED_TEXT"), new Double(end-start)/1000)
-		panel.updateCounter
+		run.status = String.format(UtplsqlResources.getString("RUNNER_FINNISHED_TEXT"), new Double(end-start)/1000)
+		panel.update(run.reporterId)
 		Thread.sleep(2000);
 		frame.dispose
 	}
