[dak/master 06/10] Split out parse_format to module-level and test it explicitly.
Signed-off-by: Chris Lamb <lamby@debian.org>
---
daklib/srcformats.py | 49 ++++++++++++++++++++++++++++-----------------
tests/test_srcformats.py | 39 +++++++++++++++++------------------
2 files changed, 49 insertions(+), 39 deletions(-)
diff --git a/daklib/srcformats.py b/daklib/srcformats.py
index 2b07c7e..f3afb8d 100644
--- a/daklib/srcformats.py
+++ b/daklib/srcformats.py
@@ -5,6 +5,36 @@ from dak_exceptions import UnknownFormatError
srcformats = []
+def parse_format(txt):
+ """
+ Parse a .changes Format string into a tuple representation for easy
+ comparison.
+
+ >>> parse_format('1.0')
+ (1, 0)
+ >>> parse_format('8.4 (hardy)')
+ (8, 4, 'hardy')
+
+ If the format doesn't match these forms, raises UnknownFormatError.
+ """
+
+ format = re_verwithext.search(txt)
+
+ if format is None:
+ raise UnknownFormatError, txt
+
+ format = format.groups()
+
+ if format[1] is None:
+ format = int(float(format[0])), 0, format[2]
+ else:
+ format = int(format[0]), int(format[1]), format[2]
+
+ if format[2] is None:
+ format = format[:2]
+
+ return format
+
class SourceFormat(type):
def __new__(cls, name, bases, attrs):
klass = super(SourceFormat, cls).__new__(cls, name, bases, attrs)
@@ -28,25 +58,6 @@ class SourceFormat(type):
yield "contains source files not allowed in format %s" % cls.name
@classmethod
- def parse_format(cls, txt):
- format = re_verwithext.search(txt)
-
- if format is None:
- raise UnknownFormatError, txt
-
- format = format.groups()
-
- if format[1] is None:
- format = int(float(format[0])), 0, format[2]
- else:
- format = int(format[0]), int(format[1]), format[2]
-
- if format[2] is None:
- format = format[:2]
-
- return format
-
- @classmethod
def validate_format(cls, format, is_a_dsc=False, field='files'):
if is_a_dsc:
if format != (1,0) and \
diff --git a/tests/test_srcformats.py b/tests/test_srcformats.py
index 9c62d83..0ae1823 100755
--- a/tests/test_srcformats.py
+++ b/tests/test_srcformats.py
@@ -105,28 +105,27 @@ class FormatTreeQuiltTestCase(SourceFormatTestCase):
##
-class ParseFormat(unittest.TestCase):
- def assertFormat(self, input, expected, **kwargs):
- format = srcformats.SourceFormat.parse_format(input)
- self.assertEqual(format, expected)
- srcformats.SourceFormat.validate_format(format, **kwargs)
-
- def assertInvalidFormat(self, input, **kwargs):
- try:
- format = srcformats.SourceFormat.parse_format(input)
- srcformats.SourceFormat.validate_format(format, **kwargs)
- except UnknownFormatError:
- return
+class ParseFormatTestCase(unittest.TestCase):
+ def assertParse(self, format, expected):
+ self.assertEqual(srcformats.parse_format(format), expected)
+
+ def assertParseFail(self, format):
+ self.assertRaises(
+ UnknownFormatError,
+ lambda: srcformats.parse_format(format)
+ )
+
+ def testParse(self):
+ self.assertParse('1.0', (1, 0))
def testEmpty(self):
- self.assertInvalidFormat('')
- self.assertInvalidFormat(' ')
- self.assertInvalidFormat(' ')
-
- def testBroken(self):
- self.assertInvalidFormat('.0')
- self.assertInvalidFormat('.1')
- self.assertInvalidFormat('format')
+ self.assertParseFail('')
+ self.assertParseFail(' ')
+ self.assertParseFail(' ')
+
+ def textText(self):
+ self.assertParse('1.2 (three)', (1, 2, 'three'))
+ self.assertParseFail('0.0 ()')
class ParseSourceFormat(ParseFormat):
def assertFormat(self, *args, **kwargs):
--
1.6.3.3
Reply to: