From 5b8c62476d1bee2a8fe344a8862dae4b2e9a81da Mon Sep 17 00:00:00 2001
From: Ian Fischer <iansf@google.com>
Date: Mon, 29 Jun 2015 14:57:58 -0700
Subject: [PATCH] Fix tests broken by default text color change.

R=abarth@chromium.org, ianh@google.com

Review URL: https://codereview.chromium.org/1215023003.
---
 ...ound-opaque-clipped-gradients-expected.txt |  9 -----
 .../background-opaque-clipped-gradients.sky   | 17 ----------
 .../clipping/clipping-transforms-expected.sky | 14 --------
 .../tests/clipping/clipping-transforms.sky    | 28 ---------------
 .../reftest-mismatch-expected-mismatch.sky    |  5 +++
 .../tests/harness/reftest-mismatch.sky        |  5 +++
 .../tests/lowlevel/iframe-expected.txt        | 21 ------------
 engine/src/flutter/tests/lowlevel/iframe.sky  | 15 --------
 .../tests/styles/media-queries-expected.txt   |  7 ----
 .../flutter/tests/styles/media-queries.sky    | 34 -------------------
 10 files changed, 10 insertions(+), 145 deletions(-)
 delete mode 100644 engine/src/flutter/tests/clipping/background-opaque-clipped-gradients-expected.txt
 delete mode 100644 engine/src/flutter/tests/clipping/background-opaque-clipped-gradients.sky
 delete mode 100644 engine/src/flutter/tests/clipping/clipping-transforms-expected.sky
 delete mode 100644 engine/src/flutter/tests/clipping/clipping-transforms.sky
 delete mode 100644 engine/src/flutter/tests/lowlevel/iframe-expected.txt
 delete mode 100644 engine/src/flutter/tests/lowlevel/iframe.sky
 delete mode 100644 engine/src/flutter/tests/styles/media-queries-expected.txt
 delete mode 100644 engine/src/flutter/tests/styles/media-queries.sky

diff --git a/engine/src/flutter/tests/clipping/background-opaque-clipped-gradients-expected.txt b/engine/src/flutter/tests/clipping/background-opaque-clipped-gradients-expected.txt
deleted file mode 100644
index 354bedfcd88..00000000000
--- a/engine/src/flutter/tests/clipping/background-opaque-clipped-gradients-expected.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView {#document} at (0,0) size 800x600
-    RenderFlexibleBox {sky} at (0,0) size 800x238
-      RenderParagraph {p} at (0,0) size 800x38
-        RenderText {#text} at (0,0) size 778x38
-          text run at (0,0) width 778: "Test passes if the image below shows nested green, blue and yellow squares with a dotted black"
-          text run at (0,19) width 59: "border."
-      RenderFlexibleBox {div} at (0,38) size 200x200 [border: (25px dotted #000000)]
-
diff --git a/engine/src/flutter/tests/clipping/background-opaque-clipped-gradients.sky b/engine/src/flutter/tests/clipping/background-opaque-clipped-gradients.sky
deleted file mode 100644
index 61c373c6e23..00000000000
--- a/engine/src/flutter/tests/clipping/background-opaque-clipped-gradients.sky
+++ /dev/null
@@ -1,17 +0,0 @@
-<sky>
-<import src="../resources/dump-as-render-tree.sky" />
-<style>
-div {
-    width: 100px;
-    height: 100px;
-    padding: 25px;
-    border: 25px dotted;
-    /* TODO(ojan): background-image appears to be broken. */
-    background-image: linear-gradient(top, yellow, yellow), linear-gradient(top, blue, blue), -linear-gradient(top, green, green);
-    background-clip: content-box, padding-box, border-box;
-}
-</style>
-<!-- TODO(ojan): Make this a reftest once we support them. -->
-<p>Test passes if the image below shows nested green, blue and yellow squares with a dotted black border.</p>
-<div></div>
-</sky>
diff --git a/engine/src/flutter/tests/clipping/clipping-transforms-expected.sky b/engine/src/flutter/tests/clipping/clipping-transforms-expected.sky
deleted file mode 100644
index 4ac45d7af6c..00000000000
--- a/engine/src/flutter/tests/clipping/clipping-transforms-expected.sky
+++ /dev/null
@@ -1,14 +0,0 @@
-<import src="../resources/run-after-display.sky" />
-<img src="http://storage.googleapis.com/mojo/sky-pngs/77c37e9285340992042008792e29c861306cdc9e" />
-<script>
-import "dart:sky";
-import "dart:sky.internals" as internals;
-
-void main() {
-  window.addEventListener('load', (_) {
-    runAfterDisplay(() {
-      internals.notifyTestComplete("");
-    });
-  });
-}
-</script>
diff --git a/engine/src/flutter/tests/clipping/clipping-transforms.sky b/engine/src/flutter/tests/clipping/clipping-transforms.sky
deleted file mode 100644
index 762d06a6ba8..00000000000
--- a/engine/src/flutter/tests/clipping/clipping-transforms.sky
+++ /dev/null
@@ -1,28 +0,0 @@
-<import src="../resources/run-after-display.sky" />
-
-<style>
-transformer {
-  transform: translateY(-500px);
-}
-child {
-  opacity: 0.5;
-  background-image: linear-gradient(green, yellow);
-  height: 1900px;
-}
-</style>
-<transformer>
-  <child />
-</transformer>
-
-<script>
-import "dart:sky";
-import "dart:sky.internals" as internals;
-
-void main() {
-  window.addEventListener('load', (_) {
-    runAfterDisplay(() {
-      internals.notifyTestComplete("");
-    });
-  });
-}
-</script>
diff --git a/engine/src/flutter/tests/harness/reftest-mismatch-expected-mismatch.sky b/engine/src/flutter/tests/harness/reftest-mismatch-expected-mismatch.sky
index 1469024023d..de999553b98 100644
--- a/engine/src/flutter/tests/harness/reftest-mismatch-expected-mismatch.sky
+++ b/engine/src/flutter/tests/harness/reftest-mismatch-expected-mismatch.sky
@@ -1,4 +1,9 @@
 <foo>
+<style>
+foo {
+	background-color: black;
+}
+</style>
 <import src="../resources/run-after-display.sky" />
 This is a mismatch reftest.
 <script>
diff --git a/engine/src/flutter/tests/harness/reftest-mismatch.sky b/engine/src/flutter/tests/harness/reftest-mismatch.sky
index 2afe0fb4be9..a0b29fc2a6c 100644
--- a/engine/src/flutter/tests/harness/reftest-mismatch.sky
+++ b/engine/src/flutter/tests/harness/reftest-mismatch.sky
@@ -1,4 +1,9 @@
 <foo>
+<style>
+foo {
+	background-color: black;
+}
+</style>
 <import src="../resources/run-after-display.sky" />
 <p>This is a mismatch reftest. Should not match.</p>
 <script>
diff --git a/engine/src/flutter/tests/lowlevel/iframe-expected.txt b/engine/src/flutter/tests/lowlevel/iframe-expected.txt
deleted file mode 100644
index 0bf0008e298..00000000000
--- a/engine/src/flutter/tests/lowlevel/iframe-expected.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView {#document} at (0,0) size 800x600
-    RenderFlexibleBox {sky} at (0,0) size 800x438
-      RenderParagraph {p} at (0,0) size 800x194
-        RenderText {#text} at (0,175) size 81x19
-          text run at (0,175) width 81: "This is an "
-        RenderText {#text} at (420,175) size 77x19
-          text run at (420,175) width 77: " element."
-      RenderParagraph {p} at (0,194) size 800x200
-        RenderText {#text} at (0,0) size 99x19
-          text run at (0,0) width 99: "Placeholder."
-      RenderParagraph {p} at (0,394) size 800x44
-        RenderText {#text} at (0,25) size 223x19
-          text run at (0,25) width 223: "Small iframe should render "
-        RenderText {#text} at (522,25) size 82x19
-          text run at (522,25) width 82: " correctly."
-layer at (81,0) size 340x190
-  RenderReplaced {iframe} at (80.67,0) size 340x190 [border: (20px solid #000000)]
-layer at (223,394) size 300x40
-  RenderReplaced {iframe} at (222.81,0) size 300x40
-
diff --git a/engine/src/flutter/tests/lowlevel/iframe.sky b/engine/src/flutter/tests/lowlevel/iframe.sky
deleted file mode 100644
index 85c98cf1380..00000000000
--- a/engine/src/flutter/tests/lowlevel/iframe.sky
+++ /dev/null
@@ -1,15 +0,0 @@
-<sky>
-    <import src="../resources/dump-as-render-tree.sky"/>
-    <iframe id="removeMe" src="text.sky">Should not render</iframe>
-    <p>This is an <iframe style="border-style: solid; border-width: 20px" src="abarth.sky">iframe</iframe> element.</p>
-    <p style="height: 200px">Placeholder.</p>
-    <p>Small iframe should render <iframe style="height: 40px" src="abarth.sky">iframe</iframe> correctly.</p>
-
-    <script>
-    import "dart:sky";
-
-    void main() {
-        document.getElementById("removeMe").remove();
-    }
-    </script>
-</sky>
diff --git a/engine/src/flutter/tests/styles/media-queries-expected.txt b/engine/src/flutter/tests/styles/media-queries-expected.txt
deleted file mode 100644
index dc1b2244ce1..00000000000
--- a/engine/src/flutter/tests/styles/media-queries-expected.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-CONSOLE: unittest-suite-wait-for-done
-CONSOLE: PASS: should allow sheets to apply when they match
-CONSOLE: PASS: should cause sheets to be skipped when they do not match
-CONSOLE: 
-CONSOLE: All 2 tests passed.
-CONSOLE: unittest-suite-success
-DONE
diff --git a/engine/src/flutter/tests/styles/media-queries.sky b/engine/src/flutter/tests/styles/media-queries.sky
deleted file mode 100644
index 9938e9b1bab..00000000000
--- a/engine/src/flutter/tests/styles/media-queries.sky
+++ /dev/null
@@ -1,34 +0,0 @@
-<html>
-
-<style media="(max-width: 0px)">
-  #test { color: rgb(255, 0, 0); }
-</style>
-<div id="does-not-match">Should not be red.</div>
-
-<style media="(max-width: 10000px)">
-  #matches { color: rgb(255, 0, 0); }
-</style>
-
-<div id="matches">Should be red.</div>
-
-<script>
-import "../resources/third_party/unittest/unittest.dart";
-import "../resources/unit.dart";
-
-import "dart:sky";
-
-void main() {
-  initUnit();
-
-  test('should allow sheets to apply when they match', () {
-    var element = document.getElementById('matches');
-    expect(window.getComputedStyle(element)["color"], equals("rgb(255, 0, 0)"));
-  });
-
-  test('should cause sheets to be skipped when they do not match', () {
-    var element = document.getElementById('does-not-match');
-    expect(window.getComputedStyle(element)["color"], equals("rgb(0, 0, 0)"));
-  });
-}
-</script>
-</html>