diff options
author | Raphaël Barrois <raphael.barrois@polytechnique.org> | 2012-05-21 21:35:56 +0200 |
---|---|---|
committer | Raphaël Barrois <raphael.barrois@polytechnique.org> | 2012-05-21 21:35:56 +0200 |
commit | caa1c01858be241bf2a726c780c2f7e8174ecff2 (patch) | |
tree | 9779cc83ef6f43332bbdb7b18de0f8622c2e318a /tests/test_django.py | |
parent | 8b6a0e42d9d703e9a7fec7a95c9f2c672d665a29 (diff) | |
download | semantic-version-caa1c01858be241bf2a726c780c2f7e8174ecff2.tar.gz |
Remove SpecItem.
Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
Diffstat (limited to 'tests/test_django.py')
-rw-r--r-- | tests/test_django.py | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/tests/test_django.py b/tests/test_django.py index 5768c47..b4a3c29 100644 --- a/tests/test_django.py +++ b/tests/test_django.py @@ -35,28 +35,25 @@ if django_loaded: # pragma: no cover @unittest.skipIf(not django_loaded, "Django not installed") class DjangoFieldTestCase(unittest.TestCase): def test_version(self): - obj = models.VersionModel(version='0.1.1', spec='>0.1.0', speclist='==0.1.1,!=0.1.1-alpha') + obj = models.VersionModel(version='0.1.1', spec='==0.1.1,!=0.1.1-alpha') self.assertEqual(semantic_version.Version('0.1.1'), obj.version) - self.assertEqual(semantic_version.SpecItem('>0.1.0'), obj.spec) - self.assertEqual(semantic_version.Spec('==0.1.1,!=0.1.1-alpha'), obj.speclist) + self.assertEqual(semantic_version.Spec('==0.1.1,!=0.1.1-alpha'), obj.spec) - alt_obj = models.VersionModel(version=obj.version, spec=obj.spec, speclist=obj.speclist) + alt_obj = models.VersionModel(version=obj.version, spec=obj.spec) self.assertEqual(semantic_version.Version('0.1.1'), alt_obj.version) - self.assertEqual(semantic_version.SpecItem('>0.1.0'), alt_obj.spec) - self.assertEqual(semantic_version.Spec('==0.1.1,!=0.1.1-alpha'), alt_obj.speclist) + self.assertEqual(semantic_version.Spec('==0.1.1,!=0.1.1-alpha'), alt_obj.spec) self.assertEqual(obj.spec, alt_obj.spec) self.assertEqual(obj.version, alt_obj.version) - self.assertEqual(obj.speclist, alt_obj.speclist) def test_invalid_input(self): self.assertRaises(ValueError, models.VersionModel, - version='0.1.1', spec='blah', speclist='==0.1.1,!=0.1.1-alpha') + version='0.1.1', spec='blah') self.assertRaises(ValueError, models.VersionModel, - version='0.1', spec='>0.1.1', speclist='==0.1.1,!=0.1.1-alpha') + version='0.1', spec='==0.1.1,!=0.1.1-alpha') self.assertRaises(ValueError, models.VersionModel, - version='0.1.1', spec='>0.1.1', speclist='==0,!=0.2') + version='0.1.1', spec='==0,!=0.2') def test_partial(self): obj = models.PartialVersionModel(partial='0.1.0') @@ -64,27 +61,23 @@ class DjangoFieldTestCase(unittest.TestCase): self.assertEqual(semantic_version.Version('0.1.0', partial=True), obj.partial) self.assertIsNone(obj.optional) self.assertIsNone(obj.optional_spec) - self.assertIsNone(obj.optional_speclist) # Copy values to another model alt_obj = models.PartialVersionModel( partial=obj.partial, optional=obj.optional, optional_spec=obj.optional_spec, - optional_speclist=obj.optional_speclist, ) self.assertEqual(semantic_version.Version('0.1.0', partial=True), alt_obj.partial) self.assertEqual(obj.partial, alt_obj.partial) self.assertIsNone(obj.optional) self.assertIsNone(obj.optional_spec) - self.assertIsNone(obj.optional_speclist) def test_serialization(self): - o1 = models.VersionModel(version='0.1.1', spec='<0.2.4-rc42', - speclist='==0.1.1,!=0.1.1-alpha') - o2 = models.VersionModel(version='0.4.3-rc3+build3', spec='==0.4.3', - speclist='<=0.1.1-rc2,!=0.1.1-rc1') + o1 = models.VersionModel(version='0.1.1', spec='==0.1.1,!=0.1.1-alpha') + o2 = models.VersionModel(version='0.4.3-rc3+build3', + spec='<=0.1.1-rc2,!=0.1.1-rc1') data = serializers.serialize('json', [o1, o2]) @@ -94,9 +87,9 @@ class DjangoFieldTestCase(unittest.TestCase): def test_serialization_partial(self): o1 = models.PartialVersionModel(partial='0.1.1', optional='0.2.4-rc42', - optional_spec=None, optional_speclist=None) + optional_spec=None) o2 = models.PartialVersionModel(partial='0.4.3-rc3+build3', optional='', - optional_spec='==1.1.0', optional_speclist='==0.1.1,!=0.1.1-alpha') + optional_spec='==0.1.1,!=0.1.1-alpha') data = serializers.serialize('json', [o1, o2]) |