Support converting utf-16 files when importing w3c tests.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py

 # Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 #
 # 1. Redistributions of source code must retain the above
 #    copyright notice, this list of conditions and the following
 #    disclaimer.
 # 2. Redistributions in binary form must reproduce the above
@@ skipping 15 matching lines @@
 # SUCH DAMAGE.
 
 import os
 import re
 import unittest
 
 from webkitpy.common.host import Host
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.thirdparty.BeautifulSoup import BeautifulSoup
-from webkitpy.w3c.test_converter import _W3CTestConverter
+from webkitpy.w3c.test_converter import _W3CTestConverter, convert_for_webkit
+from webkitpy.common.system.filesystem_mock import MockFileSystem
 
 DUMMY_FILENAME = 'dummy.html'
 DUMMY_PATH = 'dummy/testharness/path'
 
 
 class W3CTestConverterTest(unittest.TestCase):
 
     # FIXME: When we move to using a MockHost, this method should be removed, since
     #        then we can just pass in a dummy dir path
     def fake_dir_path(self, dirname):
@@ skipping 256 matching lines @@
         # through the list to replace the double-digit tokens first
         index = len(test_properties) - 1
         while index >= 0:
             # Use the unprefixed version
             test_prop = test_properties[index].replace('-webkit-', '')
             # Replace the token
             html = html.replace('@test' + str(index) + '@', test_prop)
             index -= 1
 
         return (test_properties, html)
+
+    # Test for convert_for_webkit; determing if 'utf-16' decodes correctly
+    def test_convert_for_webkit_with_non_utf8(self):
+        mock_fs = MockFileSystem()
+        mock_fs.files = {'/file': 'e\x87[P',
+                         '/mock-checkout/third_party/WebKit/Source/core/css/CSSProperties.in': '', }
+        host = Host()
+        host.filesystem = mock_fs
+        convert_for_webkit('', '/file', '', host)
+
+    # Test for convert_for_webkit; determing if 'utf-8' decodes correctly
+    def test_convert_for_webkit_with_utf8(self):
+        mock_fs = MockFileSystem()
+        mock_fs.files = {'/file': 'foo',
+                         '/mock-checkout/third_party/WebKit/Source/core/css/CSSProperties.in': '', }
+        host = Host()
+        host.filesystem = mock_fs
+        convert_for_webkit('', '/file', '', host)

[Dirk Pranke, 2016/06/02 19:22:24]

Yup, this is pretty much how I'd expect you to test it.

I would've done this slightly differently, as:

  from webkitpy.common.system.systemhost_mock import MockSystemHost

  files = {...}
  host = MockSystemHost(filesystem=MockFileSystem(files=files))
  convert_for_webkit(...)

but that's not really all that different from what you did, it just avoids using
real Host objects
and overriding methods.