Update package test suite

Author: nyamsprod

composer.json

@@ -69,12 +69,8 @@
             "package": {
                 "name": "httpwg/structured-field-tests",
                 "version": "dev-main",
-                "dist": {
-                    "url": "https://github.com/httpwg/structured-field-tests/archive/main.zip",
-                    "type": "zip"
-                },
                 "source": {
-                    "url": "git@github.com:httpwg/structured-field-tests.git",
+                    "url": "https://github.com/httpwg/structured-field-tests.git",
                     "type": "git",
                     "reference": "main"
                 }

src/StructuredFieldTest.php

@@ -22,7 +22,7 @@ public function it_can_pass_http_wg_tests(TestUnit $test): void
             $this->expectException(SyntaxError::class);
         }
 
-        $structuredField = TestHeaderType::from($test->headerType)->newStructuredField(implode(',', $test->raw));
+        $structuredField = TestFieldType::from($test->type)->newStructuredField(implode(',', $test->raw));
 
         if (!$test->mustFail) {
             self::assertSame(implode(',', $test->canonical), $structuredField->toHttpValue());

src/TestHeaderType.php renamed to src/TestFieldType.php

@@ -4,7 +4,7 @@
 
 namespace Bakame\Http\StructuredFields;
 
-enum TestHeaderType: string
+enum TestFieldType: string
 {
     case Dictionary = 'dictionary';
     case List = 'list';

src/TestSuite.php

@@ -8,6 +8,7 @@
 use IteratorAggregate;
 use JsonException;
 use RuntimeException;
+use function basename;
 use function fclose;
 use function fopen;
 use function is_resource;
@@ -19,15 +20,10 @@
  */
 final class TestSuite implements IteratorAggregate
 {
-    /** @var array<string, TestUnit> */
-    private array $elements;
-
-    public function __construct(TestUnit ...$elements)
-    {
-        $this->elements = [];
-        foreach ($elements as $element) {
-            $this->add($element);
-        }
+    private function __construct(
+        /** @var array<string, TestUnit> */
+        private array $elements = []
+    ) {
     }
 
     public function add(TestUnit $test): void
@@ -72,7 +68,7 @@ public static function fromPath(string $path, $context = null): self
         $records = json_decode($content, true, 512, JSON_THROW_ON_ERROR);
         $suite = new self();
         foreach ($records as $offset => $record) {
-            $record['name'] = '#'.($offset + 1).': '.$record['name'];
+            $record['name'] = basename($path).' #'.($offset + 1).': '.$record['name'];
             $suite->add(TestUnit::fromDecoded($record));
         }
 

src/TestUnit.php

@@ -4,14 +4,11 @@
 
 namespace Bakame\Http\StructuredFields;
 
-use JsonException;
-use function json_decode;
-
 final class TestUnit
 {
     public function __construct(
         public readonly string $name,
-        public readonly string $headerType,
+        public readonly string $type,
         /** @var array<string> */
         public readonly array $raw,
         /** @var array<string> */
@@ -21,24 +18,6 @@ public function __construct(
     ) {
     }
 
-    /**
-     * @throws JsonException
-     */
-    public static function fromJsonString(string $jsonTest): self
-    {
-        /** @var array{
-         *     name:string,
-         *     header_type: string,
-         *     raw: array<string>,
-         *     canonical?: array<string>,
-         *     must_fail?: bool,
-         *     can_fail?: bool
-         * } $data */
-        $data = json_decode($jsonTest, true, 512, JSON_THROW_ON_ERROR);
-
-        return self::fromDecoded($data);
-    }
-
     /**
      * @param array{
      *     name:string,
@@ -51,7 +30,7 @@ public static function fromJsonString(string $jsonTest): self
      */
     public static function fromDecoded(array $data): self
     {
-        $data += ['must_fail' => false, 'can_fail' => false, 'canonical' => $data['raw']];
+        $data += ['canonical' => $data['raw'], 'must_fail' => false, 'can_fail' => false];
 
         return new self(
             $data['name'],