fix(allure-scalatest): fix missing test results in case of test parallel execution (fixes #945, via #946)

Author: dm-test

allure-scalatest/src/main/scala/io/qameta/allure/scalatest/AllureScalatest.scala

@@ -16,7 +16,7 @@
 package io.qameta.allure.scalatest
 
 import java.lang.annotation.Annotation
-import java.util.UUID
+import java.util.{Objects, UUID}
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.locks.ReentrantReadWriteLock
 
@@ -162,7 +162,7 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
       event.suiteClassName,
       event.location,
       event.testName,
-      None
+      Some(event.threadName)
     )
     stopTest(
       None,
@@ -180,7 +180,7 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
     val uuid = UUID.randomUUID().toString
     var labels = mutable.ListBuffer(
       createSuiteLabel(suiteName),
-      createThreadLabel(),
+      createLabel(THREAD_LABEL_NAME, getScalaTestThreadName(threadId)),
       createHostLabel(),
       createLanguageLabel("scala"),
       createFrameworkLabel("scalatest")
@@ -227,15 +227,21 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
   private def stopTest(status: Option[Status],
                        statusDetails: Option[StatusDetails],
                        threadName: Option[String]): Unit = {
-    threadName.fold {} { thread => AllureScalatestContextHolder.remove(thread) }
-    lifecycle.getCurrentTestCase.ifPresent(uuid => {
-      lifecycle.updateTestCase(uuid, (result: TestResult) => {
-        status.fold {} { st => result.setStatus(st) }
-        statusDetails.fold {} { details => result.setStatusDetails(details) }
-      }: Unit)
-      lifecycle.stopTestCase(uuid)
-      lifecycle.writeTestCase(uuid)
-    })
+    threadName.fold {} {
+      thread => {
+        AllureScalatestContextHolder.get(thread).fold {} {
+          uuid => {
+            lifecycle.updateTestCase(uuid, (result: TestResult) => {
+              status.fold {} { st => result.setStatus(st) }
+              statusDetails.fold {} { details => result.setStatusDetails(details) }
+            }: Unit)
+            lifecycle.stopTestCase(uuid)
+            lifecycle.writeTestCase(uuid)
+          }
+            AllureScalatestContextHolder.remove(thread)
+        }
+      }
+    }
   }
 
   private def getAnnotations(location: Option[Location]): List[Annotation] = location match {
@@ -273,4 +279,11 @@ class AllureScalatest(val lifecycle: AllureLifecycle) extends Reporter {
     }
   }
 
+  private def getScalaTestThreadName(threadId: Option[String]): String = {
+    val fromProperty = System.getProperty(ALLURE_THREAD_NAME_SYSPROP)
+    val fromEnv = System.getenv(ALLURE_THREAD_NAME_ENV)
+    val realThreadName = threadId.getOrElse {getThreadName}
+    Seq(fromProperty, fromEnv).find(el => Objects.nonNull(el)).getOrElse {realThreadName}
+  }
+
 }