Roll chromium_revision 95336cb92b..191d55580e (557816:557824)
Change log:95336cb92b..191d55580eFull diff:95336cb92b..191d55580eRoll chromium third_party 4e16929f46..3a8f2a9e1e Change log:4e16929f46..3a8f2a9e1eChanged dependencies: * src/tools:c44a3f5eca..f524a53b81DEPS diff:95336cb92b..191d55580e/DEPS No update to Clang. TBR=titovartem@google.com, BUG=None CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal Change-Id: Ic9c4a62b050383646e9fcf5cc07a5653c14ac06e Reviewed-on: https://webrtc-review.googlesource.com/76120 Reviewed-by: Patrik Höglund <phoglund@webrtc.org> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> Reviewed-by: Artem Titov <titovartem@webrtc.org> Commit-Queue: Artem Titov <titovartem@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23205}
This commit is contained in:
Artem Titov
372
third_party/closure_compiler/compiler_test.py
vendored
Executable file
372
third_party/closure_compiler/compiler_test.py
vendored
Executable file
@ -0,0 +1,372 @@
|
||||
#!/usr/bin/env python
|
||||
# Copyright 2014 The Chromium Authors. All rights reserved.
|
||||
# Use of this source code is governed by a BSD-style license that can be
|
||||
# found in the LICENSE file.
|
||||
|
||||
from ast import literal_eval
|
||||
import os
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
from compile2 import Checker
|
||||
from processor import FileCache, Processor
|
||||
|
||||
|
||||
_SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
_SRC_DIR = os.path.join(_SCRIPT_DIR, os.pardir, os.pardir)
|
||||
_RESOURCES_DIR = os.path.join(_SRC_DIR, "ui", "webui", "resources", "js")
|
||||
_ASSERT_JS = os.path.join(_RESOURCES_DIR, "assert.js")
|
||||
_CR_JS = os.path.join(_RESOURCES_DIR, "cr.js")
|
||||
_CR_UI_JS = os.path.join(_RESOURCES_DIR, "cr", "ui.js")
|
||||
_PROMISE_RESOLVER_JS = os.path.join(_RESOURCES_DIR, "promise_resolver.js")
|
||||
_CHROME_EXTERNS = os.path.join(_SRC_DIR, "third_party", "closure_compiler",
|
||||
"externs", "chrome.js")
|
||||
_CHROME_SEND_EXTERNS = os.path.join(_SRC_DIR, "third_party", "closure_compiler",
|
||||
"externs", "chrome_send.js")
|
||||
_CLOSURE_ARGS_GYPI = os.path.join(_SCRIPT_DIR, "closure_args.gypi")
|
||||
_GYPI_DICT = literal_eval(open(_CLOSURE_ARGS_GYPI).read())
|
||||
_COMMON_CLOSURE_ARGS = _GYPI_DICT["default_closure_args"] + \
|
||||
_GYPI_DICT["default_disabled_closure_args"]
|
||||
|
||||
class CompilerTest(unittest.TestCase):
|
||||
_ASSERT_DEFINITION = Processor(_ASSERT_JS).contents
|
||||
_PROMISE_RESOLVER_DEFINITION = (_ASSERT_DEFINITION +
|
||||
Processor(_PROMISE_RESOLVER_JS).contents)
|
||||
_CR_DEFINE_DEFINITION = (_PROMISE_RESOLVER_DEFINITION +
|
||||
Processor(_CR_JS).contents)
|
||||
_CR_UI_DECORATE_DEFINITION = Processor(_CR_UI_JS).contents
|
||||
|
||||
def setUp(self):
|
||||
self._checker = Checker()
|
||||
self._tmp_files = []
|
||||
|
||||
def tearDown(self):
|
||||
for file in self._tmp_files:
|
||||
if os.path.exists(file):
|
||||
os.remove(file)
|
||||
|
||||
def _runChecker(self, source_code, needs_output, closure_args=None):
|
||||
file_path = "/script.js"
|
||||
FileCache._cache[file_path] = source_code
|
||||
out_file = self._createOutFiles()
|
||||
args = _COMMON_CLOSURE_ARGS + (closure_args or [])
|
||||
if needs_output:
|
||||
args.remove("checks_only")
|
||||
|
||||
sources = [file_path, _CHROME_EXTERNS, _CHROME_SEND_EXTERNS]
|
||||
found_errors, stderr = self._checker.check(sources,
|
||||
out_file=out_file,
|
||||
closure_args=args)
|
||||
return found_errors, stderr, out_file
|
||||
|
||||
def _runCheckerTestExpectError(self, source_code, expected_error,
|
||||
closure_args=None):
|
||||
_, stderr, out_file = self._runChecker(
|
||||
source_code, needs_output=False, closure_args=closure_args)
|
||||
|
||||
self.assertTrue(expected_error in stderr,
|
||||
msg="Expected chunk: \n%s\n\nOutput:\n%s\n" % (
|
||||
expected_error, stderr))
|
||||
self.assertFalse(os.path.exists(out_file))
|
||||
|
||||
def _runCheckerTestExpectSuccess(self, source_code, expected_output=None,
|
||||
closure_args=None):
|
||||
found_errors, stderr, out_file = self._runChecker(
|
||||
source_code, needs_output=True, closure_args=closure_args)
|
||||
|
||||
self.assertFalse(found_errors,
|
||||
msg="Expected success, but got failure\n\nOutput:\n%s\n" % stderr)
|
||||
|
||||
self.assertTrue(os.path.exists(out_file))
|
||||
if expected_output:
|
||||
with open(out_file, "r") as file:
|
||||
self.assertEquals(file.read(), expected_output)
|
||||
|
||||
def _createOutFiles(self):
|
||||
out_file = tempfile.NamedTemporaryFile(delete=False)
|
||||
|
||||
self._tmp_files.append(out_file.name)
|
||||
return out_file.name
|
||||
|
||||
def testGetInstance(self):
|
||||
self._runCheckerTestExpectError("""
|
||||
var cr = {
|
||||
/** @param {!Function} ctor */
|
||||
addSingletonGetter: function(ctor) {
|
||||
ctor.getInstance = function() {
|
||||
return ctor.instance_ || (ctor.instance_ = new ctor());
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
/** @constructor */
|
||||
function Class() {
|
||||
/** @param {number} num */
|
||||
this.needsNumber = function(num) {};
|
||||
}
|
||||
|
||||
cr.addSingletonGetter(Class);
|
||||
Class.getInstance().needsNumber("wrong type");
|
||||
""", "ERROR - actual parameter 1 of Class.needsNumber does not match formal "
|
||||
"parameter")
|
||||
|
||||
def testCrDefineFunctionDefinition(self):
|
||||
self._runCheckerTestExpectError(self._CR_DEFINE_DEFINITION + """
|
||||
cr.define('a.b.c', function() {
|
||||
/** @param {number} num */
|
||||
function internalName(num) {}
|
||||
|
||||
return {
|
||||
needsNumber: internalName
|
||||
};
|
||||
});
|
||||
|
||||
a.b.c.needsNumber("wrong type");
|
||||
""", "ERROR - actual parameter 1 of a.b.c.needsNumber does not match formal "
|
||||
"parameter")
|
||||
|
||||
def testCrDefineFunctionAssignment(self):
|
||||
self._runCheckerTestExpectError(self._CR_DEFINE_DEFINITION + """
|
||||
cr.define('a.b.c', function() {
|
||||
/** @param {number} num */
|
||||
var internalName = function(num) {};
|
||||
|
||||
return {
|
||||
needsNumber: internalName
|
||||
};
|
||||
});
|
||||
|
||||
a.b.c.needsNumber("wrong type");
|
||||
""", "ERROR - actual parameter 1 of a.b.c.needsNumber does not match formal "
|
||||
"parameter")
|
||||
|
||||
def testCrDefineConstructorDefinitionPrototypeMethod(self):
|
||||
self._runCheckerTestExpectError(self._CR_DEFINE_DEFINITION + """
|
||||
cr.define('a.b.c', function() {
|
||||
/** @constructor */
|
||||
function ClassInternalName() {}
|
||||
|
||||
ClassInternalName.prototype = {
|
||||
/** @param {number} num */
|
||||
method: function(num) {}
|
||||
};
|
||||
|
||||
return {
|
||||
ClassExternalName: ClassInternalName
|
||||
};
|
||||
});
|
||||
|
||||
new a.b.c.ClassExternalName().method("wrong type");
|
||||
""", "ERROR - actual parameter 1 of a.b.c.ClassExternalName.prototype.method "
|
||||
"does not match formal parameter")
|
||||
|
||||
def testCrDefineConstructorAssignmentPrototypeMethod(self):
|
||||
self._runCheckerTestExpectError(self._CR_DEFINE_DEFINITION + """
|
||||
cr.define('a.b.c', function() {
|
||||
/** @constructor */
|
||||
var ClassInternalName = function() {};
|
||||
|
||||
ClassInternalName.prototype = {
|
||||
/** @param {number} num */
|
||||
method: function(num) {}
|
||||
};
|
||||
|
||||
return {
|
||||
ClassExternalName: ClassInternalName
|
||||
};
|
||||
});
|
||||
|
||||
new a.b.c.ClassExternalName().method("wrong type");
|
||||
""", "ERROR - actual parameter 1 of a.b.c.ClassExternalName.prototype.method "
|
||||
"does not match formal parameter")
|
||||
|
||||
def testCrDefineEnum(self):
|
||||
self._runCheckerTestExpectError(self._CR_DEFINE_DEFINITION + """
|
||||
cr.define('a.b.c', function() {
|
||||
/** @enum {string} */
|
||||
var internalNameForEnum = {key: 'wrong_type'};
|
||||
|
||||
return {
|
||||
exportedEnum: internalNameForEnum
|
||||
};
|
||||
});
|
||||
|
||||
/** @param {number} num */
|
||||
function needsNumber(num) {}
|
||||
|
||||
needsNumber(a.b.c.exportedEnum.key);
|
||||
""", "ERROR - actual parameter 1 of needsNumber does not match formal "
|
||||
"parameter")
|
||||
|
||||
def testObjectDefineProperty(self):
|
||||
self._runCheckerTestExpectSuccess("""
|
||||
/** @constructor */
|
||||
function Class() {}
|
||||
|
||||
Object.defineProperty(Class.prototype, 'myProperty', {});
|
||||
|
||||
alert(new Class().myProperty);
|
||||
""")
|
||||
|
||||
def testCrDefineProperty(self):
|
||||
self._runCheckerTestExpectSuccess(self._CR_DEFINE_DEFINITION + """
|
||||
/** @constructor */
|
||||
function Class() {}
|
||||
|
||||
cr.defineProperty(Class.prototype, 'myProperty', cr.PropertyKind.JS);
|
||||
|
||||
alert(new Class().myProperty);
|
||||
""")
|
||||
|
||||
def testCrDefinePropertyTypeChecking(self):
|
||||
self._runCheckerTestExpectError(self._CR_DEFINE_DEFINITION + """
|
||||
/** @constructor */
|
||||
function Class() {}
|
||||
|
||||
cr.defineProperty(Class.prototype, 'booleanProp', cr.PropertyKind.BOOL_ATTR);
|
||||
|
||||
/** @param {number} num */
|
||||
function needsNumber(num) {}
|
||||
|
||||
needsNumber(new Class().booleanProp);
|
||||
""", "ERROR - actual parameter 1 of needsNumber does not match formal "
|
||||
"parameter")
|
||||
|
||||
def testCrDefineOnCrWorks(self):
|
||||
self._runCheckerTestExpectSuccess(self._CR_DEFINE_DEFINITION + """
|
||||
cr.define('cr', function() {
|
||||
return {};
|
||||
});
|
||||
""")
|
||||
|
||||
def testAssertWorks(self):
|
||||
self._runCheckerTestExpectSuccess(self._ASSERT_DEFINITION + """
|
||||
/** @return {?string} */
|
||||
function f() {
|
||||
return "string";
|
||||
}
|
||||
|
||||
/** @type {!string} */
|
||||
var a = assert(f());
|
||||
""")
|
||||
|
||||
def testAssertInstanceofWorks(self):
|
||||
self._runCheckerTestExpectSuccess(self._ASSERT_DEFINITION + """
|
||||
/** @constructor */
|
||||
function Class() {}
|
||||
|
||||
/** @return {Class} */
|
||||
function f() {
|
||||
var a = document.createElement('div');
|
||||
return assertInstanceof(a, Class);
|
||||
}
|
||||
""")
|
||||
|
||||
def testCrUiDecorateWorks(self):
|
||||
self._runCheckerTestExpectSuccess(self._CR_DEFINE_DEFINITION +
|
||||
self._CR_UI_DECORATE_DEFINITION + """
|
||||
/** @constructor */
|
||||
function Class() {}
|
||||
|
||||
/** @return {Class} */
|
||||
function f() {
|
||||
var a = document.createElement('div');
|
||||
cr.ui.decorate(a, Class);
|
||||
return a;
|
||||
}
|
||||
""")
|
||||
|
||||
def testValidScriptCompilation(self):
|
||||
self._runCheckerTestExpectSuccess("""
|
||||
var testScript = function() {
|
||||
console.log("hello world")
|
||||
};
|
||||
""",
|
||||
"""'use strict';var testScript=function(){console.log("hello world")};\n""")
|
||||
|
||||
def testOutputWrapper(self):
|
||||
source_code = """
|
||||
var testScript = function() {
|
||||
console.log("hello world");
|
||||
};
|
||||
"""
|
||||
expected_output = ("""(function(){'use strict';var testScript=function()"""
|
||||
"""{console.log("hello world")};})();\n""")
|
||||
closure_args=["output_wrapper='(function(){%output%})();'"]
|
||||
self._runCheckerTestExpectSuccess(source_code, expected_output,
|
||||
closure_args)
|
||||
|
||||
def testCustomSources(self):
|
||||
source_file1 = tempfile.NamedTemporaryFile(delete=False)
|
||||
with open(source_file1.name, "w") as f:
|
||||
f.write("""
|
||||
goog.provide('testScript');
|
||||
|
||||
var testScript = function() {};
|
||||
""")
|
||||
self._tmp_files.append(source_file1.name)
|
||||
|
||||
source_file2 = tempfile.NamedTemporaryFile(delete=False)
|
||||
with open(source_file2.name, "w") as f:
|
||||
f.write("""
|
||||
goog.require('testScript');
|
||||
|
||||
testScript();
|
||||
""")
|
||||
self._tmp_files.append(source_file2.name)
|
||||
|
||||
out_file = self._createOutFiles()
|
||||
sources = [source_file1.name, source_file2.name]
|
||||
closure_args = [a for a in _COMMON_CLOSURE_ARGS if a != "checks_only"]
|
||||
found_errors, stderr = self._checker.check(sources, out_file=out_file,
|
||||
closure_args=closure_args,
|
||||
custom_sources=True)
|
||||
self.assertFalse(found_errors,
|
||||
msg="Expected success, but got failure\n\nOutput:\n%s\n" % stderr)
|
||||
|
||||
expected_output = "'use strict';var testScript=function(){};testScript();\n"
|
||||
self.assertTrue(os.path.exists(out_file))
|
||||
with open(out_file, "r") as file:
|
||||
self.assertEquals(file.read(), expected_output)
|
||||
|
||||
def testExportPath(self):
|
||||
self._runCheckerTestExpectSuccess(self._CR_DEFINE_DEFINITION +
|
||||
"cr.exportPath('a.b.c');");
|
||||
|
||||
def testExportPathWithTargets(self):
|
||||
self._runCheckerTestExpectSuccess(self._CR_DEFINE_DEFINITION +
|
||||
"var path = 'a.b.c'; cr.exportPath(path, {}, {});")
|
||||
|
||||
def testExportPathNoPath(self):
|
||||
self._runCheckerTestExpectError(self._CR_DEFINE_DEFINITION +
|
||||
"cr.exportPath();",
|
||||
"ERROR - cr.exportPath() should have at least 1 argument: path name")
|
||||
|
||||
def testMissingReturnAssertNotReached(self):
|
||||
template = self._ASSERT_DEFINITION + """
|
||||
/** @enum {number} */
|
||||
var Enum = {FOO: 1, BAR: 2};
|
||||
|
||||
/**
|
||||
* @param {Enum} e
|
||||
* @return {number}
|
||||
*/
|
||||
function enumToVal(e) {
|
||||
switch (e) {
|
||||
case Enum.FOO:
|
||||
return 1;
|
||||
case Enum.BAR:
|
||||
return 2;
|
||||
}
|
||||
%s
|
||||
}
|
||||
"""
|
||||
args = ['warning_level=VERBOSE']
|
||||
self._runCheckerTestExpectError(template % '', 'Missing return',
|
||||
closure_args=args)
|
||||
self._runCheckerTestExpectSuccess(template % 'assertNotReached();',
|
||||
closure_args=args)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
Reference in New Issue
Block a user