From e284d74be1695f96a5abcff271814e50b883a78a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Verg=C3=A9?= Date: Fri, 10 Apr 2020 17:54:58 +0200 Subject: [PATCH] quoted-strings: Rename tests names for clarity And move only-when-needed tests at the end for readability. --- tests/rules/test_quoted_strings.py | 100 ++++++++++++++--------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/tests/rules/test_quoted_strings.py b/tests/rules/test_quoted_strings.py index 0fdba71..3f0d8a8 100644 --- a/tests/rules/test_quoted_strings.py +++ b/tests/rules/test_quoted_strings.py @@ -137,17 +137,17 @@ class QuotedTestCase(RuleTestCase): ' word 2"\n', conf, problem1=(9, 3)) - def test_disallow_redundant_quotes(self): - conf = 'quoted-strings: {required: only-when-needed}\n' + def test_single_quotes_required(self): + conf = 'quoted-strings: {quote-type: single, required: true}\n' self.check('---\n' 'boolean1: true\n' 'number1: 123\n' - 'string1: foo\n' + 'string1: foo\n' # fails 'string2: "foo"\n' # fails - 'string3: "true"\n' - 'string4: "123"\n' - 'string5: \'bar\'\n' # fails + 'string3: "true"\n' # fails + 'string4: "123"\n' # fails + 'string5: \'bar\'\n' 'string6: !!str genericstring\n' 'string7: !!str 456\n' 'string8: !!str "quotedgenericstring"\n' @@ -155,7 +155,8 @@ class QuotedTestCase(RuleTestCase): 'integer: !!int intstring\n' 'boolean2: !!bool boolstring\n' 'boolean3: !!bool "quotedboolstring"\n', - conf, problem1=(5, 10), problem2=(8, 10)) + conf, problem1=(4, 10), problem2=(5, 10), + problem3=(6, 10), problem4=(7, 10)) self.check('---\n' 'multiline string 1: |\n' ' line 1\n' @@ -164,25 +165,24 @@ class QuotedTestCase(RuleTestCase): ' word 1\n' ' word 2\n' 'multiline string 3:\n' - ' word 1\n' + ' word 1\n' # fails ' word 2\n' 'multiline string 4:\n' ' "word 1\\\n' # fails ' word 2"\n', - conf, problem1=(12, 3)) + conf, problem1=(9, 3), problem2=(12, 3)) - def test_disallow_redundant_single_quotes(self): - conf = 'quoted-strings: {quote-type: single, ' + \ - 'required: only-when-needed}\n' + def test_any_quotes_not_required(self): + conf = 'quoted-strings: {quote-type: any, required: false}\n' self.check('---\n' 'boolean1: true\n' 'number1: 123\n' 'string1: foo\n' - 'string2: "foo"\n' # fails - 'string3: "true"\n' # fails - 'string4: "123"\n' # fails - 'string5: \'bar\'\n' # fails + 'string2: "foo"\n' + 'string3: "true"\n' + 'string4: "123"\n' + 'string5: \'bar\'\n' 'string6: !!str genericstring\n' 'string7: !!str 456\n' 'string8: !!str "quotedgenericstring"\n' @@ -190,8 +190,7 @@ class QuotedTestCase(RuleTestCase): 'integer: !!int intstring\n' 'boolean2: !!bool boolstring\n' 'boolean3: !!bool "quotedboolstring"\n', - conf, problem1=(5, 10), problem2=(6, 10), - problem3=(7, 10), problem4=(8, 10)) + conf) self.check('---\n' 'multiline string 1: |\n' ' line 1\n' @@ -203,17 +202,17 @@ class QuotedTestCase(RuleTestCase): ' word 1\n' ' word 2\n' 'multiline string 4:\n' - ' "word 1\\\n' # fails + ' "word 1\\\n' ' word 2"\n', - conf, problem1=(12, 3)) + conf) - def test_single_quotes_required(self): - conf = 'quoted-strings: {quote-type: single, required: true}\n' + def test_single_quotes_not_required(self): + conf = 'quoted-strings: {quote-type: single, required: false}\n' self.check('---\n' 'boolean1: true\n' 'number1: 123\n' - 'string1: foo\n' # fails + 'string1: foo\n' 'string2: "foo"\n' # fails 'string3: "true"\n' # fails 'string4: "123"\n' # fails @@ -225,7 +224,7 @@ class QuotedTestCase(RuleTestCase): 'integer: !!int intstring\n' 'boolean2: !!bool boolstring\n' 'boolean3: !!bool "quotedboolstring"\n', - conf, problem1=(4, 10), problem2=(5, 10), + conf, problem2=(5, 10), problem3=(6, 10), problem4=(7, 10)) self.check('---\n' 'multiline string 1: |\n' @@ -235,20 +234,20 @@ class QuotedTestCase(RuleTestCase): ' word 1\n' ' word 2\n' 'multiline string 3:\n' - ' word 1\n' # fails + ' word 1\n' ' word 2\n' 'multiline string 4:\n' ' "word 1\\\n' # fails ' word 2"\n', - conf, problem1=(9, 3), problem2=(12, 3)) + conf, problem1=(12, 3)) - def test_any_quotes_relaxed(self): - conf = 'quoted-strings: {quote-type: any, required: false}\n' + def test_quotes_required(self): + conf = 'quoted-strings: {quote-type: any, required: true}\n' self.check('---\n' 'boolean1: true\n' 'number1: 123\n' - 'string1: foo\n' + 'string1: foo\n' # fails 'string2: "foo"\n' 'string3: "true"\n' 'string4: "123"\n' @@ -260,7 +259,7 @@ class QuotedTestCase(RuleTestCase): 'integer: !!int intstring\n' 'boolean2: !!bool boolstring\n' 'boolean3: !!bool "quotedboolstring"\n', - conf) + conf, problem2=(4, 10)) self.check('---\n' 'multiline string 1: |\n' ' line 1\n' @@ -269,24 +268,24 @@ class QuotedTestCase(RuleTestCase): ' word 1\n' ' word 2\n' 'multiline string 3:\n' - ' word 1\n' + ' word 1\n' # fails ' word 2\n' 'multiline string 4:\n' ' "word 1\\\n' ' word 2"\n', - conf) + conf, problem1=(9, 3)) - def test_single_quotes_relaxed(self): - conf = 'quoted-strings: {quote-type: single, required: false}\n' + def test_only_when_needed(self): + conf = 'quoted-strings: {required: only-when-needed}\n' self.check('---\n' 'boolean1: true\n' 'number1: 123\n' 'string1: foo\n' 'string2: "foo"\n' # fails - 'string3: "true"\n' # fails - 'string4: "123"\n' # fails - 'string5: \'bar\'\n' + 'string3: "true"\n' + 'string4: "123"\n' + 'string5: \'bar\'\n' # fails 'string6: !!str genericstring\n' 'string7: !!str 456\n' 'string8: !!str "quotedgenericstring"\n' @@ -294,8 +293,7 @@ class QuotedTestCase(RuleTestCase): 'integer: !!int intstring\n' 'boolean2: !!bool boolstring\n' 'boolean3: !!bool "quotedboolstring"\n', - conf, problem2=(5, 10), - problem3=(6, 10), problem4=(7, 10)) + conf, problem1=(5, 10), problem2=(8, 10)) self.check('---\n' 'multiline string 1: |\n' ' line 1\n' @@ -311,17 +309,18 @@ class QuotedTestCase(RuleTestCase): ' word 2"\n', conf, problem1=(12, 3)) - def test_quotes_required(self): - conf = 'quoted-strings: {quote-type: any, required: true}\n' + def test_only_when_needed_single_quotes(self): + conf = ('quoted-strings: {quote-type: single,\n' + ' required: only-when-needed}\n') self.check('---\n' 'boolean1: true\n' 'number1: 123\n' - 'string1: foo\n' # fails - 'string2: "foo"\n' - 'string3: "true"\n' - 'string4: "123"\n' - 'string5: \'bar\'\n' + 'string1: foo\n' + 'string2: "foo"\n' # fails + 'string3: "true"\n' # fails + 'string4: "123"\n' # fails + 'string5: \'bar\'\n' # fails 'string6: !!str genericstring\n' 'string7: !!str 456\n' 'string8: !!str "quotedgenericstring"\n' @@ -329,7 +328,8 @@ class QuotedTestCase(RuleTestCase): 'integer: !!int intstring\n' 'boolean2: !!bool boolstring\n' 'boolean3: !!bool "quotedboolstring"\n', - conf, problem2=(4, 10)) + conf, problem1=(5, 10), problem2=(6, 10), + problem3=(7, 10), problem4=(8, 10)) self.check('---\n' 'multiline string 1: |\n' ' line 1\n' @@ -338,9 +338,9 @@ class QuotedTestCase(RuleTestCase): ' word 1\n' ' word 2\n' 'multiline string 3:\n' - ' word 1\n' # fails + ' word 1\n' ' word 2\n' 'multiline string 4:\n' - ' "word 1\\\n' + ' "word 1\\\n' # fails ' word 2"\n', - conf, problem1=(9, 3)) + conf, problem1=(12, 3))