From bc0ed740d1afbd88607aab23ab23ddc81d685073 Mon Sep 17 00:00:00 2001
From: Hiroshige Hayashizaki <hiroshige@chromium.org>
Date: Wed, 16 Oct 2019 10:47:48 -0700
Subject: [PATCH] [Import Maps] Split out WPT tests related to built-in modules

This CL splits some WPT tests into
- wpt/import-maps/core/ that tests the core features after
  https://github.com/WICG/import-maps/pull/176, and
- wpt/import-maps/builtin-support.tentative/ that
  requires pre-#176 built-in module and fallback support,

in order to test builtin- and non-builtin- versions easier.

Bug: 1010751
Change-Id: I9f4793f64fa0ad267fa1d4e43d5597d94a5cc541
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1839428
Commit-Queue: Hiroshige Hayashizaki <hiroshige@chromium.org>
Reviewed-by: Domenic Denicola <domenic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706510}
---
 .../@std/__dir__.headers                      |  0
 .../@std/blank                                |  0
 .../{ => builtin-support.tentative}/@std/none |  0
 .../bare.sub.tentative.html                   | 24 +--------
 .../bare/__dir__.headers                      |  0
 .../bare/blank                                |  0
 .../{ => builtin-support.tentative}/bare/none |  0
 .../bare/std-blank                            |  0
 .../bare/std-none                             |  0
 .../builtin-empty.tentative.html              | 12 ++---
 .../builtin-import-scheme.tentative.html      |  2 +-
 .../builtin.tentative.html                    |  2 +-
 .../data.sub.tentative.html                   | 26 +--------
 .../fallback-disallowed.sub.tentative.html    | 42 +++++++--------
 .../fallback.sub.tentative.html               | 26 ++++-----
 .../http.sub.tentative.html                   | 32 ++---------
 .../static-import.js                          |  0
 import-maps/core/bare.sub.tentative.html      | 51 ++++++++++++++++++
 import-maps/core/bare/__dir__.headers         |  1 +
 import-maps/{ => core}/bare/bare              |  0
 import-maps/{ => core}/bare/cross-origin-bare |  0
 import-maps/{ => core}/bare/to-bare           |  0
 import-maps/{ => core}/bare/to-data           |  0
 import-maps/core/data.sub.tentative.html      | 53 +++++++++++++++++++
 import-maps/core/http.sub.tentative.html      | 52 ++++++++++++++++++
 .../{ => core}/module-map-key.tentative.html  |  6 +--
 import-maps/core/static-import.js             |  1 +
 import-maps/resources/test-helper.js          |  2 +-
 28 files changed, 213 insertions(+), 119 deletions(-)
 rename import-maps/{ => builtin-support.tentative}/@std/__dir__.headers (100%)
 rename import-maps/{ => builtin-support.tentative}/@std/blank (100%)
 rename import-maps/{ => builtin-support.tentative}/@std/none (100%)
 rename import-maps/{ => builtin-support.tentative}/bare.sub.tentative.html (65%)
 rename import-maps/{ => builtin-support.tentative}/bare/__dir__.headers (100%)
 rename import-maps/{ => builtin-support.tentative}/bare/blank (100%)
 rename import-maps/{ => builtin-support.tentative}/bare/none (100%)
 rename import-maps/{ => builtin-support.tentative}/bare/std-blank (100%)
 rename import-maps/{ => builtin-support.tentative}/bare/std-none (100%)
 rename import-maps/{ => builtin-support.tentative}/builtin-empty.tentative.html (75%)
 rename import-maps/{ => builtin-support.tentative}/builtin-import-scheme.tentative.html (94%)
 rename import-maps/{ => builtin-support.tentative}/builtin.tentative.html (94%)
 rename import-maps/{ => builtin-support.tentative}/data.sub.tentative.html (60%)
 rename import-maps/{ => builtin-support.tentative}/fallback-disallowed.sub.tentative.html (53%)
 rename import-maps/{ => builtin-support.tentative}/fallback.sub.tentative.html (82%)
 rename import-maps/{ => builtin-support.tentative}/http.sub.tentative.html (53%)
 rename import-maps/{ => builtin-support.tentative}/static-import.js (100%)
 create mode 100644 import-maps/core/bare.sub.tentative.html
 create mode 100644 import-maps/core/bare/__dir__.headers
 rename import-maps/{ => core}/bare/bare (100%)
 rename import-maps/{ => core}/bare/cross-origin-bare (100%)
 rename import-maps/{ => core}/bare/to-bare (100%)
 rename import-maps/{ => core}/bare/to-data (100%)
 create mode 100644 import-maps/core/data.sub.tentative.html
 create mode 100644 import-maps/core/http.sub.tentative.html
 rename import-maps/{ => core}/module-map-key.tentative.html (75%)
 create mode 100644 import-maps/core/static-import.js

diff --git a/import-maps/@std/__dir__.headers b/import-maps/builtin-support.tentative/@std/__dir__.headers
similarity index 100%
rename from import-maps/@std/__dir__.headers
rename to import-maps/builtin-support.tentative/@std/__dir__.headers
diff --git a/import-maps/@std/blank b/import-maps/builtin-support.tentative/@std/blank
similarity index 100%
rename from import-maps/@std/blank
rename to import-maps/builtin-support.tentative/@std/blank
diff --git a/import-maps/@std/none b/import-maps/builtin-support.tentative/@std/none
similarity index 100%
rename from import-maps/@std/none
rename to import-maps/builtin-support.tentative/@std/none
diff --git a/import-maps/bare.sub.tentative.html b/import-maps/builtin-support.tentative/bare.sub.tentative.html
similarity index 65%
rename from import-maps/bare.sub.tentative.html
rename to import-maps/builtin-support.tentative/bare.sub.tentative.html
index cf99589f9bd567..e20424aed8a728 100644
--- a/import-maps/bare.sub.tentative.html
+++ b/import-maps/builtin-support.tentative/bare.sub.tentative.html
@@ -2,7 +2,7 @@
 <meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helper.js"></script>
+<script src="../resources/test-helper.js"></script>
 
 <script>
 // "bare/..." (i.e. without leading "./") are bare specifiers
@@ -15,16 +15,10 @@
 const importMap = `
 {
   "imports": {
-    "bare/bare": "./resources/log.js?pipe=sub&name=bare",
-    "bare/cross-origin-bare": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-bare",
-    "bare/to-data": "data:text/javascript,log.push('dataURL')",
-
     "bare/std-blank": "std:blank",
     "bare/blank": "@std/blank",
     "bare/std-none": "std:none",
-    "bare/none": "@std/none",
-
-    "bare/to-bare": "bare/bare"
+    "bare/none": "@std/none"
   }
 }
 `;
@@ -41,16 +35,6 @@
   // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR
   // below. https://crbug.com/928435
 
-  // Bare to HTTP(S).
-  "bare/bare":
-    [Result.URL, Result.URL, "log:bare", "log:bare"],
-  "bare/cross-origin-bare":
-    [Result.URL, Result.URL, "log:cross-origin-bare", "log:cross-origin-bare"],
-
-  // Bare to data:
-  "bare/to-data":
-    [Result.URL, Result.URL, "dataURL", "dataURL"],
-
   // Bare to built-in.
   "bare/std-blank":
     [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
@@ -60,10 +44,6 @@
     [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
   "bare/none":
     [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-
-  // Bare to bare mapping is disabled.
-  "bare/to-bare":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
 };
 
 doTests(importMap, null, tests);
diff --git a/import-maps/bare/__dir__.headers b/import-maps/builtin-support.tentative/bare/__dir__.headers
similarity index 100%
rename from import-maps/bare/__dir__.headers
rename to import-maps/builtin-support.tentative/bare/__dir__.headers
diff --git a/import-maps/bare/blank b/import-maps/builtin-support.tentative/bare/blank
similarity index 100%
rename from import-maps/bare/blank
rename to import-maps/builtin-support.tentative/bare/blank
diff --git a/import-maps/bare/none b/import-maps/builtin-support.tentative/bare/none
similarity index 100%
rename from import-maps/bare/none
rename to import-maps/builtin-support.tentative/bare/none
diff --git a/import-maps/bare/std-blank b/import-maps/builtin-support.tentative/bare/std-blank
similarity index 100%
rename from import-maps/bare/std-blank
rename to import-maps/builtin-support.tentative/bare/std-blank
diff --git a/import-maps/bare/std-none b/import-maps/builtin-support.tentative/bare/std-none
similarity index 100%
rename from import-maps/bare/std-none
rename to import-maps/builtin-support.tentative/bare/std-none
diff --git a/import-maps/builtin-empty.tentative.html b/import-maps/builtin-support.tentative/builtin-empty.tentative.html
similarity index 75%
rename from import-maps/builtin-empty.tentative.html
rename to import-maps/builtin-support.tentative/builtin-empty.tentative.html
index aba28d18e043d5..9ede75a4c42067 100644
--- a/import-maps/builtin-empty.tentative.html
+++ b/import-maps/builtin-support.tentative/builtin-empty.tentative.html
@@ -1,16 +1,16 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helper.js"></script>
+<script src="../resources/test-helper.js"></script>
 
 <script>
 const importMap = `
 {
   "imports": {
-    "./resources/log.js?pipe=sub&name=empty": [ "@std/" ],
-    "./resources/log.js?pipe=sub&name=empty-fallback": [
+    "../resources/log.js?pipe=sub&name=empty": [ "@std/" ],
+    "../resources/log.js?pipe=sub&name=empty-fallback": [
       "@std/",
-      "./resources/log.js?pipe=sub&name=empty-fallback"
+      "../resources/log.js?pipe=sub&name=empty-fallback"
     ]
   }
 }
@@ -32,9 +32,9 @@
   "@std/":
     [Result.FETCH_ERROR, Result.PARSE_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR],
 
-  "./resources/log.js?pipe=sub&name=empty":
+  "../resources/log.js?pipe=sub&name=empty":
     [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-  "./resources/log.js?pipe=sub&name=empty-fallback":
+  "../resources/log.js?pipe=sub&name=empty-fallback":
     [Result.URL, Result.URL, Result.URL, Result.URL],
 };
 
diff --git a/import-maps/builtin-import-scheme.tentative.html b/import-maps/builtin-support.tentative/builtin-import-scheme.tentative.html
similarity index 94%
rename from import-maps/builtin-import-scheme.tentative.html
rename to import-maps/builtin-support.tentative/builtin-import-scheme.tentative.html
index 6a27ef5aee2371..d9977ae3535c48 100644
--- a/import-maps/builtin-import-scheme.tentative.html
+++ b/import-maps/builtin-support.tentative/builtin-import-scheme.tentative.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helper.js"></script>
+<script src="../resources/test-helper.js"></script>
 
 <script>
 const tests = {
diff --git a/import-maps/builtin.tentative.html b/import-maps/builtin-support.tentative/builtin.tentative.html
similarity index 94%
rename from import-maps/builtin.tentative.html
rename to import-maps/builtin-support.tentative/builtin.tentative.html
index e85289e4d884d4..497bb5c606b764 100644
--- a/import-maps/builtin.tentative.html
+++ b/import-maps/builtin-support.tentative/builtin.tentative.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helper.js"></script>
+<script src="../resources/test-helper.js"></script>
 
 <script>
 const tests = {
diff --git a/import-maps/data.sub.tentative.html b/import-maps/builtin-support.tentative/data.sub.tentative.html
similarity index 60%
rename from import-maps/data.sub.tentative.html
rename to import-maps/builtin-support.tentative/data.sub.tentative.html
index 634948942eea67..0377a788491cea 100644
--- a/import-maps/data.sub.tentative.html
+++ b/import-maps/builtin-support.tentative/data.sub.tentative.html
@@ -2,7 +2,7 @@
 <meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helper.js"></script>
+<script src="../resources/test-helper.js"></script>
 
 <script>
 // "bare/..." (i.e. without leading "./") are bare specifiers
@@ -15,18 +15,10 @@
 const importMap = `
 {
   "imports": {
-    "bare": "./resources/log.js?pipe=sub&name=bare",
-
-    "data:text/javascript,log.push('data:foo')": "./resources/log.js?pipe=sub&name=foo",
-    "data:text/javascript,log.push('data:cross-origin-foo')": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-foo",
-    "data:text/javascript,log.push('data:to-data')": "data:text/javascript,log.push('dataURL')",
-
     "data:text/javascript,log.push('data:std-blank')": "std:blank",
     "data:text/javascript,log.push('data:blank')": "@std/blank",
     "data:text/javascript,log.push('data:std-none')": "std:none",
-    "data:text/javascript,log.push('data:none')": "@std/none",
-
-    "data:text/javascript,log.push('data:to-bare')": "bare"
+    "data:text/javascript,log.push('data:none')": "@std/none"
   }
 }
 `;
@@ -43,16 +35,6 @@
   // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR
   // below. https://crbug.com/928435
 
-  // data: to HTTP(S).
-  "data:text/javascript,log.push('data:foo')":
-    [Result.URL, Result.URL, "log:foo", "log:foo"],
-  "data:text/javascript,log.push('data:cross-origin-foo')":
-    [Result.URL, Result.URL, "log:cross-origin-foo", "log:cross-origin-foo"],
-
-  // data: to data:
-  "data:text/javascript,log.push('data:to-data')":
-    [Result.URL, Result.URL, "dataURL", "dataURL"],
-
   // data: to built-in.
   "data:text/javascript,log.push('data:std-blank')":
     [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
@@ -62,10 +44,6 @@
     [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
   "data:text/javascript,log.push('data:none')":
     [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-
-  // data: to bare mapping is disabled.
-  "data:text/javascript,log.push('data:to-bare')":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
 };
 
 doTests(importMap, null, tests);
diff --git a/import-maps/fallback-disallowed.sub.tentative.html b/import-maps/builtin-support.tentative/fallback-disallowed.sub.tentative.html
similarity index 53%
rename from import-maps/fallback-disallowed.sub.tentative.html
rename to import-maps/builtin-support.tentative/fallback-disallowed.sub.tentative.html
index 280d02d847314f..7efe90eb751d98 100644
--- a/import-maps/fallback-disallowed.sub.tentative.html
+++ b/import-maps/builtin-support.tentative/fallback-disallowed.sub.tentative.html
@@ -2,7 +2,7 @@
 <meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helper.js"></script>
+<script src="../resources/test-helper.js"></script>
 
 <script>
 // Fallbacks from external URLs (such as HTTPS URLs) are
@@ -18,51 +18,51 @@
 const importMap = `
 {
   "imports": {
-    "bare": "./resources/log.js?pipe=sub&name=bare",
+    "bare": "../resources/log.js?pipe=sub&name=bare",
 
-    "./resources/log.js?pipe=sub&name=http-to-builtin": [
-      "./resources/log.js?pipe=sub&name=http-to-builtin",
+    "../resources/log.js?pipe=sub&name=http-to-builtin": [
+      "../resources/log.js?pipe=sub&name=http-to-builtin",
       "@std/blank"
     ],
 
-    "./resources/log.js?pipe=sub&name=fallback-to-different-url-1": [
+    "../resources/log.js?pipe=sub&name=fallback-to-different-url-1": [
       "@std/blank",
-      "./resources/log.js?pipe=sub&name=something-different"
+      "../resources/log.js?pipe=sub&name=something-different"
     ],
-    "./resources/log.js?pipe=sub&name=fallback-to-different-url-2": [
+    "../resources/log.js?pipe=sub&name=fallback-to-different-url-2": [
       "@std/none",
-      "./resources/log.js?pipe=sub&name=something-different2"
+      "../resources/log.js?pipe=sub&name=something-different2"
     ],
-    "./resources/log.js?pipe=sub&name=fallback-to-different-origin-1": [
+    "../resources/log.js?pipe=sub&name=fallback-to-different-origin-1": [
       "@std/blank",
       "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=fallback-to-different-origin-1"
     ],
-    "./resources/log.js?pipe=sub&name=fallback-to-different-origin-2": [
+    "../resources/log.js?pipe=sub&name=fallback-to-different-origin-2": [
       "@std/none",
       "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=fallback-to-different-origin-2"
     ],
 
-    "./resources/log.js?pipe=sub&name=more-than-two-values-1": [
+    "../resources/log.js?pipe=sub&name=more-than-two-values-1": [
       "@std/none",
       "@std/blank",
-      "./resources/log.js?pipe=sub&name=more-than-two-values-1"
+      "../resources/log.js?pipe=sub&name=more-than-two-values-1"
     ],
-    "./resources/log.js?pipe=sub&name=more-than-two-values-2": [
+    "../resources/log.js?pipe=sub&name=more-than-two-values-2": [
       "@std/none",
-      "./resources/log.js?pipe=sub&name=more-than-two-values-2",
+      "../resources/log.js?pipe=sub&name=more-than-two-values-2",
       "@std/blank"
     ],
-    "./resources/log.js?pipe=sub&name=fallback-from-http": [
-      "./resources/log.js?pipe=sub&name=non-built-in",
-      "./resources/log.js?pipe=sub&name=fallback-from-http"
+    "../resources/log.js?pipe=sub&name=fallback-from-http": [
+      "../resources/log.js?pipe=sub&name=non-built-in",
+      "../resources/log.js?pipe=sub&name=fallback-from-http"
     ],
-    "./resources/log.js?pipe=sub&name=fallback-from-data-1": [
+    "../resources/log.js?pipe=sub&name=fallback-from-data-1": [
       "data:text/plain,",
-      "./resources/log.js?pipe=sub&name=fallback-from-http"
+      "../resources/log.js?pipe=sub&name=fallback-from-http"
     ],
-    "./resources/log.js?pipe=sub&name=fallback-from-data-2": [
+    "../resources/log.js?pipe=sub&name=fallback-from-data-2": [
       "data:text/javascript,log.push('dataURL')",
-      "./resources/log.js?pipe=sub&name=fallback-from-http"
+      "../resources/log.js?pipe=sub&name=fallback-from-http"
     ]
   }
 }
diff --git a/import-maps/fallback.sub.tentative.html b/import-maps/builtin-support.tentative/fallback.sub.tentative.html
similarity index 82%
rename from import-maps/fallback.sub.tentative.html
rename to import-maps/builtin-support.tentative/fallback.sub.tentative.html
index 3f4f2887da8208..45cf6dc1ced1dc 100644
--- a/import-maps/fallback.sub.tentative.html
+++ b/import-maps/builtin-support.tentative/fallback.sub.tentative.html
@@ -2,7 +2,7 @@
 <meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helper.js"></script>
+<script src="../resources/test-helper.js"></script>
 
 <script>
 // This tests is for fallbacks with the pattern of
@@ -16,13 +16,13 @@
 const importMap = `
 {
   "imports": {
-    "./resources/log.js?pipe=sub&name=blank": [
+    "../resources/log.js?pipe=sub&name=blank": [
       "@std/blank",
-      "./resources/log.js?pipe=sub&name=blank"
+      "../resources/log.js?pipe=sub&name=blank"
     ],
-    "./resources/log.js?pipe=sub&name=none": [
+    "../resources/log.js?pipe=sub&name=none": [
       "@std/none",
-      "./resources/log.js?pipe=sub&name=none"
+      "../resources/log.js?pipe=sub&name=none"
     ],
     "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-blank": [
       "@std/blank",
@@ -33,13 +33,13 @@
       "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-none"
     ],
 
-    "./resources/log.js?pipe=sub&name=std-blank": [
+    "../resources/log.js?pipe=sub&name=std-blank": [
       "std:blank",
-      "./resources/log.js?pipe=sub&name=std-blank"
+      "../resources/log.js?pipe=sub&name=std-blank"
     ],
-    "./resources/log.js?pipe=sub&name=std-none": [
+    "../resources/log.js?pipe=sub&name=std-none": [
       "std:none",
-      "./resources/log.js?pipe=sub&name=std-none"
+      "../resources/log.js?pipe=sub&name=std-none"
     ],
     "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-blank": [
       "std:blank",
@@ -61,18 +61,18 @@
   // - dynamic import.
   // Result.URL indicates that the specifier was not re-mapped by import maps,
   // i.e. either considered as a relative path, or fallback occured.
-  "./resources/log.js?pipe=sub&name=blank":
+  "../resources/log.js?pipe=sub&name=blank":
     [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "./resources/log.js?pipe=sub&name=none":
+  "../resources/log.js?pipe=sub&name=none":
     [Result.URL, Result.URL, Result.URL, Result.URL],
   "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-blank":
     [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
   "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-none":
     [Result.URL, Result.URL, Result.URL, Result.URL],
 
-  "./resources/log.js?pipe=sub&name=std-blank":
+  "../resources/log.js?pipe=sub&name=std-blank":
     [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "./resources/log.js?pipe=sub&name=std-none":
+  "../resources/log.js?pipe=sub&name=std-none":
     [Result.URL, Result.URL, Result.URL, Result.URL],
   "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-blank":
     [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
diff --git a/import-maps/http.sub.tentative.html b/import-maps/builtin-support.tentative/http.sub.tentative.html
similarity index 53%
rename from import-maps/http.sub.tentative.html
rename to import-maps/builtin-support.tentative/http.sub.tentative.html
index bd24f353550733..7689ae13bb5373 100644
--- a/import-maps/http.sub.tentative.html
+++ b/import-maps/builtin-support.tentative/http.sub.tentative.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/test-helper.js"></script>
+<script src="../resources/test-helper.js"></script>
 
 <script>
 // "bare/..." (i.e. without leading "./") are bare specifiers
@@ -14,18 +14,10 @@
 const importMap = `
 {
   "imports": {
-    "bare": "./resources/log.js?pipe=sub&name=bare",
-
-    "./resources/log.js?pipe=sub&name=foo": "./resources/log.js?pipe=sub&name=bar",
-    "./resources/log.js?pipe=sub&name=cross-origin-foo": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-bar",
-    "./resources/log.js?pipe=sub&name=to-data": "data:text/javascript,log.push('dataURL')",
-
-    "./resources/log.js?pipe=sub&name=std-blank": "std:blank",
-    "./resources/log.js?pipe=sub&name=blank": "@std/blank",
-    "./resources/log.js?pipe=sub&name=std-none": "std:none",
-    "./resources/log.js?pipe=sub&name=none": "@std/none",
-
-    "./resources/log.js?pipe=sub&name=to-bare": "bare"
+    "../resources/log.js?pipe=sub&name=std-blank": "std:blank",
+    "../resources/log.js?pipe=sub&name=blank": "@std/blank",
+    "../resources/log.js?pipe=sub&name=std-none": "std:none",
+    "../resources/log.js?pipe=sub&name=none": "@std/none"
   }
 }
 `;
@@ -42,16 +34,6 @@
   // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR
   // below. https://crbug.com/928435
 
-  // HTTP(S) to HTTP(S).
-  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=foo":
-    [Result.URL, Result.URL, "log:bar", "log:bar"],
-  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-foo":
-    [Result.URL, Result.URL, "log:cross-origin-bar", "log:cross-origin-bar"],
-
-  // HTTP(S) to data:
-  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=to-data":
-    [Result.URL, Result.URL, "dataURL", "dataURL"],
-
   // HTTP(S) to built-in.
   "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=std-blank":
     [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
@@ -61,10 +43,6 @@
     [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
   "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=none":
     [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-
-  // HTTP(S) to bare mapping is disabled.
-  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=to-bare":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
 };
 
 doTests(importMap, null, tests);
diff --git a/import-maps/static-import.js b/import-maps/builtin-support.tentative/static-import.js
similarity index 100%
rename from import-maps/static-import.js
rename to import-maps/builtin-support.tentative/static-import.js
diff --git a/import-maps/core/bare.sub.tentative.html b/import-maps/core/bare.sub.tentative.html
new file mode 100644
index 00000000000000..7fb769e09a2af4
--- /dev/null
+++ b/import-maps/core/bare.sub.tentative.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/test-helper.js"></script>
+
+<script>
+// "bare/..." (i.e. without leading "./") are bare specifiers
+// (not relative paths).
+const importMap = `
+{
+  "imports": {
+    "bare/bare": "../resources/log.js?pipe=sub&name=bare",
+    "bare/cross-origin-bare": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-bare",
+    "bare/to-data": "data:text/javascript,log.push('dataURL')",
+
+    "bare/to-bare": "bare/bare"
+  }
+}
+`;
+
+const tests = {
+  // Arrays of expected results for:
+  // - <script src type="module">,
+  // - <script src> (classic script),
+  // - static import, and
+  // - dynamic import.
+
+  // Currently, Chromium's implementation resolves import maps as a part of
+  // specifier resolution, and thus failure in import map resolution causes
+  // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR
+  // below. https://crbug.com/928435
+
+  // Bare to HTTP(S).
+  "bare/bare":
+    [Result.URL, Result.URL, "log:bare", "log:bare"],
+  "bare/cross-origin-bare":
+    [Result.URL, Result.URL, "log:cross-origin-bare", "log:cross-origin-bare"],
+
+  // Bare to data:
+  "bare/to-data":
+    [Result.URL, Result.URL, "dataURL", "dataURL"],
+
+  // Bare to bare mapping is disabled.
+  "bare/to-bare":
+    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
+};
+
+doTests(importMap, null, tests);
+</script>
+<body>
diff --git a/import-maps/core/bare/__dir__.headers b/import-maps/core/bare/__dir__.headers
new file mode 100644
index 00000000000000..e7ec0d6699d07e
--- /dev/null
+++ b/import-maps/core/bare/__dir__.headers
@@ -0,0 +1 @@
+Content-Type: text/javascript
diff --git a/import-maps/bare/bare b/import-maps/core/bare/bare
similarity index 100%
rename from import-maps/bare/bare
rename to import-maps/core/bare/bare
diff --git a/import-maps/bare/cross-origin-bare b/import-maps/core/bare/cross-origin-bare
similarity index 100%
rename from import-maps/bare/cross-origin-bare
rename to import-maps/core/bare/cross-origin-bare
diff --git a/import-maps/bare/to-bare b/import-maps/core/bare/to-bare
similarity index 100%
rename from import-maps/bare/to-bare
rename to import-maps/core/bare/to-bare
diff --git a/import-maps/bare/to-data b/import-maps/core/bare/to-data
similarity index 100%
rename from import-maps/bare/to-data
rename to import-maps/core/bare/to-data
diff --git a/import-maps/core/data.sub.tentative.html b/import-maps/core/data.sub.tentative.html
new file mode 100644
index 00000000000000..25c18c45b7dc3e
--- /dev/null
+++ b/import-maps/core/data.sub.tentative.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/test-helper.js"></script>
+
+<script>
+// "bare/..." (i.e. without leading "./") are bare specifiers
+// (not relative paths).
+const importMap = `
+{
+  "imports": {
+    "bare": "../resources/log.js?pipe=sub&name=bare",
+
+    "data:text/javascript,log.push('data:foo')": "../resources/log.js?pipe=sub&name=foo",
+    "data:text/javascript,log.push('data:cross-origin-foo')": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-foo",
+    "data:text/javascript,log.push('data:to-data')": "data:text/javascript,log.push('dataURL')",
+
+    "data:text/javascript,log.push('data:to-bare')": "bare"
+  }
+}
+`;
+
+const tests = {
+  // Arrays of expected results for:
+  // - <script src type="module">,
+  // - <script src> (classic script),
+  // - static import, and
+  // - dynamic import.
+
+  // Currently, Chromium's implementation resolves import maps as a part of
+  // specifier resolution, and thus failure in import map resolution causes
+  // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR
+  // below. https://crbug.com/928435
+
+  // data: to HTTP(S).
+  "data:text/javascript,log.push('data:foo')":
+    [Result.URL, Result.URL, "log:foo", "log:foo"],
+  "data:text/javascript,log.push('data:cross-origin-foo')":
+    [Result.URL, Result.URL, "log:cross-origin-foo", "log:cross-origin-foo"],
+
+  // data: to data:
+  "data:text/javascript,log.push('data:to-data')":
+    [Result.URL, Result.URL, "dataURL", "dataURL"],
+
+  // data: to bare mapping is disabled.
+  "data:text/javascript,log.push('data:to-bare')":
+    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
+};
+
+doTests(importMap, null, tests);
+</script>
+<body>
diff --git a/import-maps/core/http.sub.tentative.html b/import-maps/core/http.sub.tentative.html
new file mode 100644
index 00000000000000..a33a0945e31671
--- /dev/null
+++ b/import-maps/core/http.sub.tentative.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="../resources/test-helper.js"></script>
+
+<script>
+// "bare/..." (i.e. without leading "./") are bare specifiers
+// (not relative paths).
+const importMap = `
+{
+  "imports": {
+    "bare": "../resources/log.js?pipe=sub&name=bare",
+
+    "../resources/log.js?pipe=sub&name=foo": "../resources/log.js?pipe=sub&name=bar",
+    "../resources/log.js?pipe=sub&name=cross-origin-foo": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-bar",
+    "../resources/log.js?pipe=sub&name=to-data": "data:text/javascript,log.push('dataURL')",
+
+    "../resources/log.js?pipe=sub&name=to-bare": "bare"
+  }
+}
+`;
+
+const tests = {
+  // Arrays of expected results for:
+  // - <script src type="module">,
+  // - <script src> (classic script),
+  // - static import, and
+  // - dynamic import.
+
+  // Currently, Chromium's implementation resolves import maps as a part of
+  // specifier resolution, and thus failure in import map resolution causes
+  // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR
+  // below. https://crbug.com/928435
+
+  // HTTP(S) to HTTP(S).
+  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=foo":
+    [Result.URL, Result.URL, "log:bar", "log:bar"],
+  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-foo":
+    [Result.URL, Result.URL, "log:cross-origin-bar", "log:cross-origin-bar"],
+
+  // HTTP(S) to data:
+  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=to-data":
+    [Result.URL, Result.URL, "dataURL", "dataURL"],
+
+  // HTTP(S) to bare mapping is disabled.
+  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=to-bare":
+    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
+};
+
+doTests(importMap, null, tests);
+</script>
+<body>
diff --git a/import-maps/module-map-key.tentative.html b/import-maps/core/module-map-key.tentative.html
similarity index 75%
rename from import-maps/module-map-key.tentative.html
rename to import-maps/core/module-map-key.tentative.html
index 13bd122c673144..6f2f18a02e12a9 100644
--- a/import-maps/module-map-key.tentative.html
+++ b/import-maps/core/module-map-key.tentative.html
@@ -5,7 +5,7 @@
 <script type="importmap">
 {
   "imports": {
-    "./resources/log.js?pipe=sub&name=A": "./resources/log.js?pipe=sub&name=B"
+    "../resources/log.js?pipe=sub&name=A": "../resources/log.js?pipe=sub&name=B"
   }
 }
 </script>
@@ -17,8 +17,8 @@
 // key will become the URL/specifier BEFORE import map resolution.
 // https://crbug.com/928435
 promise_test(() => {
-  return import("./resources/log.js?pipe=sub&name=A")
-    .then(() => import("./resources/log.js?pipe=sub&name=B"))
+  return import("../resources/log.js?pipe=sub&name=A")
+    .then(() => import("../resources/log.js?pipe=sub&name=B"))
     .then(() => assert_array_equals(log, ["log:B"]))
   },
   "Module map's key is the URL after import map resolution");
diff --git a/import-maps/core/static-import.js b/import-maps/core/static-import.js
new file mode 100644
index 00000000000000..1686fc123a798b
--- /dev/null
+++ b/import-maps/core/static-import.js
@@ -0,0 +1 @@
+import "{{GET[url]}}";
diff --git a/import-maps/resources/test-helper.js b/import-maps/resources/test-helper.js
index 2447bfb94353e1..f21ad935baa5e1 100644
--- a/import-maps/resources/test-helper.js
+++ b/import-maps/resources/test-helper.js
@@ -153,7 +153,7 @@ function testStaticImport(importMapString, importMapBaseURL, specifier, expected
     const script = document.createElement("script");
     script.setAttribute("type", "module");
     script.setAttribute("src",
-        "/import-maps/static-import.js?pipe=sub(none)&url=" +
+        "static-import.js?pipe=sub(none)&url=" +
         encodeURIComponent("${specifier}"));
     script.addEventListener("load", handlers[Handler.ScriptLoadEvent]);
     script.addEventListener("error", handlers[Handler.ScriptErrorEvent]);