OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # Copyright 2014 The Chromium Authors. All rights reserved. | 2 # Copyright 2014 The Chromium Authors. All rights reserved. |
3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
5 | 5 |
6 import os | 6 import os |
7 import unittest | 7 import unittest |
8 | 8 |
9 from checker import Checker | 9 from checker import Checker |
10 from processor import FileCache, Processor | 10 from processor import FileCache, Processor |
(...skipping 18 matching lines...) Expand all Loading... |
29 | 29 |
30 def setUp(self): | 30 def setUp(self): |
31 self._checker = Checker() | 31 self._checker = Checker() |
32 | 32 |
33 def _runChecker(self, source_code): | 33 def _runChecker(self, source_code): |
34 file_path = "/script.js" | 34 file_path = "/script.js" |
35 FileCache._cache[file_path] = source_code | 35 FileCache._cache[file_path] = source_code |
36 return self._checker.check(file_path) | 36 return self._checker.check(file_path) |
37 | 37 |
38 def _runCheckerTestExpectError(self, source_code, expected_error): | 38 def _runCheckerTestExpectError(self, source_code, expected_error): |
39 _, output = self._runChecker(source_code) | 39 _, stderr = self._runChecker(source_code) |
40 | 40 |
41 self.assertTrue(expected_error in output, | 41 self.assertTrue(expected_error in stderr, |
42 msg="Expected chunk: \n%s\n\nOutput:\n%s\n" % ( | 42 msg="Expected chunk: \n%s\n\nOutput:\n%s\n" % ( |
43 expected_error, output)) | 43 expected_error, stderr)) |
44 | 44 |
45 def _runCheckerTestExpectSuccess(self, source_code): | 45 def _runCheckerTestExpectSuccess(self, source_code): |
46 return_code, output = self._runChecker(source_code) | 46 found_errors, stderr = self._runChecker(source_code) |
47 | 47 |
48 self.assertTrue(return_code == 0, | 48 self.assertFalse(found_errors, |
49 msg="Expected success, got return code %d\n\nOutput:\n%s\n" % ( | 49 msg="Expected success, but got failure\n\nOutput:\n%s\n" % stderr) |
50 return_code, output)) | |
51 | 50 |
52 def testGetInstance(self): | 51 def testGetInstance(self): |
53 self._runCheckerTestExpectError(""" | 52 self._runCheckerTestExpectError(""" |
54 var cr = { | 53 var cr = { |
55 /** @param {!Function} ctor */ | 54 /** @param {!Function} ctor */ |
56 addSingletonGetter: function(ctor) { | 55 addSingletonGetter: function(ctor) { |
57 ctor.getInstance = function() { | 56 ctor.getInstance = function() { |
58 return ctor.instance_ || (ctor.instance_ = new ctor()); | 57 return ctor.instance_ || (ctor.instance_ = new ctor()); |
59 }; | 58 }; |
60 } | 59 } |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 function f() { | 232 function f() { |
234 var a = document.createElement('div'); | 233 var a = document.createElement('div'); |
235 cr.ui.decorate(a, Class); | 234 cr.ui.decorate(a, Class); |
236 return a; | 235 return a; |
237 } | 236 } |
238 """) | 237 """) |
239 | 238 |
240 | 239 |
241 if __name__ == "__main__": | 240 if __name__ == "__main__": |
242 unittest.main() | 241 unittest.main() |
OLD | NEW |