Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Tools / Scripts / webkitpy / layout_tests / controllers / repaint_overlay_unittest.py

diff --git a/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/repaint_overlay_unittest.py b/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/repaint_overlay_unittest.py
index 1449869..f9f5870 100644 (file)
--- a/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/repaint_overlay_unittest.py
+++ b/src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/repaint_overlay_unittest.py
@@ -2,53 +2,32 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import optparse
-import webkitpy.thirdparty.unittest2 as unittest
+import unittest
 
 from webkitpy.layout_tests.controllers import repaint_overlay
 
 
-EXPECTED_TEXT = """
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (drawsContent 1)
-      (repaint rects
-        (rect 8.00 108.00 100.00 100.00)
-        (rect 0.00 216.00 800.00 100.00)
-      )
-    )
-  )
-)
+LAYER_TREE = """{
+  "bounds":[800.00,600.00],
+  "children":[
+    {
+      "position": [8.00, 80.00],
+      "bounds": [800.00, 600.00],
+      "contentsOpaque": true,
+      "drawsContent": true,
+      "repaintRects": [
+        [8, 108, 100, 100],
+        [0, 216, 800, 100]
+      ]
+    }
+  ]
+}
 """
 
-ACTUAL_TEXT = """
-(GraphicsLayer
-  (bounds 800.00 600.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 800.00 600.00)
-      (contentsOpaque 1)
-      (drawsContent 1)
-      (repaint rects
-        (rect 0.00 216.00 800.00 100.00)
-      )
-    )
-  )
-)
-"""
-
-
 class TestRepaintOverlay(unittest.TestCase):
     def test_result_contains_repaint_rects(self):
-        self.assertTrue(repaint_overlay.result_contains_repaint_rects(EXPECTED_TEXT))
-        self.assertTrue(repaint_overlay.result_contains_repaint_rects(ACTUAL_TEXT))
+        self.assertTrue(repaint_overlay.result_contains_repaint_rects(LAYER_TREE))
         self.assertFalse(repaint_overlay.result_contains_repaint_rects('ABCD'))
 
-    def test_generate_repaint_overlay_html(self):
-        html = repaint_overlay.generate_repaint_overlay_html('test', ACTUAL_TEXT, EXPECTED_TEXT)
-        self.assertNotEqual(-1, html.find('expected_rects = [[8.00,108.00,100.00,100.00],[0.00,216.00,800.00,100.00]];'))
-        self.assertNotEqual(-1, html.find('actual_rects = [[0.00,216.00,800.00,100.00]];'))
+    def test_extract_layer_tree(self):
+        self.assertEquals(LAYER_TREE, repaint_overlay.extract_layer_tree(LAYER_TREE))