Improve Loading test files

Author: nyamsprod

src/ByteSequenceTest.php

@@ -9,8 +9,8 @@
 final class ByteSequenceTest extends StructuredFieldTestCase
 {
     /** @var array<string> */
-    protected static array $paths = [
-        '/binary.json',
+    protected static array $httpWgTestFilenames = [
+        'binary.json',
     ];
 
     #[Test]

src/DictionaryTest.php

@@ -10,8 +10,8 @@
 final class DictionaryTest extends StructuredFieldTestCase
 {
     /** @var array<string> */
-    protected static array $paths = [
-        '/dictionary.json',
+    protected static array $httpWgTestFilenames = [
+        'dictionary.json',
     ];
 
     #[Test]

src/ItemTest.php

@@ -14,16 +14,16 @@
 final class ItemTest extends StructuredFieldTestCase
 {
     /** @var array<string> */
-    protected static array $paths = [
-        '/boolean.json',
-        '/number.json',
-        '/number-generated.json',
-        '/string.json',
-        '/string-generated.json',
-        '/token.json',
-        '/token-generated.json',
-        '/item.json',
-        '/date.json',
+    protected static array $httpWgTestFilenames = [
+        'boolean.json',
+        'number.json',
+        'number-generated.json',
+        'string.json',
+        'string-generated.json',
+        'token.json',
+        'token-generated.json',
+        'item.json',
+        'date.json',
     ];
 
     #[Test]
@@ -147,7 +147,7 @@ public function it_fails_to_instantiate_an_invalid_string(): void
     #[DataProvider('itemTypeProvider')]
     public function it_can_tell_the_item_type(Item $item, Type $expectedType): void
     {
-        self::assertSame($expectedType, $item->type());
+        self::assertTrue($item->type()->equals($expectedType));
     }
 
     /**
@@ -189,37 +189,34 @@ public function __toString(): string
                 }),
                 'expectedType' => Type::String,
             ],
-            'date' => [
+            'date-immutable' => [
                 'item' => Item::from(new DateTimeImmutable('2020-07-12 13:37:00')),
                 'expectedType' => Type::Date,
             ],
+            'date-interface' => [
+                'item' => Item::from(new DateTime('2020-07-12 13:37:00')),
+                'expectedType' => Type::Date,
+            ],
         ];
     }
 
     #[Test]
     public function test_in_can_be_instantiated_using_bare_items(): void
     {
-        $item1 = Item::from('/terms', [
+        $parameters = [
             'string' => '42',
             'integer' => 42,
             'float' => 4.2,
             'boolean' => true,
             'token' => Token::fromString('forty-two'),
             'byte-sequence' => ByteSequence::fromDecoded('a42'),
             'date' => new DateTimeImmutable('2020-12-01 11:43:17'),
-        ]);
-
-        $item2 = Item::from('/terms', new ArrayObject([
-            'string' => Item::from('42'),
-            'integer' => Item::from(42),
-            'float' => Item::from(4.2),
-            'boolean' => Item::from(true),
-            'token' => Item::from(Token::fromString('forty-two')),
-            'byte-sequence' => Item::from(ByteSequence::fromDecoded('a42')),
-            'date' => Item::from(new DateTimeImmutable('2020-12-01 11:43:17')),
-        ]));
-
-        self::assertEquals($item2, $item1);
+        ];
+
+        self::assertEquals(
+            Item::from('/terms', $parameters),
+            Item::from('/terms', new ArrayObject($parameters))
+        );
     }
 
     #[Test]
@@ -236,6 +233,7 @@ public function it_can_access_its_parameter_values(): void
         $instance = Item::fromHttpValue('1; a; b=?0');
 
         self::assertTrue($instance->parameters()->get('a')->value());
+        self::assertFalse($instance->parameters()->get('b')->value());
     }
 
     #[Test]

src/OuterListTest.php

@@ -10,9 +10,9 @@
 final class OuterListTest extends StructuredFieldTestCase
 {
     /** @var array<string> */
-    protected static array $paths = [
-        '/list.json',
-        '/listlist.json',
+    protected static array $httpWgTestFilenames = [
+        'list.json',
+        'listlist.json',
     ];
 
     #[Test]

src/ParametersTest.php

@@ -10,10 +10,10 @@
 final class ParametersTest extends StructuredFieldTestCase
 {
     /** @var array<string> */
-    protected static array $paths = [
-        '/param-dict.json',
-        '/param-list.json',
-        '/param-listlist.json',
+    protected static array $httpWgTestFilenames = [
+        'param-dict.json',
+        'param-list.json',
+        'param-listlist.json',
     ];
 
     #[Test]

src/ParserTest.php

@@ -10,10 +10,10 @@
 final class ParserTest extends StructuredFieldTestCase
 {
     /** @var array<string> */
-    protected static array $paths = [
-        '/examples.json',
-        '/key-generated.json',
-        '/large-generated.json',
+    protected static array $httpWgTestFilenames = [
+        'examples.json',
+        'key-generated.json',
+        'large-generated.json',
     ];
 
     #[Test]

src/StructuredFieldTestCase.php

@@ -9,13 +9,14 @@
 use PHPUnit\Framework\Attributes\Test;
 use PHPUnit\Framework\TestCase;
 use function implode;
+use function ltrim;
 
 abstract class StructuredFieldTestCase extends TestCase
 {
     protected static string $rootPath = __DIR__.'/../vendor/httpwg/structured-field-tests';
 
     /** @var array<string> */
-    protected static array $paths;
+    protected static array $httpWgTestFilenames;
 
     #[Test]
     #[DataProvider('httpWgDataProvider')]
@@ -38,8 +39,8 @@ public function it_can_pass_http_wg_tests(TestRecord $test): void
      */
     public static function httpWgDataProvider(): iterable
     {
-        foreach (static::$paths as $path) {
-            foreach (TestRecordCollection::fromPath(static::$rootPath.'/'.$path) as $test) {
+        foreach (static::$httpWgTestFilenames as $path) {
+            foreach (TestRecordCollection::fromPath(static::$rootPath.'/'.ltrim($path, '/')) as $test) {
                 yield $test->name => [$test];
             }
         }

src/TestRecordCollection.php

@@ -9,22 +9,17 @@
 use JsonException;
 use RuntimeException;
 use function basename;
-use function fclose;
-use function fopen;
-use function is_resource;
+use function file_get_contents;
 use function json_decode;
-use function stream_get_contents;
 
 /**
  * @implements IteratorAggregate<string, TestRecord>
  * @phpstan-import-type RecordData from TestRecord
  */
 final class TestRecordCollection implements IteratorAggregate
 {
-    /** @var array<string, TestRecord> */
-    private array $elements = [];
-
-    private function __construct()
+    /** @param array<string, TestRecord> $elements */
+    private function __construct(private array $elements = [])
     {
     }
 
@@ -38,30 +33,17 @@ public function add(TestRecord $test): void
     }
 
     /**
-     * @param resource|null $context
-     *
      * @throws JsonException|RuntimeException
      */
-    public static function fromPath(string $path, $context = null): self
+    public static function fromPath(string $path): self
     {
-        $args = [$path, 'r'];
-        if (null !== $context) {
-            $args[] = false;
-            $args[] = $context;
-        }
-
-        $resource = @fopen(...$args);
-        if (!is_resource($resource)) {
+        if (false === $content = file_get_contents($path)) {
             throw new RuntimeException("unable to connect to the path `$path`.");
         }
 
-        /** @var string $content */
-        $content = stream_get_contents($resource);
-        fclose($resource);
-
+        $suite = new self();
         /** @var array<RecordData> $records */
         $records = json_decode($content, true, 512, JSON_THROW_ON_ERROR);
-        $suite = new self();
         foreach ($records as $offset => $record) {
             $record['name'] = basename($path).' #'.($offset + 1).': '.$record['name'];
             $suite->add(TestRecord::fromDecoded($record));