Add titlePath to test result JSON files

composer.json

@@ -30,7 +30,7 @@
   },
   "require": {
     "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
-    "allure-framework/allure-php-commons": "^2.0",
+    "allure-framework/allure-php-commons": "^2.4",
     "phpunit/phpunit": "^10.0.5 || ^11 || ^12.0.1 || ^13"
   },
   "require-dev": {

src/Event/TestConsideredRiskySubscriber.php

@@ -21,14 +21,13 @@ public function __construct(
     public function notify(ConsideredRisky $event): void
     {
         $test = $event->test();
-        $method = $test instanceof TestMethod ? $test->nameWithClass() : null;
-        if (!isset($method)) {
+        if (!$test instanceof TestMethod) {
             return;
         }
 
         $this
             ->testLifecycle
-            ->switchTo($method)
+            ->switchTo($test)
             ->updateStatus($event->message(), Status::failed());
     }
 }

src/Event/TestErroredSubscriber.php

@@ -21,14 +21,13 @@ public function __construct(
     public function notify(Errored $event): void
     {
         $test = $event->test();
-        $method = $test instanceof TestMethod ? $test->nameWithClass() : null;
-        if (!isset($method)) {
+        if (!$test instanceof TestMethod) {
             return;
         }
 
         $this
             ->testLifecycle
-            ->switchTo($method)
+            ->switchTo($test)
             ->updateDetectedStatus($event->throwable()->message(), Status::broken());
     }
 }

src/Event/TestFailedSubscriber.php

@@ -21,14 +21,13 @@ public function __construct(
     public function notify(Failed $event): void
     {
         $test = $event->test();
-        $method = $test instanceof TestMethod ? $test->nameWithClass() : null;
-        if (!isset($method)) {
+        if (!$test instanceof TestMethod) {
             return;
         }
 
         $this
             ->testLifecycle
-            ->switchTo($method)
+            ->switchTo($test)
             ->updateDetectedStatus($event->throwable()->message(), Status::failed(), Status::failed());
     }
 }

src/Event/TestFinishedSubscriber.php

@@ -20,14 +20,13 @@ public function __construct(
     public function notify(Finished $event): void
     {
         $test = $event->test();
-        $method = $test instanceof TestMethod ? $test->nameWithClass() : null;
-        if (!isset($method)) {
+        if (!$test instanceof TestMethod) {
             return;
         }
 
         $this
             ->testLifecycle
-            ->switchTo($method)
+            ->switchTo($test)
             ->stop()
             ->updateRunInfo()
             ->write();

src/Event/TestMarkedIncompleteSubscriber.php

@@ -21,14 +21,13 @@ public function __construct(
     public function notify(MarkedIncomplete $event): void
     {
         $test = $event->test();
-        $method = $test instanceof TestMethod ? $test->nameWithClass() : null;
-        if (!isset($method)) {
+        if (!$test instanceof TestMethod) {
             return;
         }
 
         $this
             ->testLifecycle
-            ->switchTo($method)
+            ->switchTo($test)
             ->updateStatus($event->throwable()->message(), Status::broken());
     }
 }

src/Event/TestPassedSubscriber.php

@@ -21,14 +21,13 @@ public function __construct(
     public function notify(Passed $event): void
     {
         $test = $event->test();
-        $method = $test instanceof TestMethod ? $test->nameWithClass() : null;
-        if (!isset($method)) {
+        if (!$test instanceof TestMethod) {
             return;
         }
 
         $this
             ->testLifecycle
-            ->switchTo($method)
+            ->switchTo($test)
             ->updateStatus(status: Status::passed());
     }
 }

src/Event/TestPreparationStartedSubscriber.php

@@ -20,14 +20,13 @@ public function __construct(
     public function notify(PreparationStarted $event): void
     {
         $test = $event->test();
-        $method = $test instanceof TestMethod ? $test->nameWithClass() : null;
-        if (!isset($method)) {
+        if (!$test instanceof TestMethod) {
             return;
         }
 
         $this
             ->testLifecycle
-            ->switchTo($method)
+            ->switchTo($test)
             ->reset()
             ->create();
     }

src/Event/TestPreparedSubscriber.php

@@ -20,14 +20,13 @@ public function __construct(
     public function notify(Prepared $event): void
     {
         $test = $event->test();
-        $method = $test instanceof TestMethod ? $test->nameWithClass() : null;
-        if (!isset($method)) {
+        if (!$test instanceof TestMethod) {
             return;
         }
 
         $this
             ->testLifecycle
-            ->switchTo($method)
+            ->switchTo($test)
             ->updateInfo()
             ->start();
     }

src/Event/TestSkippedSubscriber.php

@@ -21,14 +21,13 @@ public function __construct(
     public function notify(Skipped $event): void
     {
         $test = $event->test();
-        $method = $test instanceof TestMethod ? $test->nameWithClass() : null;
-        if (!isset($method)) {
+        if (!$test instanceof TestMethod) {
             return;
         }
 
         $this
             ->testLifecycle
-            ->switchTo($method)
+            ->switchTo($test)
             ->updateStatus($event->message(), Status::skipped());
     }
 }

src/Event/TestWarningTriggeredSubscriber.php

@@ -21,14 +21,13 @@ public function __construct(
     public function notify(WarningTriggered $event): void
     {
         $test = $event->test();
-        $method = $test instanceof TestMethod ? $test : null;
-        if (!isset($method)) {
+        if (!$test instanceof TestMethod) {
             return;
         }
 
         $this
             ->testLifecycle
-            ->switchTo($method->nameWithClass())
+            ->switchTo($test)
             ->updateStatus($event->message(), Status::broken());
     }
 }

src/Internal/TestInfo.php

@@ -4,6 +4,10 @@
 
 namespace Qameta\Allure\PHPUnit\Internal;
 
+use function array_filter;
+use function explode;
+use function is_string;
+
 /**
  * @internal
  */
@@ -57,6 +61,16 @@ public function getFullName(): ?string
             : null;
     }
 
+    /**
+     * @return array<string>
+     */
+    public function getTitlePath(): array
+    {
+        return is_string($this->class)
+            ? [...array_filter(explode("\\", $this->class))]
+            : [];
+    }
+
     public function getName(): string
     {
         return $this->getFullName() ?? $this->getTest();

src/Internal/TestLifecycle.php

@@ -4,6 +4,7 @@
 
 namespace Qameta\Allure\PHPUnit\Internal;
 
+use PHPUnit\Event\Code\TestMethod;
 use Qameta\Allure\AllureLifecycleInterface;
 use Qameta\Allure\Model\ResultFactoryInterface;
 use Qameta\Allure\Model\Status;
@@ -16,6 +17,7 @@
 use function array_pad;
 use function class_exists;
 use function explode;
+use function is_int;
 use function preg_match;
 
 /**
@@ -146,7 +148,7 @@ public function updateDetectedStatus(
     }
 
     #[\Override]
-    public function switchTo(string $test): self
+    public function switchTo(TestMethod $test): self
     {
         $thread = $this->threadDetector->getThread();
         $this->lifecycle->switchThread($thread);
@@ -173,42 +175,22 @@ private function getCurrentTest(): TestInfo
         return $this->currentTest ?? throw new RuntimeException("Current test is not set");
     }
 
-    private function buildTestInfo(string $test, ?string $host = null, ?string $thread = null): TestInfo
+    private function buildTestInfo(TestMethod $test, ?string $host = null, ?string $thread = null): TestInfo
     {
-        /** @var list<string> $matches */
-        $classAndMethodMatchResult = preg_match(
-            '#^(\S+)(.*)$#',
-            $test,
-            $matches,
-        );
-        [$classAndMethod, $dataSetInfo] = 1 === $classAndMethodMatchResult
-            ? [$matches[1] ?? null, $matches[2] ?? null]
-            : [$test, null];
-        $dataLabelMatchResult = isset($dataSetInfo)
-            ? preg_match(
-                '/^\s+with\s+data\s+set\s+(?:(#\d+)|"(.*)")$/',
-                $dataSetInfo,
-                $matches,
-            )
-            : false;
-        $dataLabel = 1 === $dataLabelMatchResult
-            ? $matches[2] ?? $matches[1] ?? null
-            : null;
-        if ('' === $dataLabel) {
-            $dataLabel = null;
-        }
+        $className = $test->className();
+        $methodName = $test->methodName();
 
-        /** @psalm-suppress PossiblyUndefinedArrayOffset */
-        [$class, $method] = isset($classAndMethod)
-            ? array_pad(explode('::', $classAndMethod, 2), 2, null)
-            : [null, null];
+        $testData = $test->testData();
+        $dataSetName = $testData->hasDataFromDataProvider()
+            ? $testData->dataFromDataProvider()->dataSetName()
+            : null;
 
         /** @psalm-suppress MixedArgument */
         return new TestInfo(
-            test: $test,
-            class: isset($class) && class_exists($class) ? $class : null,
-            method: $method,
-            dataLabel: $dataLabel,
+            test: $test->nameWithClass(),
+            class: class_exists($className) ? $className : null,
+            method: $methodName,
+            dataLabel: is_int($dataSetName) ? "#" . $dataSetName : $dataSetName,
             host: $host,
             thread: $thread,
         );

src/Internal/TestLifecycleInterface.php

@@ -4,6 +4,7 @@
 
 namespace Qameta\Allure\PHPUnit\Internal;
 
+use PHPUnit\Event\Code\TestMethod;
 use Qameta\Allure\Model\Status;
 
 interface TestLifecycleInterface
@@ -28,7 +29,7 @@ public function updateDetectedStatus(
         ?Status $overrideStatus = null,
     ): TestLifecycleInterface;
 
-    public function switchTo(string $test): TestLifecycleInterface;
+    public function switchTo(TestMethod $test): TestLifecycleInterface;
 
     public function reset(): TestLifecycleInterface;
 }

src/Internal/TestUpdater.php

@@ -38,6 +38,7 @@ public function setInfo(TestResult $testResult, TestInfo $info): void
         $testResult
             ->setName($parser->getDisplayName() ?? $info->getName())
             ->setFullName($info->getFullName())
+            ->setTitlePath(...$info->getTitlePath())
             ->setDescriptionHtml($parser->getDescriptionHtml())
             ->setDescription($parser->getDescription())
             ->addLabels(

test/unit/Event/TestConsideredRiskySubscriberTest.php

@@ -34,16 +34,14 @@ public function testNotify_ValidTestMethod_UpdatesStatusAsFailedForSwitchedConte
     {
         $testLifecycle = $this->createMock(TestLifecycleInterface::class);
         $subscriber = new TestConsideredRiskySubscriber($testLifecycle);
-        $event = $this->createTestConsideredRiskyEvent(
-            test: $this->createTestMethod(class: 'a', methodName: 'b'),
-            message: 'c',
-        );
+        $test = $this->createTestMethod(class: 'a', methodName: 'b');
+        $event = $this->createTestConsideredRiskyEvent($test, 'c');
 
         $switched = false;
         $testLifecycle
             ->expects(self::once())
             ->method('switchTo')
-            ->with(self::identicalTo('a::b'))
+            ->with(self::identicalTo($test))
             ->willReturnCallback(
                 function () use (&$switched, $testLifecycle) {
                     $switched = true;

test/unit/Event/TestErroredSubscriberTest.php

@@ -34,16 +34,14 @@ public function testNotify_ValidTestMethod_UpdatesDetectedStatusAsBrokenForSwitc
     {
         $testLifecycle = $this->createMock(TestLifecycleInterface::class);
         $subscriber = new TestErroredSubscriber($testLifecycle);
-        $event = $this->createTestErroredEvent(
-            test: $this->createTestMethod(class: 'a', methodName: 'b'),
-            message: 'c',
-        );
+        $test = $this->createTestMethod(class: 'a', methodName: 'b');
+        $event = $this->createTestErroredEvent($test, 'c');
 
         $switched = false;
         $testLifecycle
             ->expects(self::once())
             ->method('switchTo')
-            ->with(self::identicalTo('a::b'))
+            ->with(self::identicalTo($test))
             ->willReturnCallback(
                 function () use (&$switched, $testLifecycle) {
                     $switched = true;

test/unit/Event/TestFailedSubscriberTest.php

@@ -34,16 +34,14 @@ public function testNotify_ValidTestMethod_UpdatesDetectedStatusAsFailedForSwitc
     {
         $testLifecycle = $this->createMock(TestLifecycleInterface::class);
         $subscriber = new TestFailedSubscriber($testLifecycle);
-        $event = $this->createTestFailedEvent(
-            test: $this->createTestMethod(class: 'a', methodName: 'b'),
-            message: 'c',
-        );
+        $test = $this->createTestMethod(class: 'a', methodName: 'b');
+        $event = $this->createTestFailedEvent($test, 'c');
 
         $switched = false;
         $testLifecycle
             ->expects(self::once())
             ->method('switchTo')
-            ->with(self::identicalTo('a::b'))
+            ->with(self::identicalTo($test))
             ->willReturnCallback(
                 function () use (&$switched, $testLifecycle) {
                     $switched = true;

test/unit/Event/TestFinishedSubscriberTest.php

@@ -33,15 +33,14 @@ public function testNotify_ValidTestMethod_WritesUpdatedStoppedTestAfterSwitchin
     {
         $testLifecycle = $this->createMock(TestLifecycleInterface::class);
         $subscriber = new TestFinishedSubscriber($testLifecycle);
-        $event = $this->createTestFinishedEvent(
-            $this->createTestMethod(class: 'a', methodName: 'b'),
-        );
+        $test = $this->createTestMethod(class: 'a', methodName: 'b');
+        $event = $this->createTestFinishedEvent($test);
 
         $lastMethod = null;
         $testLifecycle
             ->expects(self::once())
             ->method('switchTo')
-            ->with(self::identicalTo('a::b'))
+            ->with(self::identicalTo($test))
             ->willReturnCallback(
                 function () use (&$lastMethod, $testLifecycle) {
                     $lastMethod = "switchTo";