diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2009-11-15 17:53:24 -0500 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2009-11-15 17:53:24 -0500 |
| commit | 7bdce80a45920e3888ac0366fdbfb54c6604eba6 (patch) | |
| tree | 7fe9a9a28931e25d0cc93ea5b27c80ec07951724 /test | |
| parent | 47da566616f14caad010da58f4899a58ebc0b4ae (diff) | |
| download | python-coveragepy-git-7bdce80a45920e3888ac0366fdbfb54c6604eba6.tar.gz | |
Tabs are 8 spaces, as the Python docs dictate. Fixes issue #31.
Diffstat (limited to 'test')
| -rw-r--r-- | test/farm/html/run_tabbed.py | 10 | ||||
| -rw-r--r-- | test/farm/html/src/tabbed.py | 4 | ||||
| -rw-r--r-- | test/test_phystokens.py | 26 |
3 files changed, 32 insertions, 8 deletions
diff --git a/test/farm/html/run_tabbed.py b/test/farm/html/run_tabbed.py index 88ffcaef..e7e60cec 100644 --- a/test/farm/html/run_tabbed.py +++ b/test/farm/html/run_tabbed.py @@ -10,12 +10,14 @@ def html_it(): runfunc(html_it, rundir="src") # Editors like to change things, make sure our source file still has tabs. -contains("src/tabbed.py", "\tif x:\t\t\t\t\t\t# look nice") +contains("src/tabbed.py", "\tif x:\t\t\t\t\t# look nice") contains("html/tabbed.html", - "> <span class='key'>if</span> <span class='nam'>x</span>" - "<span class='op'>:</span> " - " <span class='com'># look nice</span>" + "> <span class='key'>if</span> " + "<span class='nam'>x</span><span class='op'>:</span>" + " " + " " + "<span class='com'># look nice</span>" ) doesnt_contain("html/tabbed.html", "\t") diff --git a/test/farm/html/src/tabbed.py b/test/farm/html/src/tabbed.py index fe426115..bc6bb456 100644 --- a/test/farm/html/src/tabbed.py +++ b/test/farm/html/src/tabbed.py @@ -2,7 +2,7 @@ x = 1 if x: a = "Tabbed" # Aligned comments - if x: # look nice + if x: # look nice b = "No spaces" # when they - c = "Done" # line up. + c = "Done" # line up. diff --git a/test/test_phystokens.py b/test/test_phystokens.py index 64316034..ccbdb5a0 100644 --- a/test/test_phystokens.py +++ b/test/test_phystokens.py @@ -14,8 +14,15 @@ def foo(): say('two = %d' % 2) """ +MIXED_WS = """\ +def hello(): + a="Hello world!" +\tb="indented" +""" + HERE = os.path.split(__file__)[0] + class PhysTokensTest(CoverageTest): """Tests for Coverage.py's improver tokenizer.""" @@ -51,14 +58,29 @@ class PhysTokensTest(CoverageTest): [('ws', ' '), ('nam', 'say'), ('op', '('), ('str', "'two = %d'"), ('ws', ' '), ('op', '%'), ('ws', ' '), ('num', '2'), ('op', ')')] - ] - ) + ]) self.check_tokenization(SIMPLE) + def test_tab_indentation(self): + # Mixed tabs and spaces... + self.assertEqual(list(source_token_lines(MIXED_WS)), + [ + [('key', 'def'), ('ws', ' '), ('nam', 'hello'), ('op', '('), + ('op', ')'), ('op', ':')], + [('ws', ' '), ('nam', 'a'), ('op', '='), + ('str', '"Hello world!"')], + [('ws', ' '), ('nam', 'b'), ('op', '='), + ('str', '"indented"')], + ]) + def test_tokenize_real_file(self): + # Check the tokenization of a real file (large, btw). real_file = os.path.join(HERE, "test_coverage.py") self.check_file_tokenization(real_file) def test_stress(self): + # Check the tokenization of a stress-test file. stress = os.path.join(HERE, "stress_phystoken.txt") self.check_file_tokenization(stress) + +
\ No newline at end of file |