Rename all files used in ResourceLoaderImageModule tests to fake names

Using names that match real OOjs UI icons is confusing when trying to
find usages of the real icons and when debugging the tests.

Bug: T166730
Change-Id: Ibb97c0347476efc95f1a50c97822d7dab19737f2

diff --git a/tests/phpunit/data/resourceloader/abc.gif b/tests/phpunit/data/resourceloader/abc.gif
new file mode 100644 (file)
index 0000000..5f454ca
Binary files /dev/null and b/tests/phpunit/data/resourceloader/abc.gif differ

diff --git a/tests/phpunit/data/resourceloader/add.gif b/tests/phpunit/data/resourceloader/add.gif
deleted file mode 100644 (file)
index 5f454ca..0000000
Binary files a/tests/phpunit/data/resourceloader/add.gif and /dev/null differ

diff --git a/tests/phpunit/data/resourceloader/bold-a.svg b/tests/phpunit/data/resourceloader/bold-a.svg
deleted file mode 100644 (file)
index 4b82877..0000000
--- a/tests/phpunit/data/resourceloader/bold-a.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <g id="bold-a">
-        <path d="M16 18h3l-5-12h-3l-5 12h3l1.25-3h4.5l1.25 3zm-4.917-5l1.417-3.4 1.417 3.4h-2.834z"/>
-    </g>
-</svg>

diff --git a/tests/phpunit/data/resourceloader/bold-b.svg b/tests/phpunit/data/resourceloader/bold-b.svg
deleted file mode 100644 (file)
index 4f64820..0000000
--- a/tests/phpunit/data/resourceloader/bold-b.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <g id="bold-b">
-        <path id="b" d="M7 18h6c2 0 4-1 4-3 0-1.064.011-1.975-1.989-3 2-.975 1.989-1.935 1.989-3 0-2-2-3-4-3h-6v12zm7-8c0 1.001 0 1-2 1h-2v-3h2c2 0 2 0 2 1v1zm-2 6h-2v-3h2c2 0 2 0 2 1v1s0 1-2 1z"/>
-    </g>
-</svg>

diff --git a/tests/phpunit/data/resourceloader/bold-f.svg b/tests/phpunit/data/resourceloader/bold-f.svg
deleted file mode 100644 (file)
index 357d2e5..0000000
--- a/tests/phpunit/data/resourceloader/bold-f.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <g id="bold-f">
-        <path id="f" d="M16 8v-2h-8v12h3v-5h4v-2h-4v-3z"/>
-    </g>
-</svg>

diff --git a/tests/phpunit/data/resourceloader/def.svg b/tests/phpunit/data/resourceloader/def.svg
new file mode 100644 (file)
index 0000000..6ad7917
--- /dev/null
+++ b/tests/phpunit/data/resourceloader/def.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <g id="remove">
+        <path id="trash-can" d="M12 10h-1v6h1v-6zm-2 0h-1v6h1v-6zm4 0h-1v6h1v-6zm0-4v-1h-5v1h-3v3h1v7.966l1 1.031v-.074.077h6.984l.016-.018v.015l1-1.031v-7.966h1v-3h-3zm1 11h-7v-8h7v8zm1-9h-9v-1h9v1z"/>
+    </g>
+</svg>

diff --git a/tests/phpunit/data/resourceloader/def_variantize.svg b/tests/phpunit/data/resourceloader/def_variantize.svg
new file mode 100644 (file)
index 0000000..bcbe871
--- /dev/null
+++ b/tests/phpunit/data/resourceloader/def_variantize.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g fill="red">
+    <g xmlns:default="http://www.w3.org/2000/svg" id="remove">
+        <path id="trash-can" d="M12 10h-1v6h1v-6zm-2 0h-1v6h1v-6zm4 0h-1v6h1v-6zm0-4v-1h-5v1h-3v3h1v7.966l1 1.031v-.074.077h6.984l.016-.018v.015l1-1.031v-7.966h1v-3h-3zm1 11h-7v-8h7v8zm1-9h-9v-1h9v1z"/>
+    </g>
+</g></svg>

diff --git a/tests/phpunit/data/resourceloader/ghi.svg b/tests/phpunit/data/resourceloader/ghi.svg
new file mode 100644 (file)
index 0000000..02b4e38
--- /dev/null
+++ b/tests/phpunit/data/resourceloader/ghi.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M16.5 13.1l-8.9 8.9c-.8-.8-.8-2 0-2.8l6.1-6.1-6-6.1c-.8-.8-.8-2 0-2.8l8.8 8.9z" id="path108"/>
+</svg>

diff --git a/tests/phpunit/data/resourceloader/ghi_massage.svg b/tests/phpunit/data/resourceloader/ghi_massage.svg
new file mode 100644 (file)
index 0000000..bbd1a8d
--- /dev/null
+++ b/tests/phpunit/data/resourceloader/ghi_massage.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M 16.5   13.1 l -8.9   8.9 c -0.8  -0.8  -0.8  -2   0  -2.8 l 6.1  -6.1  -6  -6.1 c -0.8  -0.8  -0.8  -2   0  -2.8 l 8.8   8.9 z" id="path108"/>
+</svg>

diff --git a/tests/phpunit/data/resourceloader/help-ltr.svg b/tests/phpunit/data/resourceloader/help-ltr.svg
deleted file mode 100644 (file)
index bb2545c..0000000
--- a/tests/phpunit/data/resourceloader/help-ltr.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <g id="help">
-        <path id="circle" d="M12.001 2.085c-5.478 0-9.916 4.438-9.916 9.916 0 5.476 4.438 9.914 9.916 9.914 5.476 0 9.914-4.438 9.914-9.914 0-5.478-4.438-9.916-9.914-9.916zm.001 18c-4.465 0-8.084-3.619-8.084-8.083 0-4.465 3.619-8.084 8.084-8.084 4.464 0 8.083 3.619 8.083 8.084 0 4.464-3.619 8.083-8.083 8.083z"/>
-        <g id="question-mark">
-            <path id="top" d="M11.766 6.688c-2.5 0-3.219 2.188-3.219 2.188l1.411.854s.298-.791.901-1.229c.516-.375 1.625-.625 2.219.125.701.885-.17 1.587-1.078 2.719-.953 1.186-1 3.655-1 3.655h1.969s.135-2.318 1.041-3.381c.603-.707 1.443-1.338 1.443-2.494s-1.187-2.437-3.687-2.437z"/>
-            <path id="bottom" d="M11 16h2v2h-2z"/>
-        </g>
-    </g>
-</svg>

diff --git a/tests/phpunit/data/resourceloader/help-rtl.svg b/tests/phpunit/data/resourceloader/help-rtl.svg
deleted file mode 100644 (file)
index 255ae95..0000000
--- a/tests/phpunit/data/resourceloader/help-rtl.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <g id="help">
-        <path id="circle" d="M12.001 2.085c-5.478 0-9.916 4.438-9.916 9.916 0 5.476 4.438 9.914 9.916 9.914 5.476 0 9.914-4.438 9.914-9.914 0-5.478-4.438-9.916-9.914-9.916zm.001 18c-4.465 0-8.084-3.619-8.084-8.083 0-4.465 3.619-8.084 8.084-8.084 4.464 0 8.083 3.619 8.083 8.084 0 4.464-3.619 8.083-8.083 8.083z"/>
-        <g id="question-mark" transform="translate(24, 0) scale(-1, 1)">
-            <path id="top" d="M11.766 6.688c-2.5 0-3.219 2.188-3.219 2.188l1.411.854s.298-.791.901-1.229c.516-.375 1.625-.625 2.219.125.701.885-.17 1.587-1.078 2.719-.953 1.186-1 3.655-1 3.655h1.969s.135-2.318 1.041-3.381c.603-.707 1.443-1.338 1.443-2.494s-1.187-2.437-3.687-2.437z"/>
-            <path id="bottom" d="M11 16h2v2h-2z"/>
-        </g>
-    </g>
-</svg>

diff --git a/tests/phpunit/data/resourceloader/jkl.svg b/tests/phpunit/data/resourceloader/jkl.svg
new file mode 100644 (file)
index 0000000..f31ec09
--- /dev/null
+++ b/tests/phpunit/data/resourceloader/jkl.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M7 13.1l8.9 8.9c.8-.8.8-2 0-2.8l-6.1-6.1 6-6.1c.8-.8.8-2 0-2.8l-8.8 8.9z"/>
+</svg>

diff --git a/tests/phpunit/data/resourceloader/mno-ltr.svg b/tests/phpunit/data/resourceloader/mno-ltr.svg
new file mode 100644 (file)
index 0000000..bb2545c
--- /dev/null
+++ b/tests/phpunit/data/resourceloader/mno-ltr.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <g id="help">
+        <path id="circle" d="M12.001 2.085c-5.478 0-9.916 4.438-9.916 9.916 0 5.476 4.438 9.914 9.916 9.914 5.476 0 9.914-4.438 9.914-9.914 0-5.478-4.438-9.916-9.914-9.916zm.001 18c-4.465 0-8.084-3.619-8.084-8.083 0-4.465 3.619-8.084 8.084-8.084 4.464 0 8.083 3.619 8.083 8.084 0 4.464-3.619 8.083-8.083 8.083z"/>
+        <g id="question-mark">
+            <path id="top" d="M11.766 6.688c-2.5 0-3.219 2.188-3.219 2.188l1.411.854s.298-.791.901-1.229c.516-.375 1.625-.625 2.219.125.701.885-.17 1.587-1.078 2.719-.953 1.186-1 3.655-1 3.655h1.969s.135-2.318 1.041-3.381c.603-.707 1.443-1.338 1.443-2.494s-1.187-2.437-3.687-2.437z"/>
+            <path id="bottom" d="M11 16h2v2h-2z"/>
+        </g>
+    </g>
+</svg>

diff --git a/tests/phpunit/data/resourceloader/mno-rtl.svg b/tests/phpunit/data/resourceloader/mno-rtl.svg
new file mode 100644 (file)
index 0000000..255ae95
--- /dev/null
+++ b/tests/phpunit/data/resourceloader/mno-rtl.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <g id="help">
+        <path id="circle" d="M12.001 2.085c-5.478 0-9.916 4.438-9.916 9.916 0 5.476 4.438 9.914 9.916 9.914 5.476 0 9.914-4.438 9.914-9.914 0-5.478-4.438-9.916-9.914-9.916zm.001 18c-4.465 0-8.084-3.619-8.084-8.083 0-4.465 3.619-8.084 8.084-8.084 4.464 0 8.083 3.619 8.083 8.084 0 4.464-3.619 8.083-8.083 8.083z"/>
+        <g id="question-mark" transform="translate(24, 0) scale(-1, 1)">
+            <path id="top" d="M11.766 6.688c-2.5 0-3.219 2.188-3.219 2.188l1.411.854s.298-.791.901-1.229c.516-.375 1.625-.625 2.219.125.701.885-.17 1.587-1.078 2.719-.953 1.186-1 3.655-1 3.655h1.969s.135-2.318 1.041-3.381c.603-.707 1.443-1.338 1.443-2.494s-1.187-2.437-3.687-2.437z"/>
+            <path id="bottom" d="M11 16h2v2h-2z"/>
+        </g>
+    </g>
+</svg>

diff --git a/tests/phpunit/data/resourceloader/next.svg b/tests/phpunit/data/resourceloader/next.svg
deleted file mode 100644 (file)
index 02b4e38..0000000
--- a/tests/phpunit/data/resourceloader/next.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <path d="M16.5 13.1l-8.9 8.9c-.8-.8-.8-2 0-2.8l6.1-6.1-6-6.1c-.8-.8-.8-2 0-2.8l8.8 8.9z" id="path108"/>
-</svg>

diff --git a/tests/phpunit/data/resourceloader/next_massage.svg b/tests/phpunit/data/resourceloader/next_massage.svg
deleted file mode 100644 (file)
index bbd1a8d..0000000
--- a/tests/phpunit/data/resourceloader/next_massage.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <path d="M 16.5   13.1 l -8.9   8.9 c -0.8  -0.8  -0.8  -2   0  -2.8 l 6.1  -6.1  -6  -6.1 c -0.8  -0.8  -0.8  -2   0  -2.8 l 8.8   8.9 z" id="path108"/>
-</svg>

diff --git a/tests/phpunit/data/resourceloader/oouiimagemodule/apex/icons.json b/tests/phpunit/data/resourceloader/oouiimagemodule/apex/icons.json
index 4fe3d81..fdb4d12 100644 (file)
--- a/tests/phpunit/data/resourceloader/oouiimagemodule/apex/icons.json
+++ b/tests/phpunit/data/resourceloader/oouiimagemodule/apex/icons.json
@@ -1,6 +1,6 @@
 {
        "prefix": "oo-ui-icon",
        "images": {
-               "search": { "file": "images/icons/search.svg" }
+               "stu": { "file": "images/icons/stu.svg" }
        }
 }

diff --git a/tests/phpunit/data/resourceloader/oouiimagemodule/apex/images/icons/search.svg b/tests/phpunit/data/resourceloader/oouiimagemodule/apex/images/icons/search.svg
deleted file mode 100644 (file)
index 6952997..0000000
--- a/tests/phpunit/data/resourceloader/oouiimagemodule/apex/images/icons/search.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <g id="search">
-        <path id="magnifying-glass-apex" d="M18.87 18.375l-3.987-3.99-.286-.17a5.774 5.774 0 0 0 1.082-3.372C15.67 7.616 13.06 5 9.84 5A5.843 5.843 0 0 0 4 10.844a5.84 5.84 0 0 0 5.842 5.842c1.26 0 2.423-.403 3.377-1.08l.16.286 3.99 3.987c.32.31.91.24 1.33-.18.41-.42.49-1.01.17-1.33zM9.837 14.56a3.72 3.72 0 0 1-3.718-3.717c0-2.05 1.67-3.72 3.72-3.72s3.72 1.668 3.72 3.72a3.722 3.722 0 0 1-3.72 3.718z"/>
-    </g>
-</svg>

diff --git a/tests/phpunit/data/resourceloader/oouiimagemodule/apex/images/icons/stu.svg b/tests/phpunit/data/resourceloader/oouiimagemodule/apex/images/icons/stu.svg
new file mode 100644 (file)
index 0000000..27f14df
--- /dev/null
+++ b/tests/phpunit/data/resourceloader/oouiimagemodule/apex/images/icons/stu.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <g id="stu">
+        <path id="stu-apex" d="M18.87 18.375l-3.987-3.99-.286-.17a5.774 5.774 0 0 0 1.082-3.372C15.67 7.616 13.06 5 9.84 5A5.843 5.843 0 0 0 4 10.844a5.84 5.84 0 0 0 5.842 5.842c1.26 0 2.423-.403 3.377-1.08l.16.286 3.99 3.987c.32.31.91.24 1.33-.18.41-.42.49-1.01.17-1.33zM9.837 14.56a3.72 3.72 0 0 1-3.718-3.717c0-2.05 1.67-3.72 3.72-3.72s3.72 1.668 3.72 3.72a3.722 3.722 0 0 1-3.72 3.718z"/>
+    </g>
+</svg>

diff --git a/tests/phpunit/data/resourceloader/oouiimagemodule/wikimediaui/icons.json b/tests/phpunit/data/resourceloader/oouiimagemodule/wikimediaui/icons.json
index 4fe3d81..fdb4d12 100644 (file)
--- a/tests/phpunit/data/resourceloader/oouiimagemodule/wikimediaui/icons.json
+++ b/tests/phpunit/data/resourceloader/oouiimagemodule/wikimediaui/icons.json
@@ -1,6 +1,6 @@
 {
        "prefix": "oo-ui-icon",
        "images": {
-               "search": { "file": "images/icons/search.svg" }
+               "stu": { "file": "images/icons/stu.svg" }
        }
 }

diff --git a/tests/phpunit/data/resourceloader/oouiimagemodule/wikimediaui/images/icons/search.svg b/tests/phpunit/data/resourceloader/oouiimagemodule/wikimediaui/images/icons/search.svg
deleted file mode 100644 (file)
index 40438ea..0000000
--- a/tests/phpunit/data/resourceloader/oouiimagemodule/wikimediaui/images/icons/search.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <g id="search">
-        <path id="magnifying-glass-mediawiki" d="M10.5 4a6.5 6.5 0 1 0 2.844 12.344L16 19c1.4 1.4 2.5 1.5 4 0l-4.438-4.438A6.426 6.426 0 0 0 17 10.5 6.5 6.5 0 0 0 10.5 4zm0 2a4.5 4.5 0 1 1 0 9 4.5 4.5 0 0 1 0-9z"/>
-    </g>
-</svg>

diff --git a/tests/phpunit/data/resourceloader/oouiimagemodule/wikimediaui/images/icons/stu.svg b/tests/phpunit/data/resourceloader/oouiimagemodule/wikimediaui/images/icons/stu.svg
new file mode 100644 (file)
index 0000000..fcaaa8d
--- /dev/null
+++ b/tests/phpunit/data/resourceloader/oouiimagemodule/wikimediaui/images/icons/stu.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <g id="stu">
+        <path id="stu-wikimediaui" d="M10.5 4a6.5 6.5 0 1 0 2.844 12.344L16 19c1.4 1.4 2.5 1.5 4 0l-4.438-4.438A6.426 6.426 0 0 0 17 10.5 6.5 6.5 0 0 0 10.5 4zm0 2a4.5 4.5 0 1 1 0 9 4.5 4.5 0 0 1 0-9z"/>
+    </g>
+</svg>

diff --git a/tests/phpunit/data/resourceloader/pqr-a.svg b/tests/phpunit/data/resourceloader/pqr-a.svg
new file mode 100644 (file)
index 0000000..4b82877
--- /dev/null
+++ b/tests/phpunit/data/resourceloader/pqr-a.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <g id="bold-a">
+        <path d="M16 18h3l-5-12h-3l-5 12h3l1.25-3h4.5l1.25 3zm-4.917-5l1.417-3.4 1.417 3.4h-2.834z"/>
+    </g>
+</svg>

diff --git a/tests/phpunit/data/resourceloader/pqr-b.svg b/tests/phpunit/data/resourceloader/pqr-b.svg
new file mode 100644 (file)
index 0000000..4f64820
--- /dev/null
+++ b/tests/phpunit/data/resourceloader/pqr-b.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <g id="bold-b">
+        <path id="b" d="M7 18h6c2 0 4-1 4-3 0-1.064.011-1.975-1.989-3 2-.975 1.989-1.935 1.989-3 0-2-2-3-4-3h-6v12zm7-8c0 1.001 0 1-2 1h-2v-3h2c2 0 2 0 2 1v1zm-2 6h-2v-3h2c2 0 2 0 2 1v1s0 1-2 1z"/>
+    </g>
+</svg>

diff --git a/tests/phpunit/data/resourceloader/pqr-f.svg b/tests/phpunit/data/resourceloader/pqr-f.svg
new file mode 100644 (file)
index 0000000..357d2e5
--- /dev/null
+++ b/tests/phpunit/data/resourceloader/pqr-f.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <g id="bold-f">
+        <path id="f" d="M16 8v-2h-8v12h3v-5h4v-2h-4v-3z"/>
+    </g>
+</svg>

diff --git a/tests/phpunit/data/resourceloader/prev.svg b/tests/phpunit/data/resourceloader/prev.svg
deleted file mode 100644 (file)
index f31ec09..0000000
--- a/tests/phpunit/data/resourceloader/prev.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <path d="M7 13.1l8.9 8.9c.8-.8.8-2 0-2.8l-6.1-6.1 6-6.1c.8-.8.8-2 0-2.8l-8.8 8.9z"/>
-</svg>

diff --git a/tests/phpunit/data/resourceloader/remove.svg b/tests/phpunit/data/resourceloader/remove.svg
deleted file mode 100644 (file)
index 6ad7917..0000000
--- a/tests/phpunit/data/resourceloader/remove.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <g id="remove">
-        <path id="trash-can" d="M12 10h-1v6h1v-6zm-2 0h-1v6h1v-6zm4 0h-1v6h1v-6zm0-4v-1h-5v1h-3v3h1v7.966l1 1.031v-.074.077h6.984l.016-.018v.015l1-1.031v-7.966h1v-3h-3zm1 11h-7v-8h7v8zm1-9h-9v-1h9v1z"/>
-    </g>
-</svg>

diff --git a/tests/phpunit/data/resourceloader/remove_variantize.svg b/tests/phpunit/data/resourceloader/remove_variantize.svg
deleted file mode 100644 (file)
index bcbe871..0000000
--- a/tests/phpunit/data/resourceloader/remove_variantize.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g fill="red">
-    <g xmlns:default="http://www.w3.org/2000/svg" id="remove">
-        <path id="trash-can" d="M12 10h-1v6h1v-6zm-2 0h-1v6h1v-6zm4 0h-1v6h1v-6zm0-4v-1h-5v1h-3v3h1v7.966l1 1.031v-.074.077h6.984l.016-.018v.015l1-1.031v-7.966h1v-3h-3zm1 11h-7v-8h7v8zm1-9h-9v-1h9v1z"/>
-    </g>
-</g></svg>

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php
index 0015486..f53cd06 100644 (file)
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderImageModuleTest.php
@@ -8,32 +8,32 @@ use Wikimedia\TestingAccessWrapper;
 class ResourceLoaderImageModuleTest extends ResourceLoaderTestCase {
 
        public static $commonImageData = [
-               'add' => 'add.gif',
-               'remove' => [
-                       'file' => 'remove.svg',
+               'abc' => 'abc.gif',
+               'def' => [
+                       'file' => 'def.svg',
                        'variants' => [ 'destructive' ],
                ],
-               'next' => [
+               'ghi' => [
                        'file' => [
-                               'ltr' => 'next.svg',
-                               'rtl' => 'prev.svg'
+                               'ltr' => 'ghi.svg',
+                               'rtl' => 'jkl.svg'
                        ],
                ],
-               'help' => [
+               'mno' => [
                        'file' => [
-                               'ltr' => 'help-ltr.svg',
-                               'rtl' => 'help-rtl.svg',
+                               'ltr' => 'mno-ltr.svg',
+                               'rtl' => 'mno-rtl.svg',
                                'lang' => [
-                                       'he' => 'help-ltr.svg',
+                                       'he' => 'mno-ltr.svg',
                                ]
                        ],
                ],
-               'bold' => [
+               'pqr' => [
                        'file' => [
-                               'default' => 'bold-a.svg',
+                               'default' => 'pqr-a.svg',
                                'lang' => [
-                                       'en' => 'bold-b.svg',
-                                       'ar,de' => 'bold-f.svg',
+                                       'en' => 'pqr-b.svg',
+                                       'ar,de' => 'pqr-f.svg',
                                ]
                        ],
                ]
@@ -64,37 +64,37 @@ class ResourceLoaderImageModuleTest extends ResourceLoaderTestCase {
                                        'variants' => self::$commonImageVariants,
                                        'images' => self::$commonImageData,
                                ],
-                               '.oo-ui-icon-add {
+                               '.oo-ui-icon-abc {
        ...
 }
-.oo-ui-icon-add-invert {
+.oo-ui-icon-abc-invert {
        ...
 }
-.oo-ui-icon-remove {
+.oo-ui-icon-def {
        ...
 }
-.oo-ui-icon-remove-invert {
+.oo-ui-icon-def-invert {
        ...
 }
-.oo-ui-icon-remove-destructive {
+.oo-ui-icon-def-destructive {
        ...
 }
-.oo-ui-icon-next {
+.oo-ui-icon-ghi {
        ...
 }
-.oo-ui-icon-next-invert {
+.oo-ui-icon-ghi-invert {
        ...
 }
-.oo-ui-icon-help {
+.oo-ui-icon-mno {
        ...
 }
-.oo-ui-icon-help-invert {
+.oo-ui-icon-mno-invert {
        ...
 }
-.oo-ui-icon-bold {
+.oo-ui-icon-pqr {
        ...
 }
-.oo-ui-icon-bold-invert {
+.oo-ui-icon-pqr-invert {
        ...
 }',
                        ],
@@ -107,37 +107,37 @@ class ResourceLoaderImageModuleTest extends ResourceLoaderTestCase {
                                        'variants' => self::$commonImageVariants,
                                        'images' => self::$commonImageData,
                                ],
-                               '.mw-ui-icon-add:after, .mw-ui-icon-add:before {
+                               '.mw-ui-icon-abc:after, .mw-ui-icon-abc:before {
        ...
 }
-.mw-ui-icon-add-invert:after, .mw-ui-icon-add-invert:before {
+.mw-ui-icon-abc-invert:after, .mw-ui-icon-abc-invert:before {
        ...
 }
-.mw-ui-icon-remove:after, .mw-ui-icon-remove:before {
+.mw-ui-icon-def:after, .mw-ui-icon-def:before {
        ...
 }
-.mw-ui-icon-remove-invert:after, .mw-ui-icon-remove-invert:before {
+.mw-ui-icon-def-invert:after, .mw-ui-icon-def-invert:before {
        ...
 }
-.mw-ui-icon-remove-destructive:after, .mw-ui-icon-remove-destructive:before {
+.mw-ui-icon-def-destructive:after, .mw-ui-icon-def-destructive:before {
        ...
 }
-.mw-ui-icon-next:after, .mw-ui-icon-next:before {
+.mw-ui-icon-ghi:after, .mw-ui-icon-ghi:before {
        ...
 }
-.mw-ui-icon-next-invert:after, .mw-ui-icon-next-invert:before {
+.mw-ui-icon-ghi-invert:after, .mw-ui-icon-ghi-invert:before {
        ...
 }
-.mw-ui-icon-help:after, .mw-ui-icon-help:before {
+.mw-ui-icon-mno:after, .mw-ui-icon-mno:before {
        ...
 }
-.mw-ui-icon-help-invert:after, .mw-ui-icon-help-invert:before {
+.mw-ui-icon-mno-invert:after, .mw-ui-icon-mno-invert:before {
        ...
 }
-.mw-ui-icon-bold:after, .mw-ui-icon-bold:before {
+.mw-ui-icon-pqr:after, .mw-ui-icon-pqr:before {
        ...
 }
-.mw-ui-icon-bold-invert:after, .mw-ui-icon-bold-invert:before {
+.mw-ui-icon-pqr-invert:after, .mw-ui-icon-pqr-invert:before {
        ...
 }',
                        ],

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php
index 84b56d4..aea2776 100644 (file)
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderImageTest.php
@@ -29,20 +29,20 @@ class ResourceLoaderImageTest extends ResourceLoaderTestCase {
 
        public static function provideGetPath() {
                return [
-                       [ 'add', 'en', 'add.gif' ],
-                       [ 'add', 'he', 'add.gif' ],
-                       [ 'remove', 'en', 'remove.svg' ],
-                       [ 'remove', 'he', 'remove.svg' ],
-                       [ 'next', 'en', 'next.svg' ],
-                       [ 'next', 'he', 'prev.svg' ],
-                       [ 'help', 'en', 'help-ltr.svg' ],
-                       [ 'help', 'ar', 'help-rtl.svg' ],
-                       [ 'help', 'he', 'help-ltr.svg' ],
-                       [ 'bold', 'en', 'bold-b.svg' ],
-                       [ 'bold', 'de', 'bold-f.svg' ],
-                       [ 'bold', 'ar', 'bold-f.svg' ],
-                       [ 'bold', 'fr', 'bold-a.svg' ],
-                       [ 'bold', 'he', 'bold-a.svg' ],
+                       [ 'abc', 'en', 'abc.gif' ],
+                       [ 'abc', 'he', 'abc.gif' ],
+                       [ 'def', 'en', 'def.svg' ],
+                       [ 'def', 'he', 'def.svg' ],
+                       [ 'ghi', 'en', 'ghi.svg' ],
+                       [ 'ghi', 'he', 'jkl.svg' ],
+                       [ 'mno', 'en', 'mno-ltr.svg' ],
+                       [ 'mno', 'ar', 'mno-rtl.svg' ],
+                       [ 'mno', 'he', 'mno-ltr.svg' ],
+                       [ 'pqr', 'en', 'pqr-b.svg' ],
+                       [ 'pqr', 'de', 'pqr-f.svg' ],
+                       [ 'pqr', 'ar', 'pqr-f.svg' ],
+                       [ 'pqr', 'fr', 'pqr-a.svg' ],
+                       [ 'pqr', 'he', 'pqr-a.svg' ],
                ];
        }
 
@@ -74,11 +74,11 @@ class ResourceLoaderImageTest extends ResourceLoaderTestCase {
         * @covers ResourceLoaderImage::getMimeType
         */
        public function testGetExtension() {
-               $image = $this->getTestImage( 'remove' );
+               $image = $this->getTestImage( 'def' );
                $this->assertEquals( $image->getExtension(), 'svg' );
                $this->assertEquals( $image->getExtension( 'original' ), 'svg' );
                $this->assertEquals( $image->getExtension( 'rasterized' ), 'png' );
-               $image = $this->getTestImage( 'add' );
+               $image = $this->getTestImage( 'abc' );
                $this->assertEquals( $image->getExtension(), 'gif' );
                $this->assertEquals( $image->getExtension( 'original' ), 'gif' );
                $this->assertEquals( $image->getExtension( 'rasterized' ), 'gif' );
@@ -92,9 +92,9 @@ class ResourceLoaderImageTest extends ResourceLoaderTestCase {
        public function testGetImageData() {
                $context = $this->getResourceLoaderContext();
 
-               $image = $this->getTestImage( 'remove' );
-               $data = file_get_contents( $this->imagesPath . '/remove.svg' );
-               $dataConstructive = file_get_contents( $this->imagesPath . '/remove_variantize.svg' );
+               $image = $this->getTestImage( 'def' );
+               $data = file_get_contents( $this->imagesPath . '/def.svg' );
+               $dataConstructive = file_get_contents( $this->imagesPath . '/def_variantize.svg' );
                $this->assertEquals( $image->getImageData( $context, null, 'original' ), $data );
                $this->assertEquals(
                        $image->getImageData( $context, 'destructive', 'original' ),
@@ -103,8 +103,8 @@ class ResourceLoaderImageTest extends ResourceLoaderTestCase {
                // Stub, since we don't know if we even have a SVG handler, much less what exactly it'll output
                $this->assertEquals( $image->getImageData( $context, null, 'rasterized' ), 'RASTERIZESTUB' );
 
-               $image = $this->getTestImage( 'add' );
-               $data = file_get_contents( $this->imagesPath . '/add.gif' );
+               $image = $this->getTestImage( 'abc' );
+               $data = file_get_contents( $this->imagesPath . '/abc.gif' );
                $this->assertEquals( $image->getImageData( $context, null, 'original' ), $data );
                $this->assertEquals( $image->getImageData( $context, null, 'rasterized' ), $data );
        }
@@ -113,9 +113,9 @@ class ResourceLoaderImageTest extends ResourceLoaderTestCase {
         * @covers ResourceLoaderImage::massageSvgPathdata
         */
        public function testMassageSvgPathdata() {
-               $image = $this->getTestImage( 'next' );
-               $data = file_get_contents( $this->imagesPath . '/next.svg' );
-               $dataMassaged = file_get_contents( $this->imagesPath . '/next_massage.svg' );
+               $image = $this->getTestImage( 'ghi' );
+               $data = file_get_contents( $this->imagesPath . '/ghi.svg' );
+               $dataMassaged = file_get_contents( $this->imagesPath . '/ghi_massage.svg' );
                $this->assertEquals( $image->massageSvgPathdata( $data ), $dataMassaged );
        }
 }

diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderOOUIImageModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderOOUIImageModuleTest.php
index 4e482c8..491fff6 100644 (file)
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderOOUIImageModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderOOUIImageModuleTest.php
@@ -39,7 +39,7 @@ class ResourceLoaderOOUIImageModuleTest extends ResourceLoaderTestCase {
 
                $styles = $module->getStyles( $this->getResourceLoaderContext( [ 'skin' => 'fakemonobook' ] ) );
                $this->assertRegExp(
-                       '/magnifying-glass-apex/',
+                       '/stu-apex/',
                        $styles['all'],
                        'Generated styles use the non-default image (embed)'
                );
@@ -51,7 +51,7 @@ class ResourceLoaderOOUIImageModuleTest extends ResourceLoaderTestCase {
 
                $styles = $module->getStyles( $this->getResourceLoaderContext() );
                $this->assertRegExp(
-                       '/magnifying-glass-mediawiki/',
+                       '/stu-wikimediaui/',
                        $styles['all'],
                        'Generated styles use the default image (embed)'
                );