Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(317)

Unified Diff: third_party/closure_linter/closure_linter/scopeutil_test.py

Issue 2328693002: Updated linter with upstream release (2.3.19) (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/closure_linter/closure_linter/scopeutil_test.py
diff --git a/third_party/closure_linter/closure_linter/scopeutil_test.py b/third_party/closure_linter/closure_linter/scopeutil_test.py
index 7a0240009e30b592d493decadeb619cf939f9067..722a95390022de6d9d26ee4c2ab992128ff28cfe 100644
--- a/third_party/closure_linter/closure_linter/scopeutil_test.py
+++ b/third_party/closure_linter/closure_linter/scopeutil_test.py
@@ -70,44 +70,56 @@ def _FindFirstContextOfType(token, context_type):
return context
-def _WrapWithGoogScope(script):
- """Wraps source code in a goog.scope statement."""
- return 'goog.scope(function() {\n' + script + '\n});'
+def _ParseAssignment(script):
+ start_token = testutil.TokenizeSourceAndRunEcmaPass(script)
+ statement = _FindFirstContextOfType(
+ start_token, ecmametadatapass.EcmaContext.VAR)
+ return statement
class StatementTest(googletest.TestCase):
def assertAlias(self, expected_match, script):
- start_token = testutil.TokenizeSourceAndRunEcmaPass(script)
- statement = _FindFirstContextOfType(
- start_token, ecmametadatapass.EcmaContext.VAR)
+ statement = _ParseAssignment(script)
match = scopeutil.MatchAlias(statement)
self.assertEquals(expected_match, match)
+ def assertModuleAlias(self, expected_match, script):
+ statement = _ParseAssignment(script)
+ match = scopeutil.MatchModuleAlias(statement)
+ self.assertEquals(expected_match, match)
+
def testSimpleAliases(self):
self.assertAlias(
('foo', 'goog.foo'),
- _WrapWithGoogScope('var foo = goog.foo;'))
+ 'var foo = goog.foo;')
self.assertAlias(
('foo', 'goog.foo'),
- _WrapWithGoogScope('var foo = goog.foo')) # No semicolon
+ 'var foo = goog.foo') # No semicolon
def testAliasWithComment(self):
self.assertAlias(
('Component', 'goog.ui.Component'),
- _WrapWithGoogScope('var Component = /* comment */ goog.ui.Component;'))
+ 'var Component = /* comment */ goog.ui.Component;')
def testMultilineAlias(self):
self.assertAlias(
('Component', 'goog.ui.Component'),
- _WrapWithGoogScope('var Component = \n goog.ui.\n Component;'))
+ 'var Component = \n goog.ui.\n Component;')
def testNonSymbolAliasVarStatements(self):
- self.assertAlias(None, _WrapWithGoogScope('var foo = 3;'))
- self.assertAlias(None, _WrapWithGoogScope('var foo = function() {};'))
- self.assertAlias(None, _WrapWithGoogScope('for(var foo = bar;;){}'))
- self.assertAlias(None, _WrapWithGoogScope('var foo = bar ? baz : qux;'))
+ self.assertAlias(None, 'var foo = 3;')
+ self.assertAlias(None, 'var foo = function() {};')
+ self.assertAlias(None, 'var foo = bar ? baz : qux;')
+
+ def testModuleAlias(self):
+ self.assertModuleAlias(
+ ('foo', 'goog.foo'),
+ 'var foo = goog.require("goog.foo");')
+ self.assertModuleAlias(
+ None,
+ 'var foo = goog.require(notastring);')
class ScopeBlockTest(googletest.TestCase):

Powered by Google App Engine
This is Rietveld 408576698