Changeset 252456 in webkit
- Timestamp:
- Nov 14, 2019 6:58:55 AM (4 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r252454 r252456 1 2019-11-14 Jonathan Bedard <jbedard@apple.com> 2 3 webkitpy: Clarify webkitpy/style/optparser_unittest.py by removing parse variables 4 https://bugs.webkit.org/show_bug.cgi?id=204183 5 6 Reviewed by Stephanie Lewis. 7 8 * Scripts/webkitpy/style/optparser_unittest.py: 9 (ArgumentParserTest.test_parse_documentation): Remove parse variable. 10 (ArgumentParserTest.test_parse_bad_values): Ditto. 11 (ArgumentParserTest.test_parse_default_arguments): Ditto. 12 (ArgumentParserTest.test_parse_explicit_arguments): Ditto. 13 (ArgumentParserTest.test_parse_files): Ditto. 14 1 15 2019-11-14 Aakash Jain <aakash_jain@apple.com> 2 16 -
trunk/Tools/Scripts/webkitpy/style/optparser_unittest.py
r202362 r252456 98 98 99 99 def test_parse_documentation(self): 100 parse = self._parse101 102 100 # FIXME: Test both the printing of the usage string and the 103 101 # filter categories help. 104 102 105 103 # Request the usage string. 106 self.assertRaises(SystemExit, parse, ['--help'])104 self.assertRaises(SystemExit, self._parse, ['--help']) 107 105 # Request default filter rules and available style categories. 108 self.assertRaises(SystemExit, parse, ['--filter='])106 self.assertRaises(SystemExit, self._parse, ['--filter=']) 109 107 110 108 def test_parse_bad_values(self): 111 parse = self._parse112 113 109 # Pass an unsupported argument. 114 self.assertRaises(SystemExit, parse, ['--bad'])110 self.assertRaises(SystemExit, self._parse, ['--bad']) 115 111 self.assertLog(['ERROR: no such option: --bad\n']) 116 112 117 self.assertRaises(SystemExit, parse, ['--min-confidence=bad'])113 self.assertRaises(SystemExit, self._parse, ['--min-confidence=bad']) 118 114 self.assertLog(['ERROR: option --min-confidence: ' 119 115 "invalid integer value: 'bad'\n"]) 120 self.assertRaises(SystemExit, parse, ['--min-confidence=0'])116 self.assertRaises(SystemExit, self._parse, ['--min-confidence=0']) 121 117 self.assertLog(['ERROR: option --min-confidence: invalid integer: 0: ' 122 118 'value must be between 1 and 5\n']) 123 self.assertRaises(SystemExit, parse, ['--min-confidence=6'])119 self.assertRaises(SystemExit, self._parse, ['--min-confidence=6']) 124 120 self.assertLog(['ERROR: option --min-confidence: invalid integer: 6: ' 125 121 'value must be between 1 and 5\n']) 126 parse(['--min-confidence=1']) # works127 parse(['--min-confidence=5']) # works128 129 self.assertRaises(SystemExit, parse, ['--output=bad'])122 self._parse(['--min-confidence=1']) # works 123 self._parse(['--min-confidence=5']) # works 124 125 self.assertRaises(SystemExit, self._parse, ['--output=bad']) 130 126 self.assertLog(['ERROR: option --output-format: invalid choice: ' 131 127 "'bad' (choose from 'emacs', 'vs7')\n"]) 132 parse(['--output=vs7']) # works128 self._parse(['--output=vs7']) # works 133 129 134 130 # Pass a filter rule not beginning with + or -. 135 self.assertRaises(SystemExit, parse, ['--filter=build'])131 self.assertRaises(SystemExit, self._parse, ['--filter=build']) 136 132 self.assertLog(['ERROR: Invalid filter rule "build": ' 137 133 'every rule must start with + or -.\n']) 138 parse(['--filter=+build']) # works134 self._parse(['--filter=+build']) # works 139 135 140 136 def test_parse_default_arguments(self): 141 parse = self._parse 142 143 (files, options) = parse([]) 137 (files, options) = self._parse([]) 144 138 145 139 self.assertEqual(files, []) … … 153 147 154 148 def test_parse_explicit_arguments(self): 155 parse = self._parse156 157 149 # Pass non-default explicit values. 158 (files, options) = parse(['--min-confidence=4'])150 (files, options) = self._parse(['--min-confidence=4']) 159 151 self.assertEqual(options.min_confidence, 4) 160 (files, options) = parse(['--output=emacs'])152 (files, options) = self._parse(['--output=emacs']) 161 153 self.assertEqual(options.output_format, 'emacs') 162 (files, options) = parse(['-g', 'commit'])154 (files, options) = self._parse(['-g', 'commit']) 163 155 self.assertEqual(options.git_commit, 'commit') 164 (files, options) = parse(['--git-commit=commit'])156 (files, options) = self._parse(['--git-commit=commit']) 165 157 self.assertEqual(options.git_commit, 'commit') 166 (files, options) = parse(['--git-diff=commit'])158 (files, options) = self._parse(['--git-diff=commit']) 167 159 self.assertEqual(options.git_commit, 'commit') 168 (files, options) = parse(['--verbose'])160 (files, options) = self._parse(['--verbose']) 169 161 self.assertTrue(options.is_verbose) 170 (files, options) = parse(['--diff-files', 'file.txt'])162 (files, options) = self._parse(['--diff-files', 'file.txt']) 171 163 self.assertTrue(options.diff_files) 172 164 173 165 # Pass user_rules. 174 (files, options) = parse(['--filter=+build,-whitespace'])166 (files, options) = self._parse(['--filter=+build,-whitespace']) 175 167 self.assertEqual(options.filter_rules, 176 168 ["+build", "-whitespace"]) 177 169 178 170 # Pass spurious white space in user rules. 179 (files, options) = parse(['--filter=+build, -whitespace'])171 (files, options) = self._parse(['--filter=+build, -whitespace']) 180 172 self.assertEqual(options.filter_rules, 181 173 ["+build", "-whitespace"]) 182 174 183 175 def test_parse_files(self): 184 parse = self._parse 185 186 (files, options) = parse(['foo.cpp']) 176 (files, options) = self._parse(['foo.cpp']) 187 177 self.assertEqual(files, ['foo.cpp']) 188 178 189 179 # Pass multiple files. 190 (files, options) = parse(['--output=emacs', 'foo.cpp', 'bar.cpp'])180 (files, options) = self._parse(['--output=emacs', 'foo.cpp', 'bar.cpp']) 191 181 self.assertEqual(files, ['foo.cpp', 'bar.cpp']) 192 182
Note: See TracChangeset
for help on using the changeset viewer.