From 387497c774b68f5598a54da32da0c0a4a850617d Mon Sep 17 00:00:00 2001
From: Edward Surov <zoohie@gmail.com>
Date: Thu, 25 May 2023 17:14:22 +0300
Subject: [PATCH] labels are exposed in reverse order (fixes #34, via #57)

---
 composer.json                          |   6 +-
 phpunit.xml.dist                       |   3 +-
 src/Attribute/AttributeParser.php      |   3 +-
 src/Model/ModelProviderChain.php       |  11 +-
 test/AllureLifecycleTest.php           |  58 +++++--
 test/Attribute/AttributeParserTest.php | 211 +++++++++++++++++++++++++
 test/Model/ModelProviderChainTest.php  |   4 +-
 test/Model/TemporaryTest.php           |   3 +
 8 files changed, 276 insertions(+), 23 deletions(-)
 create mode 100644 test/Attribute/AttributeParserTest.php

diff --git a/composer.json b/composer.json
index c9c9e6e..5f45476 100644
--- a/composer.json
+++ b/composer.json
@@ -35,10 +35,10 @@
   },
   "require-dev": {
     "jetbrains/phpstorm-attributes": "^1",
-    "phpunit/phpunit": "^9.5.10",
+    "phpunit/phpunit": "^9.6.8",
     "psalm/plugin-phpunit": "^0.18.4",
-    "squizlabs/php_codesniffer": "^3.7.1",
-    "vimeo/psalm": "^5.4"
+    "squizlabs/php_codesniffer": "^3.7.2",
+    "vimeo/psalm": "^5.12"
   },
   "autoload": {
     "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index c91d200..e094557 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
         colors="true"
+        forceCoversAnnotation="true"
         defaultTestSuite="unit">
     <testsuites>
         <testsuite name="unit">
diff --git a/src/Attribute/AttributeParser.php b/src/Attribute/AttributeParser.php
index ae590cb..215ce6d 100644
--- a/src/Attribute/AttributeParser.php
+++ b/src/Attribute/AttributeParser.php
@@ -18,6 +18,7 @@
 use ReflectionProperty;
 
 use function array_merge;
+use function array_reverse;
 use function is_string;
 
 final class AttributeParser implements ModelProviderInterface
@@ -161,7 +162,7 @@ private function createLabel(LabelInterface $label): Model\Label
      */
     public function getLabels(): array
     {
-        return $this->labels;
+        return array_reverse($this->labels);
     }
 
     private function createParameter(ParameterInterface $parameter): Model\Parameter
diff --git a/src/Model/ModelProviderChain.php b/src/Model/ModelProviderChain.php
index cee154c..9599813 100644
--- a/src/Model/ModelProviderChain.php
+++ b/src/Model/ModelProviderChain.php
@@ -6,6 +6,7 @@
 
 use function array_map;
 use function array_merge;
+use function array_reverse;
 use function array_values;
 
 final class ModelProviderChain implements ModelProviderInterface
@@ -40,10 +41,12 @@ public function getLinks(): array
     public function getLabels(): array
     {
         return array_merge(
-            ...array_map(
-                /** @psalm-return list<Label> */
-                fn (ModelProviderInterface $p): array => $p->getLabels(),
-                $this->providers,
+            ...array_reverse(
+                array_map(
+                    /** @psalm-return list<Label> */
+                    fn (ModelProviderInterface $p): array => $p->getLabels(),
+                    $this->providers,
+                ),
             ),
         );
     }
diff --git a/test/AllureLifecycleTest.php b/test/AllureLifecycleTest.php
index ca8a288..0c8dd80 100644
--- a/test/AllureLifecycleTest.php
+++ b/test/AllureLifecycleTest.php
@@ -868,24 +868,47 @@ public function testWriteContainer_ExcludedContainerWithNestedResults_RemovesNes
         );
 
         $container->setExcluded(true);
+        $removeAttachmentResults = [];
         $resultsWriter
             ->expects(self::exactly(6))
             ->method('removeAttachment')
-            ->withConsecutive(
-                [self::identicalTo($setUpAttachment)],
-                [self::identicalTo($setUpStepAttachment)],
-                [self::identicalTo($testAttachment)],
-                [self::identicalTo($testStepAttachment)],
-                [self::identicalTo($tearDownAttachment)],
-                [self::identicalTo($tearDownStepAttachment)],
+            ->with(
+                self::callback(
+                    function (AttachmentResult $attachmentResult) use (&$removeAttachmentResults): bool {
+                        /** @psalm-var list<AttachmentResult> $removeAttachmentResults */
+                        $removeAttachmentResults[] = $attachmentResult;
+
+                        return true;
+                    },
+                ),
             );
+        $removeTestResults = [];
         $resultsWriter
             ->expects(self::exactly(1))
             ->method('removeTest')
-            ->withConsecutive(
-                [self::identicalTo($test)],
+            ->with(
+                self::callback(
+                    function (TestResult $testResult) use (&$removeTestResults): bool {
+                        /** @psalm-var list<TestResult> $removeTestResults */
+                        $removeTestResults[] = $testResult;
+
+                        return true;
+                    },
+                ),
             );
         $lifecycle->writeContainer('a');
+        self::assertSame(
+            [
+                $setUpAttachment,
+                $setUpStepAttachment,
+                $testAttachment,
+                $testStepAttachment,
+                $tearDownAttachment,
+                $tearDownStepAttachment,
+            ],
+            $removeAttachmentResults,
+        );
+        self::assertSame([$test], $removeTestResults);
     }
 
     public function testWriteContainer_WriterFailsToRemoveExcludedTest_LogsError(): void
@@ -2722,14 +2745,25 @@ public function testWriteTest_ExcludedTestWithNestedResults_RemovesNestedResults
         );
 
         $test->setExcluded(true);
+        $removeAttachmentResults = [];
         $resultsWriter
             ->expects(self::exactly(2))
             ->method('removeAttachment')
-            ->withConsecutive(
-                [self::identicalTo($testAttachment)],
-                [self::identicalTo($testStepAttachment)],
+            ->with(
+                self::callback(
+                    function (AttachmentResult $attachmentResult) use (&$removeAttachmentResults): bool {
+                        /** @psalm-var list<AttachmentResult> $removeAttachmentResults */
+                        $removeAttachmentResults[] = $attachmentResult;
+
+                        return true;
+                    },
+                ),
             );
         $lifecycle->writeTest('a');
+        self::assertSame(
+            [$testAttachment, $testStepAttachment],
+            $removeAttachmentResults,
+        );
     }
 
     public function testWriteTest_WriterFailsToRemoveAttachment_LogsError(): void
diff --git a/test/Attribute/AttributeParserTest.php b/test/Attribute/AttributeParserTest.php
new file mode 100644
index 0000000..f28f7c9
--- /dev/null
+++ b/test/Attribute/AttributeParserTest.php
@@ -0,0 +1,211 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Qameta\Allure\Test\Attribute;
+
+use PHPUnit\Framework\TestCase;
+use Qameta\Allure\Attribute;
+use Qameta\Allure\Attribute\AttributeParser;
+use Qameta\Allure\Setup\LinkTemplateCollectionInterface;
+
+use function json_encode;
+
+/**
+ * @covers \Qameta\Allure\Attribute\AttributeParser
+ */
+class AttributeParserTest extends TestCase
+{
+    public function testGetLinks_ConstructedWithoutLinkAttributes_ReturnsEmptyList(): void
+    {
+        $parser = new AttributeParser(
+            attributes: [
+            ],
+            linkTemplates: $this->createStub(LinkTemplateCollectionInterface::class),
+        );
+
+        self::assertEmpty($parser->getLinks());
+    }
+
+    public function testGetLinks_ConstructedWithLinkAttributes_ReturnsMatchingLinkModels(): void
+    {
+        $parser = new AttributeParser(
+            attributes: [
+                new Attribute\Link('a', 'b', Attribute\Link::TMS),
+                new Attribute\Link('c', 'd', Attribute\Link::ISSUE),
+            ],
+            linkTemplates: $this->createStub(LinkTemplateCollectionInterface::class),
+        );
+
+        $expectedValue = <<<EOF
+[
+    {"name": "a", "url": "b", "type": "tms"},
+    {"name": "c", "url": "d", "type": "issue"}
+]
+EOF;
+        self::assertJsonStringEqualsJsonString(
+            $expectedValue,
+            json_encode($parser->getLinks()),
+        );
+    }
+
+    public function testGetLabels_ConstructedWithoutLabelAttributes_ReturnsEmptyList(): void
+    {
+        $parser = new AttributeParser(
+            attributes: [
+            ],
+            linkTemplates: $this->createStub(LinkTemplateCollectionInterface::class),
+        );
+
+        self::assertEmpty($parser->getLabels());
+    }
+
+    public function testGetLabels_ConstructedWithLabelAttributes_ReturnsMatchingLabelModelsInReverseOrder(): void
+    {
+        $parser = new AttributeParser(
+            attributes: [
+                new Attribute\Label('a', 'b'),
+                new Attribute\Label('c', 'd'),
+            ],
+            linkTemplates: $this->createStub(LinkTemplateCollectionInterface::class),
+        );
+
+        $expectedValue = <<<EOF
+[
+    {"name": "c", "value": "d"},
+    {"name": "a", "value": "b"}
+]
+EOF;
+        self::assertJsonStringEqualsJsonString(
+            $expectedValue,
+            json_encode($parser->getLabels()),
+        );
+    }
+
+    public function testGetParameters_ConstructedWithoutParameterAttributes_ReturnsEmptyList(): void
+    {
+        $parser = new AttributeParser(
+            attributes: [
+            ],
+            linkTemplates: $this->createStub(LinkTemplateCollectionInterface::class),
+        );
+
+        self::assertEmpty($parser->getParameters());
+    }
+
+    public function testGetParameters_ConstructedWithParameterAttributes_ReturnsMatchingParamsInReverseOrder(): void
+    {
+        $parser = new AttributeParser(
+            attributes: [
+                new Attribute\Parameter('a', 'b', mode: Attribute\ParameterMode::HIDDEN),
+                new Attribute\Parameter('c', 'd', excluded: true),
+            ],
+            linkTemplates: $this->createStub(LinkTemplateCollectionInterface::class),
+        );
+
+        $expectedValue = <<<EOF
+[
+    {"name": "a", "value": "b", "excluded": null, "mode": "hidden"},
+    {"name": "c", "value": "d", "excluded": true, "mode": null}
+]
+EOF;
+        self::assertJsonStringEqualsJsonString(
+            $expectedValue,
+            json_encode($parser->getParameters()),
+        );
+    }
+
+    public function testGetDisplayName_ConstructedWithoutDisplayNameAttribute_ReturnsNull(): void
+    {
+        $parser = new AttributeParser(
+            attributes: [
+            ],
+            linkTemplates: $this->createStub(LinkTemplateCollectionInterface::class),
+        );
+
+        self::assertNull($parser->getDisplayName());
+    }
+
+    public function testGetDisplayName_ConstructedWithDisplayNameAttribute_ReturnsMatchingValue(): void
+    {
+        $parser = new AttributeParser(
+            attributes: [
+                new Attribute\DisplayName('a'),
+            ],
+            linkTemplates: $this->createStub(LinkTemplateCollectionInterface::class),
+        );
+
+        self::assertSame('a', $parser->getDisplayName());
+    }
+
+
+    public function testGetDescription_ConstructedWithoutDescriptionAttribute_ReturnsNull(): void
+    {
+        $parser = new AttributeParser(
+            attributes: [
+            ],
+            linkTemplates: $this->createStub(LinkTemplateCollectionInterface::class),
+        );
+
+        self::assertNull($parser->getDescription());
+    }
+
+    public function testGetDescription_ConstructedWithDescriptionAttribute_ReturnsMatchingValue(): void
+    {
+        $parser = new AttributeParser(
+            attributes: [
+                new Attribute\Description('a'),
+            ],
+            linkTemplates: $this->createStub(LinkTemplateCollectionInterface::class),
+        );
+
+        self::assertSame('a', $parser->getDescription());
+    }
+
+    public function testGetDescription_ConstructedWithDescriptionHtmlAttribute_ReturnsNull(): void
+    {
+        $parser = new AttributeParser(
+            attributes: [
+                new Attribute\Description('a', isHtml: true),
+            ],
+            linkTemplates: $this->createStub(LinkTemplateCollectionInterface::class),
+        );
+
+        self::assertNull($parser->getDescription());
+    }
+
+    public function testGetDescriptionHtml_ConstructedWithoutDescriptionAttribute_ReturnsNull(): void
+    {
+        $parser = new AttributeParser(
+            attributes: [
+            ],
+            linkTemplates: $this->createStub(LinkTemplateCollectionInterface::class),
+        );
+
+        self::assertNull($parser->getDescriptionHtml());
+    }
+
+    public function testGetDescriptionHtml_ConstructedWithDescriptionHtmlAttribute_ReturnsMatchingValue(): void
+    {
+        $parser = new AttributeParser(
+            attributes: [
+                new Attribute\Description('a', isHtml: true),
+            ],
+            linkTemplates: $this->createStub(LinkTemplateCollectionInterface::class),
+        );
+
+        self::assertSame('a', $parser->getDescriptionHtml());
+    }
+
+    public function testGetDescriptionHtml_ConstructedWithDescriptionAttribute_ReturnsNull(): void
+    {
+        $parser = new AttributeParser(
+            attributes: [
+                new Attribute\Description('a', isHtml: false),
+            ],
+            linkTemplates: $this->createStub(LinkTemplateCollectionInterface::class),
+        );
+
+        self::assertNull($parser->getDescriptionHtml());
+    }
+}
diff --git a/test/Model/ModelProviderChainTest.php b/test/Model/ModelProviderChainTest.php
index 5cf9b0c..c0e1d81 100644
--- a/test/Model/ModelProviderChainTest.php
+++ b/test/Model/ModelProviderChainTest.php
@@ -96,7 +96,7 @@ public function testGetLabels_OnlyFirstProviderReturnsLabels_ReturnsSameLabels()
         self::assertSame([$labelA, $labelB], $chain->getLabels());
     }
 
-    public function testGetLabels_BothProvidersReturnLabels_ReturnsMergedLabels(): void
+    public function testGetLabels_BothProvidersReturnLabels_ReturnsMergedLabelsInReverseOrder(): void
     {
         $firstProvider = $this->createStub(ModelProviderInterface::class);
         $secondProvider = $this->createStub(ModelProviderInterface::class);
@@ -109,7 +109,7 @@ public function testGetLabels_BothProvidersReturnLabels_ReturnsMergedLabels(): v
             ->method('getLabels')
             ->willReturn([$labelB]);
         $chain = new ModelProviderChain($firstProvider, $secondProvider);
-        self::assertSame([$labelA, $labelB], $chain->getLabels());
+        self::assertSame([$labelB, $labelA], $chain->getLabels());
     }
 
     public function testGetParameters_ConstructedWithoutProviders_ReturnsEmptyList(): void
diff --git a/test/Model/TemporaryTest.php b/test/Model/TemporaryTest.php
index 8e793d0..326545c 100644
--- a/test/Model/TemporaryTest.php
+++ b/test/Model/TemporaryTest.php
@@ -21,6 +21,9 @@
 use RuntimeException;
 use Throwable;
 
+/**
+ * @coversNothing
+ */
 class TemporaryTest extends TestCase
 {
     public static function setUpBeforeClass(): void