Make fast/text/font-cursive-italic-cjk.html more robust
https://bugs.webkit.org/show_bug.cgi?id=203072
Reviewed by Alexey Proskuryakov.
Instead of naming STKaiti by name, we can just use an -expected-mismatch test.
* fast/text/font-cursive-italic-cjk-2-expected.html: Removed.
* fast/text/font-cursive-italic-cjk-2.html: Removed.
* fast/text/font-cursive-italic-cjk-expected-mismatch.html: Added.
* fast/text/font-cursive-italic-cjk-expected.html: Removed.
* fast/text/font-cursive-italic-cjk.html:
* platform/mac/TestExpectations:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@251240 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b48d208..ed77912 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2019-10-17 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Make fast/text/font-cursive-italic-cjk.html more robust
+ https://bugs.webkit.org/show_bug.cgi?id=203072
+
+ Reviewed by Alexey Proskuryakov.
+
+ Instead of naming STKaiti by name, we can just use an -expected-mismatch test.
+
+ * fast/text/font-cursive-italic-cjk-2-expected.html: Removed.
+ * fast/text/font-cursive-italic-cjk-2.html: Removed.
+ * fast/text/font-cursive-italic-cjk-expected-mismatch.html: Added.
+ * fast/text/font-cursive-italic-cjk-expected.html: Removed.
+ * fast/text/font-cursive-italic-cjk.html:
+ * platform/mac/TestExpectations:
+
2019-10-17 Charlie Turner <cturner@igalia.com>
[GStreamer] media/video-seek-after-end.html is no longer flakey
diff --git a/LayoutTests/fast/text/font-cursive-italic-cjk-2-expected.html b/LayoutTests/fast/text/font-cursive-italic-cjk-2-expected.html
deleted file mode 100644
index cd2d049..0000000
--- a/LayoutTests/fast/text/font-cursive-italic-cjk-2-expected.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-This test makes sure that CJK characters styled with font-family: cursive aren't italicized.
-<div>
-<span style="font-size: 50px;">Look at this character: </span><span style="font-family: 'STSongti-SC-Regular';">年</span>
-</div>
-</body>
-</html>
diff --git a/LayoutTests/fast/text/font-cursive-italic-cjk-2.html b/LayoutTests/fast/text/font-cursive-italic-cjk-2.html
deleted file mode 100644
index 67070f1..0000000
--- a/LayoutTests/fast/text/font-cursive-italic-cjk-2.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-This test makes sure that CJK characters styled with font-family: cursive aren't italicized.
-<div>
-<span style="font-size: 50px;">Look at this character: </span><span style="font-family: cursive;">年</span>
-</div>
-</body>
-</html>
diff --git a/LayoutTests/fast/text/font-cursive-italic-cjk-expected-mismatch.html b/LayoutTests/fast/text/font-cursive-italic-cjk-expected-mismatch.html
new file mode 100644
index 0000000..1088b8c
--- /dev/null
+++ b/LayoutTests/fast/text/font-cursive-italic-cjk-expected-mismatch.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+</head>
+<body>
+<!-- This test makes sure that CJK characters styled with font-family: cursive aren't italicized. -->
+<div>
+<span style="font-family: cursive; font-style: italic;">年</span>
+</div>
+</body>
+</html>
diff --git a/LayoutTests/fast/text/font-cursive-italic-cjk-expected.html b/LayoutTests/fast/text/font-cursive-italic-cjk-expected.html
deleted file mode 100644
index e88cddd..0000000
--- a/LayoutTests/fast/text/font-cursive-italic-cjk-expected.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8">
-</head>
-<body>
-This test makes sure that CJK characters styled with font-family: cursive aren't italicized.
-<div>
-<span style="font-size: 50px;">Look at this character: </span><span style="font-family: STKaiti;">年</span>
-</div>
-</body>
-</html>
diff --git a/LayoutTests/fast/text/font-cursive-italic-cjk.html b/LayoutTests/fast/text/font-cursive-italic-cjk.html
index 67070f1..85c89e7 100644
--- a/LayoutTests/fast/text/font-cursive-italic-cjk.html
+++ b/LayoutTests/fast/text/font-cursive-italic-cjk.html
@@ -4,9 +4,9 @@
<meta charset="utf-8">
</head>
<body>
-This test makes sure that CJK characters styled with font-family: cursive aren't italicized.
+<!-- This test makes sure that CJK characters styled with font-family: cursive aren't italicized. -->
<div>
-<span style="font-size: 50px;">Look at this character: </span><span style="font-family: cursive;">年</span>
+<span style="font-family: cursive;">年</span>
</div>
</body>
</html>
diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
index 4993d8d..6d1c34f 100644
--- a/LayoutTests/platform/mac/TestExpectations
+++ b/LayoutTests/platform/mac/TestExpectations
@@ -1170,10 +1170,6 @@
# These tests hardcode platform-specific font aliases.
webkit.org/b/158649 [ Sierra+ ] fast/text/chinese-font-name-aliases-2.html [ ImageOnlyFailure ]
-# fast/text/font-cursive-italic-cjk.html can be deleted when Catalina is the oldest supported OS
-[ Sierra HighSierra Mojave ] fast/text/font-cursive-italic-cjk.html [ Skip ]
-[ Catalina+ ] fast/text/font-cursive-italic-cjk-2.html [ ImageOnlyFailure ]
-
webkit.org/b/158889 media/video-controls-show-on-kb-or-ax-event.html [ Pass Failure Timeout ]
[ Sierra+ ] fast/css/appearance-apple-pay-button.html [ Pass ]
