From 08253d6aee061ad15dbe0b09664358eca34a94c6 Mon Sep 17 00:00:00 2001
From: Sam Atkins <sam@ladybird.org>
Date: Tue, 5 Nov 2024 12:53:30 +0000
Subject: [PATCH] Tests/LibWeb: Move assets used by multiple test types into
 Assets/

Having to go through multiple levels of .. is not ideal, but less odd
than reaching into another test type's data files.
---
 Tests/LibWeb/{Layout/input => Assets}/120.png       | Bin
 Tests/LibWeb/{Ref/assets => Assets}/HashSans.woff   | Bin
 .../Layout/input/aspect-ratio-auto-and-ratio.html   |   2 +-
 Tests/LibWeb/Layout/input/aspect-ratio-auto.html    |   2 +-
 .../Layout/input/aspect-ratio-degenerate-ratio.html |   2 +-
 Tests/LibWeb/Layout/input/aspect-ratio-ratio.html   |   2 +-
 ...centage-main-size-during-min-content-sizing.html |   2 +-
 ...size-contribution-with-main-size-constraint.html |   2 +-
 .../Layout/input/height-min-max-fit-content.html    |   6 +++---
 .../img-with-box-sizing-border-box-and-padding.html |   2 +-
 ...width-and-indefinite-containing-block-width.html |   2 +-
 ...idth-and-min-content-containing-block-width.html |   2 +-
 Tests/LibWeb/Layout/input/input-image-to-text.html  |   2 +-
 Tests/LibWeb/Layout/input/input-image.html          |   6 +++---
 .../Layout/input/picture-source-media-query.html    |   2 +-
 ...st-available-font-should-include-whitespace.html |   2 +-
 Tests/LibWeb/Ref/reference/unicode-range-ref.html   |   2 +-
 Tests/LibWeb/Ref/space-glyph-width.html             |   2 +-
 Tests/LibWeb/Ref/unicode-range.html                 |   2 +-
 .../Text/input/HTML/form-image-submission.html      |   2 +-
 .../LibWeb/Text/input/css/FontFace-binary-data.html |   2 +-
 Tests/LibWeb/Text/input/css/FontFace-load-urls.html |   2 +-
 Tests/LibWeb/Text/input/css/FontFaceSet-load.html   |   2 +-
 .../LibWeb/Text/input/css/FontFaceSet-setlike.html  |   2 +-
 Tests/LibWeb/Text/input/input-image.html            |   2 +-
 25 files changed, 27 insertions(+), 27 deletions(-)
 rename Tests/LibWeb/{Layout/input => Assets}/120.png (100%)
 rename Tests/LibWeb/{Ref/assets => Assets}/HashSans.woff (100%)

diff --git a/Tests/LibWeb/Layout/input/120.png b/Tests/LibWeb/Assets/120.png
similarity index 100%
rename from Tests/LibWeb/Layout/input/120.png
rename to Tests/LibWeb/Assets/120.png
diff --git a/Tests/LibWeb/Ref/assets/HashSans.woff b/Tests/LibWeb/Assets/HashSans.woff
similarity index 100%
rename from Tests/LibWeb/Ref/assets/HashSans.woff
rename to Tests/LibWeb/Assets/HashSans.woff
diff --git a/Tests/LibWeb/Layout/input/aspect-ratio-auto-and-ratio.html b/Tests/LibWeb/Layout/input/aspect-ratio-auto-and-ratio.html
index 803806662c7..b69beb6dc11 100644
--- a/Tests/LibWeb/Layout/input/aspect-ratio-auto-and-ratio.html
+++ b/Tests/LibWeb/Layout/input/aspect-ratio-auto-and-ratio.html
@@ -4,4 +4,4 @@
         aspect-ratio: auto 2/1;
         border: 1px solid black;
     }
-</style><div></div><img src="120.png"/>
+</style><div></div><img src="../../Assets/120.png"/>
diff --git a/Tests/LibWeb/Layout/input/aspect-ratio-auto.html b/Tests/LibWeb/Layout/input/aspect-ratio-auto.html
index 7de1e453a0b..15f24842856 100644
--- a/Tests/LibWeb/Layout/input/aspect-ratio-auto.html
+++ b/Tests/LibWeb/Layout/input/aspect-ratio-auto.html
@@ -4,4 +4,4 @@
         aspect-ratio: auto;
         border: 1px solid black;
     }
-</style><div></div><img src="120.png"/>
+</style><div></div><img src="../../Assets/120.png"/>
diff --git a/Tests/LibWeb/Layout/input/aspect-ratio-degenerate-ratio.html b/Tests/LibWeb/Layout/input/aspect-ratio-degenerate-ratio.html
index 291fad94b64..ee8b148fa92 100644
--- a/Tests/LibWeb/Layout/input/aspect-ratio-degenerate-ratio.html
+++ b/Tests/LibWeb/Layout/input/aspect-ratio-degenerate-ratio.html
@@ -3,4 +3,4 @@
         width: 200px;
         aspect-ratio: 0/1;
     }
-</style><img src="120.png"/>
\ No newline at end of file
+</style><img src="../../Assets/120.png"/>
\ No newline at end of file
diff --git a/Tests/LibWeb/Layout/input/aspect-ratio-ratio.html b/Tests/LibWeb/Layout/input/aspect-ratio-ratio.html
index 9b946e4116b..601fa9476f1 100644
--- a/Tests/LibWeb/Layout/input/aspect-ratio-ratio.html
+++ b/Tests/LibWeb/Layout/input/aspect-ratio-ratio.html
@@ -4,4 +4,4 @@
         aspect-ratio: 2/1;
         border: 1px solid black;
     }
-</style><div></div><img src="120.png"/>
+</style><div></div><img src="../../Assets/120.png"/>
diff --git a/Tests/LibWeb/Layout/input/flex/flex-item-percentage-main-size-during-min-content-sizing.html b/Tests/LibWeb/Layout/input/flex/flex-item-percentage-main-size-during-min-content-sizing.html
index 144c04435e1..bfab65cff99 100644
--- a/Tests/LibWeb/Layout/input/flex/flex-item-percentage-main-size-during-min-content-sizing.html
+++ b/Tests/LibWeb/Layout/input/flex/flex-item-percentage-main-size-during-min-content-sizing.html
@@ -16,4 +16,4 @@
     width: 100%;
   }
 </style>
-<body><img src="../120.png">
+<body><img src="../../../Assets/120.png">
diff --git a/Tests/LibWeb/Layout/input/flex/intrinsic-cross-size-contribution-with-main-size-constraint.html b/Tests/LibWeb/Layout/input/flex/intrinsic-cross-size-contribution-with-main-size-constraint.html
index 33a040b1be6..e6a61f09faf 100644
--- a/Tests/LibWeb/Layout/input/flex/intrinsic-cross-size-contribution-with-main-size-constraint.html
+++ b/Tests/LibWeb/Layout/input/flex/intrinsic-cross-size-contribution-with-main-size-constraint.html
@@ -6,4 +6,4 @@
         left: 0px;
     }
     img { max-width: 50px; }
-</style><body><img src="../120.png">
\ No newline at end of file
+</style><body><img src="../../../Assets/120.png">
\ No newline at end of file
diff --git a/Tests/LibWeb/Layout/input/height-min-max-fit-content.html b/Tests/LibWeb/Layout/input/height-min-max-fit-content.html
index 40d818d9f50..b0652ff79bc 100644
--- a/Tests/LibWeb/Layout/input/height-min-max-fit-content.html
+++ b/Tests/LibWeb/Layout/input/height-min-max-fit-content.html
@@ -3,6 +3,6 @@
 .max { height: max-content; }
 .fit { height: fit-content; }
 </style>
-<img class="min" src="120.png" width="120" height="60" />
-<img class="max" src="120.png" width="120" height="60" />
-<img class="fit" src="120.png" width="120" height="60" />
+<img class="min" src="../../Assets/120.png" width="120" height="60" />
+<img class="max" src="../../Assets/120.png" width="120" height="60" />
+<img class="fit" src="../../Assets/120.png" width="120" height="60" />
diff --git a/Tests/LibWeb/Layout/input/img-with-box-sizing-border-box-and-padding.html b/Tests/LibWeb/Layout/input/img-with-box-sizing-border-box-and-padding.html
index 1ba88429043..b4a76613c2f 100644
--- a/Tests/LibWeb/Layout/input/img-with-box-sizing-border-box-and-padding.html
+++ b/Tests/LibWeb/Layout/input/img-with-box-sizing-border-box-and-padding.html
@@ -10,4 +10,4 @@ img {
 .with-width {
     width: 100px;
 }
-</style><img class="with-height" src="120.png"><img class="with-width" src="120.png">
+</style><img class="with-height" src="../../Assets/120.png"><img class="with-width" src="../../Assets/120.png">
diff --git a/Tests/LibWeb/Layout/input/img-with-percentage-max-width-and-indefinite-containing-block-width.html b/Tests/LibWeb/Layout/input/img-with-percentage-max-width-and-indefinite-containing-block-width.html
index 20ba40233c3..a3257743764 100644
--- a/Tests/LibWeb/Layout/input/img-with-percentage-max-width-and-indefinite-containing-block-width.html
+++ b/Tests/LibWeb/Layout/input/img-with-percentage-max-width-and-indefinite-containing-block-width.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html><style>
 body { width: max-content; }
 img { max-width: 100%; }
-</style><body><div><img src="120.png">
\ No newline at end of file
+</style><body><div><img src="../../Assets/120.png">
\ No newline at end of file
diff --git a/Tests/LibWeb/Layout/input/img-with-percentage-max-width-and-min-content-containing-block-width.html b/Tests/LibWeb/Layout/input/img-with-percentage-max-width-and-min-content-containing-block-width.html
index d8e3127b484..4d55fb0e773 100644
--- a/Tests/LibWeb/Layout/input/img-with-percentage-max-width-and-min-content-containing-block-width.html
+++ b/Tests/LibWeb/Layout/input/img-with-percentage-max-width-and-min-content-containing-block-width.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html><style>
 body { width: min-content; }
 img { max-width: 100%; }
-</style><body><img src="120.png">
\ No newline at end of file
+</style><body><img src="../../Assets/120.png">
\ No newline at end of file
diff --git a/Tests/LibWeb/Layout/input/input-image-to-text.html b/Tests/LibWeb/Layout/input/input-image-to-text.html
index 18543e0090d..aa929fcf026 100644
--- a/Tests/LibWeb/Layout/input/input-image-to-text.html
+++ b/Tests/LibWeb/Layout/input/input-image-to-text.html
@@ -1,4 +1,4 @@
-<input type="image" src="120.png" value="120.png" width="120" height="120" />
+<input type="image" src="../../Assets/120.png" value="120.png" width="120" height="120" />
 <script type="text/javascript">
     document.addEventListener("DOMContentLoaded", () => {
         let input = document.querySelector("input");
diff --git a/Tests/LibWeb/Layout/input/input-image.html b/Tests/LibWeb/Layout/input/input-image.html
index 4a108a8f3ac..6bf6bca9e4e 100644
--- a/Tests/LibWeb/Layout/input/input-image.html
+++ b/Tests/LibWeb/Layout/input/input-image.html
@@ -1,5 +1,5 @@
 <form>
-  <input type="image" src="120.png" alt="Image not found" width="48" height="48">
-  <input type="image" src="120.png" alt="Image not found" width="64" height="64">
-  <input type="image" src="120.png" alt="Image not found" width="128" height="256">
+  <input type="image" src="../../Assets/120.png" alt="Image not found" width="48" height="48">
+  <input type="image" src="../../Assets/120.png" alt="Image not found" width="64" height="64">
+  <input type="image" src="../../Assets/120.png" alt="Image not found" width="128" height="256">
 </form>
diff --git a/Tests/LibWeb/Layout/input/picture-source-media-query.html b/Tests/LibWeb/Layout/input/picture-source-media-query.html
index fbc76603377..dbcf4bb0ed0 100644
--- a/Tests/LibWeb/Layout/input/picture-source-media-query.html
+++ b/Tests/LibWeb/Layout/input/picture-source-media-query.html
@@ -3,7 +3,7 @@
 
 <body>
     <picture>
-        <source media="(max-width: 600px)" srcset="120.png">
+        <source media="(max-width: 600px)" srcset="../../Assets/120.png">
         <img src="400.png">
     </picture>
 </body>
diff --git a/Tests/LibWeb/Ref/first-available-font-should-include-whitespace.html b/Tests/LibWeb/Ref/first-available-font-should-include-whitespace.html
index 953524e9bd2..62a9a41ab06 100644
--- a/Tests/LibWeb/Ref/first-available-font-should-include-whitespace.html
+++ b/Tests/LibWeb/Ref/first-available-font-should-include-whitespace.html
@@ -8,7 +8,7 @@
     }
     @font-face {
         font-family: 'HashFont';
-        src: url('assets/HashSans.woff');
+        src: url('../Assets/HashSans.woff');
         unicode-range: U+0;
     }
 </style><div class="test">hello friends
diff --git a/Tests/LibWeb/Ref/reference/unicode-range-ref.html b/Tests/LibWeb/Ref/reference/unicode-range-ref.html
index 8ed0415f0d3..f93f1f27900 100644
--- a/Tests/LibWeb/Ref/reference/unicode-range-ref.html
+++ b/Tests/LibWeb/Ref/reference/unicode-range-ref.html
@@ -4,7 +4,7 @@
     <style>
         @font-face {
             font-family: 'HashFont';
-            src: url('../assets/HashSans.woff');
+            src: url('../../Assets/HashSans.woff');
         }
 
         .hash-font {
diff --git a/Tests/LibWeb/Ref/space-glyph-width.html b/Tests/LibWeb/Ref/space-glyph-width.html
index 85842357277..a6eb8271e73 100644
--- a/Tests/LibWeb/Ref/space-glyph-width.html
+++ b/Tests/LibWeb/Ref/space-glyph-width.html
@@ -5,7 +5,7 @@
     <style>
         @font-face {
             font-family: 'HashFont';
-            src: url('assets/HashSans.woff');
+            src: url('../Assets/HashSans.woff');
             unicode-range: U+0;
         }
 
diff --git a/Tests/LibWeb/Ref/unicode-range.html b/Tests/LibWeb/Ref/unicode-range.html
index c17d00a3094..2a9b59d6edc 100644
--- a/Tests/LibWeb/Ref/unicode-range.html
+++ b/Tests/LibWeb/Ref/unicode-range.html
@@ -5,7 +5,7 @@
     <style>
         @font-face {
             font-family: 'HashFont';
-            src: url('assets/HashSans.woff');
+            src: url('../Assets/HashSans.woff');
             unicode-range: U+0041; /* Only letter 'A' */
         }
 
diff --git a/Tests/LibWeb/Text/input/HTML/form-image-submission.html b/Tests/LibWeb/Text/input/HTML/form-image-submission.html
index 37bb7a9984a..c2a40f38a0e 100644
--- a/Tests/LibWeb/Text/input/HTML/form-image-submission.html
+++ b/Tests/LibWeb/Text/input/HTML/form-image-submission.html
@@ -14,7 +14,7 @@
 <dialog id="dialog" open>
     <form id="form" method="dialog">
         <input value="well hello friends!" />
-        <input id="image" type="image" src="../../../Layout/input/120.png" />
+        <input id="image" type="image" src="../../../Assets/120.png" />
     </form>
 </dialog>
 <script src="../include.js"></script>
diff --git a/Tests/LibWeb/Text/input/css/FontFace-binary-data.html b/Tests/LibWeb/Text/input/css/FontFace-binary-data.html
index 973296b1aab..1e4dc40d201 100644
--- a/Tests/LibWeb/Text/input/css/FontFace-binary-data.html
+++ b/Tests/LibWeb/Text/input/css/FontFace-binary-data.html
@@ -21,7 +21,7 @@
                 println(`zeroBytesFace.family: ${zeroBytesFace.family}`); // "Empty Font"
             });
 
-        const fontData = await fetch("../../../Ref/assets/HashSans.woff").then(
+        const fontData = await fetch("../../../Assets/HashSans.woff").then(
             response => response.arrayBuffer(),
             (reason) => {
                 println(`FAILED to fetch font from local file ${reason}`);
diff --git a/Tests/LibWeb/Text/input/css/FontFace-load-urls.html b/Tests/LibWeb/Text/input/css/FontFace-load-urls.html
index dee0c5c6c6f..546f953f00a 100644
--- a/Tests/LibWeb/Text/input/css/FontFace-load-urls.html
+++ b/Tests/LibWeb/Text/input/css/FontFace-load-urls.html
@@ -5,7 +5,7 @@
         // FIXME: Surely there's a better way to get this font URL
         let fontUrl = new URL(location.href);
         fontUrl.search = "";
-        fontUrl += "/../../../../Ref/assets/HashSans.woff";
+        fontUrl += "/../../../../Assets/HashSans.woff";
 
         const hashSans = new FontFace("Hash Sans", `url(${fontUrl})`);
         println(`hashSans.family: ${hashSans.family}`);
diff --git a/Tests/LibWeb/Text/input/css/FontFaceSet-load.html b/Tests/LibWeb/Text/input/css/FontFaceSet-load.html
index af79e81d9b7..23553e71b05 100644
--- a/Tests/LibWeb/Text/input/css/FontFaceSet-load.html
+++ b/Tests/LibWeb/Text/input/css/FontFaceSet-load.html
@@ -3,7 +3,7 @@
     asyncTest(async done => {
         const fontFaceSet = document.fonts;
 
-        const fontFace = new FontFace("Hash Sans", "url(../../../../Ref/assets/HashSans.woff)");
+        const fontFace = new FontFace("Hash Sans", "url(../../../../Assets/HashSans.woff)");
         fontFaceSet.add(fontFace);
 
         try {
diff --git a/Tests/LibWeb/Text/input/css/FontFaceSet-setlike.html b/Tests/LibWeb/Text/input/css/FontFaceSet-setlike.html
index cad44d85d80..027a0207d07 100644
--- a/Tests/LibWeb/Text/input/css/FontFaceSet-setlike.html
+++ b/Tests/LibWeb/Text/input/css/FontFaceSet-setlike.html
@@ -3,7 +3,7 @@
 <script>
     test(() => {
         const fontFaceSet = document.fonts;
-        const fontFace = new FontFace("Hash Sans", 'url(../../../../Ref/assets/HashSans.woff)');
+        const fontFace = new FontFace("Hash Sans", 'url(../../../../Assets/HashSans.woff)');
 
         println("-- Empty FontFaceSet --");
         println(`fontFaceSet.size: ${fontFaceSet.size}`);
diff --git a/Tests/LibWeb/Text/input/input-image.html b/Tests/LibWeb/Text/input/input-image.html
index b7d0e405846..10ecc5735e0 100644
--- a/Tests/LibWeb/Text/input/input-image.html
+++ b/Tests/LibWeb/Text/input/input-image.html
@@ -1,6 +1,6 @@
 <script src="./include.js"></script>
 <script type="text/javascript">
-    const SOURCES = ["../../Layout/input/120.png", "file:///i-do-no-exist-i-swear.png"];
+    const SOURCES = ["../../Assets/120.png", "file:///i-do-no-exist-i-swear.png"];
 
     const runTest = source => {
         let input = document.createElement("input");