Changeset 83476 in webkit

Timestamp:

Apr 11, 2011 12:28:11 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-04-11 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Ojan Vafai.

new-run-webkit-tests: add unit tests for Port.diff_image()
​https://bugs.webkit.org/show_bug.cgi?id=58196

Add the unit tests for the fix in bug 58195.

• Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
• Scripts/webkitpy/layout_tests/port/port_testcase.py:
• Scripts/webkitpy/layout_tests/port/webkit_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/port_testcase.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-11  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        new-run-webkit-tests: add unit tests for Port.diff_image()
+        https://bugs.webkit.org/show_bug.cgi?id=58196
+
+        Add the unit tests for the fix in bug 58195.
+
+        * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
+        * Scripts/webkitpy/layout_tests/port/port_testcase.py:
+        * Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
+
 2011-04-11  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py

@@ -42 +42 @@
 import chromium_win
 
+from webkitpy.layout_tests.port import port_testcase
+
+
 class ChromiumDriverTest(unittest.TestCase):
-
     def setUp(self):
         mock_port = Mock()
@@ -113 +115 @@
         self.assertEquals(self.pid, 1)
 
-class ChromiumPortTest(unittest.TestCase):
+
+class ChromiumPortTest(port_testcase.PortTestCase):
+    def port_maker(self, platform):
+        return chromium.ChromiumPort
+
+    def test_driver_cmd_line(self):
+        # Override this test since ChromiumPort doesn't implement driver_cmd_line().
+        pass
+
+    def test_baseline_search_path(self):
+        # Override this test since ChromiumPort doesn't implement baseline_search_path().
+        pass
+
     class TestMacPort(chromium_mac.ChromiumMacPort):
         def __init__(self, options):

trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py

@@ -114 +114 @@
         port._filesystem.remove(tmpfile)
 
+    def test_diff_image__missing_both(self):
+        port = self.make_port()
+        if not port:
+            return
+        self.assertFalse(port.diff_image(None, None, None))
+        self.assertFalse(port.diff_image(None, '', None))
+        self.assertFalse(port.diff_image('', None, None))
+        self.assertFalse(port.diff_image('', '', None))
+
+    def test_diff_image__missing_actual(self):
+        port = self.make_port()
+        if not port:
+            return
+        self.assertTrue(port.diff_image(None, 'foo', None))
+        self.assertTrue(port.diff_image('', 'foo', None))
+
+    def test_diff_image__missing_expected(self):
+        port = self.make_port()
+        if not port:
+            return
+        self.assertTrue(port.diff_image('foo', None, None))
+        self.assertTrue(port.diff_image('foo', '', None))
+
+
     def disabled_test_websocket_server(self):
         port = self.make_port()

trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py

@@ -31 +31 @@
 
 from webkitpy.layout_tests.port.webkit import WebKitPort
+from webkitpy.layout_tests.port import port_testcase
 
 
@@ -64 +65 @@
         return []
 
-class WebKitPortTest(unittest.TestCase):
+
+class WebKitPortTest(port_testcase.PortTestCase):
+    def port_maker(self, platform):
+        return WebKitPort
+
+    def test_driver_cmd_line(self):
+        # Routine is not implemented.
+        pass
+
+    def test_baseline_search_path(self):
+        # Routine is not implemented.
+        pass
 
     def test_skipped_directories_for_symbols(self):