summaryrefslogtreecommitdiff
path: root/test/test_format.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/test_format.py')
-rw-r--r--test/test_format.py46
1 files changed, 23 insertions, 23 deletions
diff --git a/test/test_format.py b/test/test_format.py
index 9494f75..8f1be78 100644
--- a/test/test_format.py
+++ b/test/test_format.py
@@ -41,7 +41,7 @@ class MultiStatementLineTest(CheckerTestCase):
stmt = test_utils.extract_node("""
if True: pass #@
""")
- with self.assertAddsMessages(Message('C0321', node=stmt.body[0])):
+ with self.assertAddsMessages(Message('multiple-statements', node=stmt.body[0])):
self.checker.process_tokens([])
self.checker.visit_default(stmt.body[0])
self.checker.config.single_line_if_stmt = True
@@ -53,7 +53,7 @@ class MultiStatementLineTest(CheckerTestCase):
else:
pass
""")
- with self.assertAddsMessages(Message('C0321', node=stmt.body[0])):
+ with self.assertAddsMessages(Message('multiple-statements', node=stmt.body[0])):
self.checker.process_tokens([])
self.checker.visit_default(stmt.body[0])
@@ -97,21 +97,21 @@ class SuperfluousParenthesesTest(CheckerTestCase):
def testCheckKeywordParensHandlesUnnecessaryParens(self):
self.checker._keywords_with_parens = set()
cases = [
- (Message('C0325', line=1, args='if'),
+ (Message('superfluous-parens', line=1, args='if'),
'if (foo):', 0),
- (Message('C0325', line=1, args='if'),
+ (Message('superfluous-parens', line=1, args='if'),
'if ((foo, bar)):', 0),
- (Message('C0325', line=1, args='if'),
+ (Message('superfluous-parens', line=1, args='if'),
'if (foo(bar)):', 0),
- (Message('C0325', line=1, args='return'),
+ (Message('superfluous-parens', line=1, args='return'),
'return ((x for x in x))', 0),
- (Message('C0325', line=1, args='not'),
+ (Message('superfluous-parens', line=1, args='not'),
'not (foo)', 0),
- (Message('C0325', line=1, args='not'),
+ (Message('superfluous-parens', line=1, args='not'),
'if not (foo):', 1),
- (Message('C0325', line=1, args='if'),
+ (Message('superfluous-parens', line=1, args='if'),
'if (not (foo)):', 0),
- (Message('C0325', line=1, args='not'),
+ (Message('superfluous-parens', line=1, args='not'),
'if (not (foo)):', 2),
]
for msg, code, offset in cases:
@@ -143,22 +143,22 @@ class CheckSpaceTest(CheckerTestCase):
def testParenthesesBad(self):
with self.assertAddsMessages(
- Message('C0326', line=1,
+ Message('bad-whitespace', line=1,
args=('No', 'allowed', 'after', 'bracket', '( a)\n^'))):
self.checker.process_tokens(tokenize_str('( a)\n'))
with self.assertAddsMessages(
- Message('C0326', line=1,
+ Message('bad-whitespace', line=1,
args=('No', 'allowed', 'before', 'bracket', '(a )\n ^'))):
self.checker.process_tokens(tokenize_str('(a )\n'))
with self.assertAddsMessages(
- Message('C0326', line=1,
+ Message('bad-whitespace', line=1,
args=('No', 'allowed', 'before', 'bracket', 'foo (a)\n ^'))):
self.checker.process_tokens(tokenize_str('foo (a)\n'))
with self.assertAddsMessages(
- Message('C0326', line=1,
+ Message('bad-whitespace', line=1,
args=('No', 'allowed', 'before', 'bracket', '{1: 2} [1]\n ^'))):
self.checker.process_tokens(tokenize_str('{1: 2} [1]\n'))
@@ -174,13 +174,13 @@ class CheckSpaceTest(CheckerTestCase):
@set_config(no_space_check=[])
def testTrailingCommaBad(self):
with self.assertAddsMessages(
- Message('C0326', line=1,
+ Message('bad-whitespace', line=1,
args=('No', 'allowed', 'before', 'bracket', '(a, )\n ^'))):
self.checker.process_tokens(tokenize_str('(a, )\n'))
def testComma(self):
with self.assertAddsMessages(
- Message('C0326', line=1,
+ Message('bad-whitespace', line=1,
args=('No', 'allowed', 'before', 'comma', '(a , b)\n ^'))):
self.checker.process_tokens(tokenize_str('(a , b)\n'))
@@ -204,19 +204,19 @@ class CheckSpaceTest(CheckerTestCase):
def testKeywordSpacingBad(self):
with self.assertAddsMessages(
- Message('C0326', line=1,
+ Message('bad-whitespace', line=1,
args=('No', 'allowed', 'before', 'keyword argument assignment',
'(foo =bar)\n ^'))):
self.checker.process_tokens(tokenize_str('(foo =bar)\n'))
with self.assertAddsMessages(
- Message('C0326', line=1,
+ Message('bad-whitespace', line=1,
args=('No', 'allowed', 'after', 'keyword argument assignment',
'(foo= bar)\n ^'))):
self.checker.process_tokens(tokenize_str('(foo= bar)\n'))
with self.assertAddsMessages(
- Message('C0326', line=1,
+ Message('bad-whitespace', line=1,
args=('No', 'allowed', 'around', 'keyword argument assignment',
'(foo = bar)\n ^'))):
self.checker.process_tokens(tokenize_str('(foo = bar)\n'))
@@ -233,22 +233,22 @@ class CheckSpaceTest(CheckerTestCase):
def testOperatorSpacingBad(self):
with self.assertAddsMessages(
- Message('C0326', line=1,
+ Message('bad-whitespace', line=1,
args=('Exactly one', 'required', 'before', 'comparison', 'a< b\n ^'))):
self.checker.process_tokens(tokenize_str('a< b\n'))
with self.assertAddsMessages(
- Message('C0326', line=1,
+ Message('bad-whitespace', line=1,
args=('Exactly one', 'required', 'after', 'comparison', 'a <b\n ^'))):
self.checker.process_tokens(tokenize_str('a <b\n'))
with self.assertAddsMessages(
- Message('C0326', line=1,
+ Message('bad-whitespace', line=1,
args=('Exactly one', 'required', 'around', 'comparison', 'a<b\n ^'))):
self.checker.process_tokens(tokenize_str('a<b\n'))
with self.assertAddsMessages(
- Message('C0326', line=1,
+ Message('bad-whitespace', line=1,
args=('Exactly one', 'required', 'around', 'comparison', 'a< b\n ^'))):
self.checker.process_tokens(tokenize_str('a< b\n'))