X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=tests%2Ftest_srcformats.py;fp=tests%2Ftest_srcformats.py;h=d7b84496c86251b264aa93f7ee2c0201441fa743;hb=fee8895dd909a9d0f4f4a71c83f689dabee62cfe;hp=0ae182313dcd82108289db099595dead1922a0b8;hpb=b7d36f712210b0efac983da88ae91cdd3fd7f469;p=dak.git

diff --git a/tests/test_srcformats.py b/tests/test_srcformats.py
index 0ae18231..d7b84496 100755
--- a/tests/test_srcformats.py
+++ b/tests/test_srcformats.py
@@ -127,51 +127,64 @@ class ParseFormatTestCase(unittest.TestCase):
         self.assertParse('1.2 (three)', (1, 2, 'three'))
         self.assertParseFail('0.0 ()')
 
-class ParseSourceFormat(ParseFormat):
-    def assertFormat(self, *args, **kwargs):
+class ValidateFormatTestCase(unittest.TestCase):
+    def assertValid(self, format, **kwargs):
         kwargs['is_a_dsc'] = kwargs.get('is_a_dsc', True)
-        super(ParseSourceFormat, self).assertFormat(*args, **kwargs)
+        self.fmt.validate_format(format, **kwargs)
 
-    def assertInvalidFormat(self, *args, **kwargs):
-        kwargs['is_a_dsc'] = kwargs.get('is_a_dsc', True)
-        super(ParseSourceFormat, self).assertInvalidFormat(*args, **kwargs)
+    def assertInvalid(self, *args, **kwargs):
+        self.assertRaises(
+            UnknownFormatError,
+            lambda: self.assertValid(*args, **kwargs),
+        )
 
-    def testSimple(self):
-        self.assertFormat('1.0', (1, 0))
+class ValidateFormatOneTestCase(ValidateFormatTestCase):
+    fmt = srcformats.FormatOne
 
-    def testZero(self):
-        self.assertInvalidFormat('0.0')
+    def testValid(self):
+        self.assertValid((1, 0))
 
-    def testNative(self):
-        self.assertFormat('3.0 (native)', (3, 0, 'native'))
+    def testInvalid(self):
+        self.assertInvalid((0, 1))
+        self.assertInvalid((3, 0, 'quilt'))
 
-    def testQuilt(self):
-        self.assertFormat('3.0 (quilt)', (3, 0, 'quilt'))
+    ##
 
-    def testUnknownThree(self):
-        self.assertInvalidFormat('3.0 (cvs)')
+    def testBinary(self):
+        self.assertValid((1, 5), is_a_dsc=False)
+        self.assertInvalid((1, 0), is_a_dsc=False)
 
-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 testRange(self):
+        self.assertInvalid((1, 3), is_a_dsc=False)
+        self.assertValid((1, 5), is_a_dsc=False)
+        self.assertValid((1, 8), is_a_dsc=False)
+        self.assertInvalid((1, 9), is_a_dsc=False)
 
-    def assertInvalidFormat(self, *args, **kwargs):
-        kwargs['is_a_dsc'] = kwargs.get('is_a_dsc', False)
-        super(ParseBinaryFormat, self).assertInvalidFormat(*args, **kwargs)
+    def testFilesField(self):
+        self.assertInvalid((1, 7), is_a_dsc=False, field='notfiles')
+        self.assertValid((1, 8), is_a_dsc=False, field='notfiles')
 
-    def testSimple(self):
-        self.assertFormat('1.5', (1, 5))
+class ValidateFormatThreeTestCase(ValidateFormatTestCase):
+    fmt = srcformats.FormatThree
 
-    def testRange(self):
-        self.assertInvalidFormat('1.0')
-        self.assertFormat('1.5', (1, 5))
-        self.assertFormat('1.8', (1, 8))
-        self.assertInvalidFormat('1.9')
+    def testValid(self):
+        self.assertValid((3, 0, 'native'))
 
-    def testFilesField(self):
-        self.assertInvalidFormat('1.7', field='notfiles')
-        self.assertFormat('1.8', (1, 8), field='notfiles')
+    def testInvalid(self):
+        self.assertInvalid((1, 0))
+        self.assertInvalid((0, 0))
+        self.assertInvalid((3, 0, 'quilt'))
+
+class ValidateFormatThreeQuiltTestCase(ValidateFormatTestCase):
+    fmt = srcformats.FormatThreeQuilt
+
+    def testValid(self):
+        self.assertValid((3, 0, 'quilt'))
+
+    def testInvalid(self):
+        self.assertInvalid((1, 0))
+        self.assertInvalid((0, 0))
+        self.assertInvalid((3, 0, 'native'))
 
 if __name__ == '__main__':
     unittest.main()