Changeset 252456 in webkit


Ignore:
Timestamp:
Nov 14, 2019 6:58:55 AM (4 years ago)
Author:
Jonathan Bedard
Message:

webkitpy: Clarify webkitpy/style/optparser_unittest.py by removing parse variables
https://bugs.webkit.org/show_bug.cgi?id=204183

Reviewed by Stephanie Lewis.

  • Scripts/webkitpy/style/optparser_unittest.py:

(ArgumentParserTest.test_parse_documentation): Remove parse variable.
(ArgumentParserTest.test_parse_bad_values): Ditto.
(ArgumentParserTest.test_parse_default_arguments): Ditto.
(ArgumentParserTest.test_parse_explicit_arguments): Ditto.
(ArgumentParserTest.test_parse_files): Ditto.

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r252454 r252456  
     12019-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
    1152019-11-14  Aakash Jain  <aakash_jain@apple.com>
    216
  • trunk/Tools/Scripts/webkitpy/style/optparser_unittest.py

    r202362 r252456  
    9898
    9999    def test_parse_documentation(self):
    100         parse = self._parse
    101 
    102100        # FIXME: Test both the printing of the usage string and the
    103101        #        filter categories help.
    104102
    105103        # Request the usage string.
    106         self.assertRaises(SystemExit, parse, ['--help'])
     104        self.assertRaises(SystemExit, self._parse, ['--help'])
    107105        # Request default filter rules and available style categories.
    108         self.assertRaises(SystemExit, parse, ['--filter='])
     106        self.assertRaises(SystemExit, self._parse, ['--filter='])
    109107
    110108    def test_parse_bad_values(self):
    111         parse = self._parse
    112 
    113109        # Pass an unsupported argument.
    114         self.assertRaises(SystemExit, parse, ['--bad'])
     110        self.assertRaises(SystemExit, self._parse, ['--bad'])
    115111        self.assertLog(['ERROR: no such option: --bad\n'])
    116112
    117         self.assertRaises(SystemExit, parse, ['--min-confidence=bad'])
     113        self.assertRaises(SystemExit, self._parse, ['--min-confidence=bad'])
    118114        self.assertLog(['ERROR: option --min-confidence: '
    119115                        "invalid integer value: 'bad'\n"])
    120         self.assertRaises(SystemExit, parse, ['--min-confidence=0'])
     116        self.assertRaises(SystemExit, self._parse, ['--min-confidence=0'])
    121117        self.assertLog(['ERROR: option --min-confidence: invalid integer: 0: '
    122118                        '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'])
    124120        self.assertLog(['ERROR: option --min-confidence: invalid integer: 6: '
    125121                        'value must be between 1 and 5\n'])
    126         parse(['--min-confidence=1'])  # works
    127         parse(['--min-confidence=5'])  # works
    128 
    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'])
    130126        self.assertLog(['ERROR: option --output-format: invalid choice: '
    131127                        "'bad' (choose from 'emacs', 'vs7')\n"])
    132         parse(['--output=vs7'])  # works
     128        self._parse(['--output=vs7'])  # works
    133129
    134130        # Pass a filter rule not beginning with + or -.
    135         self.assertRaises(SystemExit, parse, ['--filter=build'])
     131        self.assertRaises(SystemExit, self._parse, ['--filter=build'])
    136132        self.assertLog(['ERROR: Invalid filter rule "build": '
    137133                        'every rule must start with + or -.\n'])
    138         parse(['--filter=+build'])  # works
     134        self._parse(['--filter=+build'])  # works
    139135
    140136    def test_parse_default_arguments(self):
    141         parse = self._parse
    142 
    143         (files, options) = parse([])
     137        (files, options) = self._parse([])
    144138
    145139        self.assertEqual(files, [])
     
    153147
    154148    def test_parse_explicit_arguments(self):
    155         parse = self._parse
    156 
    157149        # Pass non-default explicit values.
    158         (files, options) = parse(['--min-confidence=4'])
     150        (files, options) = self._parse(['--min-confidence=4'])
    159151        self.assertEqual(options.min_confidence, 4)
    160         (files, options) = parse(['--output=emacs'])
     152        (files, options) = self._parse(['--output=emacs'])
    161153        self.assertEqual(options.output_format, 'emacs')
    162         (files, options) = parse(['-g', 'commit'])
     154        (files, options) = self._parse(['-g', 'commit'])
    163155        self.assertEqual(options.git_commit, 'commit')
    164         (files, options) = parse(['--git-commit=commit'])
     156        (files, options) = self._parse(['--git-commit=commit'])
    165157        self.assertEqual(options.git_commit, 'commit')
    166         (files, options) = parse(['--git-diff=commit'])
     158        (files, options) = self._parse(['--git-diff=commit'])
    167159        self.assertEqual(options.git_commit, 'commit')
    168         (files, options) = parse(['--verbose'])
     160        (files, options) = self._parse(['--verbose'])
    169161        self.assertTrue(options.is_verbose)
    170         (files, options) = parse(['--diff-files', 'file.txt'])
     162        (files, options) = self._parse(['--diff-files', 'file.txt'])
    171163        self.assertTrue(options.diff_files)
    172164
    173165        # Pass user_rules.
    174         (files, options) = parse(['--filter=+build,-whitespace'])
     166        (files, options) = self._parse(['--filter=+build,-whitespace'])
    175167        self.assertEqual(options.filter_rules,
    176168                          ["+build", "-whitespace"])
    177169
    178170        # Pass spurious white space in user rules.
    179         (files, options) = parse(['--filter=+build, -whitespace'])
     171        (files, options) = self._parse(['--filter=+build, -whitespace'])
    180172        self.assertEqual(options.filter_rules,
    181173                          ["+build", "-whitespace"])
    182174
    183175    def test_parse_files(self):
    184         parse = self._parse
    185 
    186         (files, options) = parse(['foo.cpp'])
     176        (files, options) = self._parse(['foo.cpp'])
    187177        self.assertEqual(files, ['foo.cpp'])
    188178
    189179        # Pass multiple files.
    190         (files, options) = parse(['--output=emacs', 'foo.cpp', 'bar.cpp'])
     180        (files, options) = self._parse(['--output=emacs', 'foo.cpp', 'bar.cpp'])
    191181        self.assertEqual(files, ['foo.cpp', 'bar.cpp'])
    192182
Note: See TracChangeset for help on using the changeset viewer.