From 7ce156c74927ae99d9f824ce91183b126f7549e9 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sun, 9 Jun 2013 11:59:41 +0100 Subject: Test and handle empty lines better --- yarnlib/block_parser.py | 4 +--- yarnlib/block_parser_tests.py | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'yarnlib') diff --git a/yarnlib/block_parser.py b/yarnlib/block_parser.py index ea3fbce..09a7a22 100644 --- a/yarnlib/block_parser.py +++ b/yarnlib/block_parser.py @@ -44,9 +44,7 @@ class BlockParser(object): def parse_one(self, blocks): assert blocks block = blocks[0] - if not block.strip(): - del blocks[0] - return + assert block t = block.split('\n', 1) assert len(t) in [1,2] if len(t) == 1: diff --git a/yarnlib/block_parser_tests.py b/yarnlib/block_parser_tests.py index 1576950..3dc8111 100644 --- a/yarnlib/block_parser_tests.py +++ b/yarnlib/block_parser_tests.py @@ -52,8 +52,8 @@ class BlockParserTests(unittest.TestCase): self.assertEqual(self.parser.stories[0].name, 'foo bar') def test_handles_empty_line(self): - self.parser.parse_blocks(['']) - self.assertEqual(self.parser.stories, []) + self.parser.parse_blocks(['STORY foo\n\nGIVEN bar\nTHEN foobar']) + self.assertEqual(len(self.parser.stories), 1) def test_parses_implements_in_a_block_by_itself(self): self.parser.parse_blocks(['IMPLEMENTS GIVEN foo\ntrue']) -- cgit v1.2.1