diff --git a/testing/web-platform/tests/urlpattern/resources/urlpatterntestdata.json b/testing/web-platform/tests/urlpattern/resources/urlpatterntestdata.json
index 68d75fd304eb7..74fc2a1f1e0e5 100644
--- a/testing/web-platform/tests/urlpattern/resources/urlpatterntestdata.json
+++ b/testing/web-platform/tests/urlpattern/resources/urlpatterntestdata.json
@@ -9994,6 +9994,76 @@ username
 :
 "
 caf
+"
+}
+"
+input
+"
+:
+{
+"
+username
+"
+:
+"
+caf
+"
+}
+"
+expected
+"
+:
+{
+"
+input
+"
+:
+{
+"
+username
+"
+:
+"
+caf
+"
+}
+"
+username
+"
+:
+{
+"
+input
+"
+:
+"
+caf
+%
+C3
+%
+A9
+"
+"
+groups
+"
+:
+{
+}
+}
+}
+}
+{
+"
+pattern
+"
+:
+{
+"
+username
+"
+:
+"
+caf
 %
 c3
 %
@@ -10105,6 +10175,76 @@ password
 :
 "
 caf
+"
+}
+"
+input
+"
+:
+{
+"
+password
+"
+:
+"
+caf
+"
+}
+"
+expected
+"
+:
+{
+"
+input
+"
+:
+{
+"
+password
+"
+:
+"
+caf
+"
+}
+"
+password
+"
+:
+{
+"
+input
+"
+:
+"
+caf
+%
+C3
+%
+A9
+"
+"
+groups
+"
+:
+{
+}
+}
+}
+}
+{
+"
+pattern
+"
+:
+{
+"
+password
+"
+:
+"
+caf
 %
 c3
 %
@@ -10221,6 +10361,85 @@ pattern
 :
 {
 "
+hostname
+"
+:
+"
+caf
+.
+com
+"
+}
+"
+input
+"
+:
+{
+"
+hostname
+"
+:
+"
+caf
+.
+com
+"
+}
+"
+expected
+"
+:
+{
+"
+input
+"
+:
+{
+"
+hostname
+"
+:
+"
+caf
+.
+com
+"
+}
+"
+hostname
+"
+:
+{
+"
+input
+"
+:
+"
+xn
+-
+-
+caf
+-
+dma
+.
+com
+"
+"
+groups
+"
+:
+{
+}
+}
+}
+}
+{
+"
+pattern
+"
+:
+{
+"
 port
 "
 :
@@ -10325,6 +10544,13 @@ pattern
 :
 {
 "
+protocol
+"
+:
+"
+http
+"
+"
 port
 "
 :
@@ -10338,6 +10564,13 @@ input
 :
 {
 "
+protocol
+"
+:
+"
+http
+"
+"
 port
 "
 :
@@ -10356,6 +10589,13 @@ input
 :
 {
 "
+protocol
+"
+:
+"
+http
+"
+"
 port
 "
 :
@@ -10364,7 +10604,7 @@ port
 "
 }
 "
-port
+protocol
 "
 :
 {
@@ -10373,7 +10613,7 @@ input
 "
 :
 "
-80
+http
 "
 "
 groups
@@ -10382,43 +10622,486 @@ groups
 {
 }
 }
-}
-}
-{
 "
-pattern
+port
 "
 :
 {
 "
-port
+input
 "
 :
 "
-(
-.
-*
-)
 "
-}
+"
+groups
+"
+:
+{
+}
+}
+}
+}
+{
+"
+pattern
+"
+:
+{
+"
+protocol
+"
+:
+"
+http
+"
+"
+port
+"
+:
+"
+80
+{
+20
+}
+?
+"
+}
+"
+input
+"
+:
+{
+"
+protocol
+"
+:
+"
+http
+"
+"
+port
+"
+:
+"
+80
+"
+}
+"
+expected
+"
+:
+null
+}
+{
+"
+pattern
+"
+:
+{
+"
+protocol
+"
+:
+"
+http
+"
+"
+port
+"
+:
+"
+80
+"
+}
+"
+input
+"
+:
+{
+"
+protocol
+"
+:
+"
+http
+"
+"
+port
+"
+:
+"
+80
+"
+}
+"
+error
+"
+:
+true
+}
+{
+"
+pattern
+"
+:
+{
+"
+port
+"
+:
+"
+80
+"
+}
+"
+input
+"
+:
+{
+"
+protocol
+"
+:
+"
+http
+"
+"
+port
+"
+:
+"
+80
+"
+}
+"
+expected
+"
+:
+null
+}
+{
+"
+pattern
+"
+:
+{
+"
+protocol
+"
+:
+"
+http
+{
+s
+}
+?
+"
+"
+port
+"
+:
+"
+80
+"
+}
+"
+input
+"
+:
+{
+"
+protocol
+"
+:
+"
+http
+"
+"
+port
+"
+:
+"
+80
+"
+}
+"
+expected
+"
+:
+null
+}
+{
+"
+pattern
+"
+:
+{
+"
+port
+"
+:
+"
+80
+"
+}
+"
+input
+"
+:
+{
+"
+port
+"
+:
+"
+80
+"
+}
+"
+expected
+"
+:
+{
+"
+input
+"
+:
+{
+"
+port
+"
+:
+"
+80
+"
+}
+"
+port
+"
+:
+{
+"
+input
+"
+:
+"
+80
+"
+"
+groups
+"
+:
+{
+}
+}
+}
+}
+{
+"
+pattern
+"
+:
+{
+"
+port
+"
+:
+"
+(
+.
+*
+)
+"
+}
+"
+input
+"
+:
+{
+"
+port
+"
+:
+"
+invalid80
+"
+}
+"
+expected
+"
+:
+null
+}
+{
+"
+pattern
+"
+:
+{
+"
+pathname
+"
+:
+"
+/
+foo
+/
+bar
+"
+}
+"
+input
+"
+:
+{
+"
+pathname
+"
+:
+"
+/
+foo
+/
+.
+/
+bar
+"
+}
+"
+expected
+"
+:
+{
+"
+input
+"
+:
+{
+"
+pathname
+"
+:
+"
+/
+foo
+/
+.
+/
+bar
+"
+}
+"
+pathname
+"
+:
+{
+"
+input
+"
+:
+"
+/
+foo
+/
+bar
+"
+"
+groups
+"
+:
+{
+}
+}
+}
+}
+{
+"
+pattern
+"
+:
+{
+"
+pathname
+"
+:
+"
+/
+foo
+/
+baz
+"
+}
+"
+input
+"
+:
+{
+"
+pathname
+"
+:
+"
+/
+foo
+/
+bar
+/
+.
+.
+/
+baz
+"
+}
+"
+expected
+"
+:
+{
 "
 input
 "
 :
 {
 "
-port
+pathname
 "
 :
 "
-invalid80
+/
+foo
+/
+bar
+/
+.
+.
+/
+baz
 "
 }
 "
-expected
+pathname
 "
 :
-null
+{
+"
+input
+"
+:
+"
+/
+foo
+/
+baz
+"
+"
+groups
+"
+:
+{
+}
+}
+}
 }
 {
 "
@@ -10432,9 +11115,11 @@ pathname
 :
 "
 /
-foo
-/
-bar
+caf
+%
+C3
+%
+A9
 "
 }
 "
@@ -10448,11 +11133,7 @@ pathname
 :
 "
 /
-foo
-/
-.
-/
-bar
+caf
 "
 }
 "
@@ -10471,11 +11152,7 @@ pathname
 :
 "
 /
-foo
-/
-.
-/
-bar
+caf
 "
 }
 "
@@ -10489,9 +11166,11 @@ input
 :
 "
 /
-foo
-/
-bar
+caf
+%
+C3
+%
+A9
 "
 "
 groups
@@ -10514,9 +11193,7 @@ pathname
 :
 "
 /
-foo
-/
-baz
+caf
 "
 }
 "
@@ -10530,14 +11207,7 @@ pathname
 :
 "
 /
-foo
-/
-bar
-/
-.
-.
-/
-baz
+caf
 "
 }
 "
@@ -10556,14 +11226,7 @@ pathname
 :
 "
 /
-foo
-/
-bar
-/
-.
-.
-/
-baz
+caf
 "
 }
 "
@@ -10577,9 +11240,11 @@ input
 :
 "
 /
-foo
-/
-baz
+caf
+%
+C3
+%
+A9
 "
 "
 groups
@@ -10604,12 +11269,120 @@ pathname
 /
 caf
 %
-C3
+c3
 %
-A9
+a9
+"
+}
+"
+input
+"
+:
+{
+"
+pathname
+"
+:
+"
+/
+caf
+"
+}
+"
+expected
+"
+:
+null
+}
+{
+"
+pattern
+"
+:
+{
+"
+pathname
+"
+:
+"
+/
+foo
+/
+bar
+"
+}
+"
+input
+"
+:
+{
+"
+pathname
+"
+:
+"
+foo
+/
+bar
+"
+}
+"
+expected
+"
+:
+null
+}
+{
+"
+pattern
+"
+:
+{
+"
+pathname
+"
+:
+"
+/
+foo
+/
+bar
+"
+}
+"
+input
+"
+:
+{
+"
+pathname
+"
+:
+"
+foo
+/
+bar
+"
+"
+baseURL
+"
+:
+"
+https
+:
+/
+/
+example
+.
+com
 "
 }
 "
+expected
+"
+:
+{
+"
 input
 "
 :
@@ -10619,12 +11392,52 @@ pathname
 "
 :
 "
-/
-caf
+foo
+/
+bar
+"
+"
+baseURL
+"
+:
+"
+https
+:
+/
+/
+example
+.
+com
+"
+}
+"
+protocol
+"
+:
+{
+"
+input
+"
+:
+"
+https
+"
+"
+groups
+"
+:
+{
+"
+0
+"
+:
+"
+https
 "
 }
+}
 "
-expected
+hostname
 "
 :
 {
@@ -10632,16 +11445,27 @@ expected
 input
 "
 :
+"
+example
+.
+com
+"
+"
+groups
+"
+:
 {
 "
-pathname
+0
 "
 :
 "
-/
-caf
+example
+.
+com
 "
 }
+}
 "
 pathname
 "
@@ -10653,11 +11477,9 @@ input
 :
 "
 /
-caf
-%
-C3
-%
-A9
+foo
+/
+bar
 "
 "
 groups
@@ -10680,11 +11502,12 @@ pathname
 :
 "
 /
-caf
-%
-c3
-%
-a9
+foo
+/
+.
+.
+/
+bar
 "
 }
 "
@@ -10698,18 +11521,16 @@ pathname
 :
 "
 /
-caf
+bar
 "
 }
 "
 expected
 "
 :
-null
-}
 {
 "
-pattern
+input
 "
 :
 {
@@ -10719,31 +11540,30 @@ pathname
 :
 "
 /
-foo
-/
 bar
 "
 }
 "
-input
+pathname
 "
 :
 {
 "
-pathname
+input
 "
 :
 "
-foo
 /
 bar
 "
-}
 "
-expected
+groups
 "
 :
-null
+{
+}
+}
+}
 }
 {
 "
@@ -10756,11 +11576,25 @@ pathname
 "
 :
 "
+.
 /
 foo
 /
 bar
 "
+"
+baseURL
+"
+:
+"
+https
+:
+/
+/
+example
+.
+com
+"
 }
 "
 input
@@ -10824,29 +11658,37 @@ com
 "
 }
 "
-protocol
+exactly_empty_components
 "
 :
-{
+[
 "
-input
+username
 "
-:
 "
-https
+password
 "
 "
-groups
+port
+"
+]
+"
+protocol
 "
 :
 {
 "
-0
+input
 "
 :
 "
 https
 "
+"
+groups
+"
+:
+{
 }
 }
 "
@@ -10868,15 +11710,6 @@ groups
 "
 :
 {
-"
-0
-"
-:
-"
-example
-.
-com
-"
 }
 }
 "
@@ -11340,6 +12173,84 @@ search
 q
 =
 caf
+"
+}
+"
+input
+"
+:
+{
+"
+search
+"
+:
+"
+q
+=
+caf
+"
+}
+"
+expected
+"
+:
+{
+"
+input
+"
+:
+{
+"
+search
+"
+:
+"
+q
+=
+caf
+"
+}
+"
+search
+"
+:
+{
+"
+input
+"
+:
+"
+q
+=
+caf
+%
+C3
+%
+A9
+"
+"
+groups
+"
+:
+{
+}
+}
+}
+}
+{
+"
+pattern
+"
+:
+{
+"
+search
+"
+:
+"
+q
+=
+caf
 %
 c3
 %
@@ -11453,6 +12364,76 @@ hash
 :
 "
 caf
+"
+}
+"
+input
+"
+:
+{
+"
+hash
+"
+:
+"
+caf
+"
+}
+"
+expected
+"
+:
+{
+"
+input
+"
+:
+{
+"
+hash
+"
+:
+"
+caf
+"
+}
+"
+hash
+"
+:
+{
+"
+input
+"
+:
+"
+caf
+%
+C3
+%
+A9
+"
+"
+groups
+"
+:
+{
+}
+}
+}
+}
+{
+"
+pattern
+"
+:
+{
+"
+hash
+"
+:
+"
+caf
 %
 c3
 %