Sync tests with changes in the WPT

Author: TRowbotham

tests/WhatWg/FailureTest.php

@@ -13,7 +13,7 @@ class FailureTest extends WhatwgTestCase
 {
     public static function urlTestDataFailureProvider(): iterable
     {
-        foreach (self::loadTestData('urltestdata.json') as $inputs) {
+        foreach (self::loadCombinedUrlTestData() as $inputs) {
             if (isset($inputs['failure']) && $inputs['base'] === null) {
                 yield [$inputs];
             }

tests/WhatWg/IdnaV2Test.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rowbot\URL\Tests\WhatWg;
+
+use PHPUnit\Framework\Attributes\DataProvider;
+use Rowbot\URL\Exception\TypeError;
+use Rowbot\URL\URL;
+
+/**
+ * @see https://github.com/web-platform-tests/wpt/blob/master/url/IdnaTestV2.window.js
+ */
+class IdnaV2Test extends WhatwgTestCase
+{
+    public static function idnaTestProvider(): iterable
+    {
+        foreach (self::loadTestData('IdnaTestV2.json') as $inputs) {
+            if ($inputs['input'] !== '') {
+                yield [$inputs];
+            }
+        }
+    }
+
+    #[DataProvider('idnaTestProvider')]
+    public function testIdna($idnaTest)
+    {
+        if ($idnaTest['output'] === null) {
+            $this->expectException(TypeError::class);
+        }
+
+        $url = new URL("https://{$idnaTest['input']}/x");
+        self::assertSame($idnaTest['output'], $url->host);
+        self::assertSame($idnaTest['output'], $url->hostname);
+        self::assertSame('/x', $url->pathname);
+        self::assertSame("https://{$idnaTest['output']}/x", $url->href);
+    }
+}

tests/WhatWg/URLConstructorTest.php

@@ -15,7 +15,7 @@ class URLConstructorTest extends WhatwgTestCase
 {
     public static function urlTestDataSuccessProvider(): iterable
     {
-        foreach (self::loadTestData('urltestdata.json') as $inputs) {
+        foreach (self::loadCombinedUrlTestData() as $inputs) {
             if (isset($inputs['base']) && !isset($inputs['failure'])) {
                 yield [$inputs];
             }
@@ -47,7 +47,7 @@ public function testUrlConstructorSucceeded(array $expected): void
 
     public static function urlTestDataFailureProvider(): iterable
     {
-        foreach (self::loadTestData('urltestdata.json') as $inputs) {
+        foreach (self::loadCombinedUrlTestData() as $inputs) {
             if (isset($inputs['failure'])) {
                 yield [$inputs];
             }

tests/WhatWg/URLOriginTest.php

@@ -12,7 +12,7 @@ class URLOriginTest extends WhatwgTestCase
 {
     public static function urlTestDataOriginProvider(): iterable
     {
-        foreach (self::loadTestData('urltestdata.json') as $inputs) {
+        foreach (self::loadCombinedUrlTestData() as $inputs) {
             if (isset($inputs['origin'])) {
                 yield [$inputs];
             }

tests/WhatWg/URLStaticsCanParseTest.php

@@ -15,6 +15,8 @@ class URLStaticsCanParseTest extends TestCase
 {
     #[TestWith(['url' => 'a:b', 'base' => null, 'expected' => true])]
     #[TestWith(['url' => 'a:/b', 'base' => null, 'expected' => true])]
+    #[TestWith(['url' => 'undefined', 'base' => 'aaa:b', 'expected' => false])]
+    #[TestWith(['url' => 'undefined', 'base' => 'https://test:test/', 'expected' => false])]
     #[TestWith(['url' => 'https://test:test', 'base' => null, 'expected' => false])]
     #[TestWith(['url' => 'a', 'base' => 'https://b/', 'expected' => true])]
     public function testCanParse(string $url, ?string $base, bool $expected): void

tests/WhatWg/WhatwgTestCase.php

@@ -59,4 +59,12 @@ protected static function loadTestData(string $url): array
 
         return json_decode($data, true, self::JSON_DEPTH, JSON_THROW_ON_ERROR);
     }
+
+    protected static function loadCombinedUrlTestData(): array
+    {
+        return [
+            ...self::loadTestData('urltestdata.json'),
+            ...self::loadTestData('urltestdata-javascript-only.json'),
+        ];
+    }
 }