X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tests%2Ftest_srcformats.py;h=4ecaf8b7fcc83925238f2473ed7961714158eee2;hb=f1ee050ceee00693a9bea2673431291ac480b8b6;hp=802f0ffb688e29ad223760e569213c68c5b3dbe7;hpb=4587ac614fbf2fcdb97cdf2752da2c3ce25c7398;p=dak.git

diff --git a/tests/test_srcformats.py b/tests/test_srcformats.py
index 802f0ffb..4ecaf8b7 100755
--- a/tests/test_srcformats.py
+++ b/tests/test_srcformats.py
@@ -8,6 +8,7 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 from collections import defaultdict
 
 from daklib import srcformats
+from daklib.formats import parse_format
 from daklib.dak_exceptions import UnknownFormatError
 
 class SourceFormatTestCase(unittest.TestCase):
@@ -103,76 +104,27 @@ class FormatTreeQuiltTestCase(SourceFormatTestCase):
             'native_tar': 1,
         })
 
-##
+class FormatFromStringTestCase(unittest.TestCase):
+    def assertFormat(self, txt, klass):
+        self.assertEqual(srcformats.get_format_from_string(txt), klass)
 
-class ParseFormat(unittest.TestCase):
-    def assertFormat(self, input, expected, **kwargs):
-        self.assertEqual(
-            srcformats.SourceFormat.parse_format(input, **kwargs),
-            expected,
-        )
-
-    def assertInvalidFormat(self, input, **kwargs):
+    def assertInvalid(self, txt):
         self.assertRaises(
             UnknownFormatError,
-            lambda: srcformats.SourceFormat.parse_format(input, **kwargs),
+            lambda: srcformats.get_format_from_string(txt),
         )
 
-    def testEmpty(self):
-        self.assertInvalidFormat('')
-        self.assertInvalidFormat(' ')
-        self.assertInvalidFormat('  ')
-
-    def testBroken(self):
-        self.assertInvalidFormat('.0')
-        self.assertInvalidFormat('.1')
-        self.assertInvalidFormat('format')
-
-class ParseSourceFormat(ParseFormat):
-    def assertFormat(self, *args, **kwargs):
-        kwargs['is_a_dsc'] = kwargs.get('is_a_dsc', True)
-        super(ParseSourceFormat, self).assertFormat(*args, **kwargs)
-
-    def assertInvalidFormat(self, *args, **kwargs):
-        kwargs['is_a_dsc'] = kwargs.get('is_a_dsc', True)
-        super(ParseSourceFormat, self).assertInvalidFormat(*args, **kwargs)
-
-    def testSimple(self):
-        self.assertFormat('1.0', (1, 0))
-
-    def testZero(self):
-        self.assertInvalidFormat('0.0')
-
-    def testNative(self):
-        self.assertFormat('3.0 (native)', (3, 0, 'native'))
-
-    def testQuilt(self):
-        self.assertFormat('3.0 (quilt)', (3, 0, 'quilt'))
-
-    def testUnknownThree(self):
-        self.assertInvalidFormat('3.0 (cvs)')
-
-class ParseBinaryFormat(ParseFormat):
-    def assertFormat(self, *args, **kwargs):
-        kwargs['is_a_dsc'] = kwargs.get('is_a_dsc', False)
-        super(ParseBinaryFormat, self).assertFormat(*args, **kwargs)
-
-    def assertInvalidFormat(self, *args, **kwargs):
-        kwargs['is_a_dsc'] = kwargs.get('is_a_dsc', False)
-        super(ParseBinaryFormat, self).assertInvalidFormat(*args, **kwargs)
-
-    def testSimple(self):
-        self.assertFormat('1.5', (1, 5))
-
-    def testRange(self):
-        self.assertInvalidFormat('1.0')
-        self.assertFormat('1.5', (1, 5))
-        self.assertFormat('1.8', (1, 8))
-        self.assertInvalidFormat('1.9')
-
-    def testFilesField(self):
-        self.assertInvalidFormat('1.7', field='notfiles')
-        self.assertFormat('1.8', (1, 8), field='notfiles')
+    def testFormats(self):
+        self.assertFormat('1.0', srcformats.FormatOne)
+        self.assertFormat('3.0 (native)', srcformats.FormatThree)
+        self.assertFormat('3.0 (quilt)', srcformats.FormatThreeQuilt)
+
+    def testInvalidFormats(self):
+        self.assertInvalid('')
+        self.assertInvalid('.')
+        self.assertInvalid('3.0 (cvs)')
+        self.assertInvalid(' 1.0 ')
+        self.assertInvalid('8.4 (hardy)')
 
 if __name__ == '__main__':
     unittest.main()