absurdfarce commented on code in PR #1273:
URL:
https://github.com/apache/cassandra-python-driver/pull/1273#discussion_r2908249532
##########
tests/unit/test_util_types.py:
##########
@@ -251,41 +254,54 @@ def test_version_compare(self):
# patch wins
self.assertTrue(Version('2.3.1') > Version('2.3.0'))
- self.assertTrue(Version('2.3.1') > Version('2.3.0.4post0'))
+ self.assertTrue(Version('2.3.1') > Version('2.3.0-4post0'))
self.assertTrue(Version('2.3.1') > Version('2.3.0.44'))
# various
self.assertTrue(Version('2.3.0.1') > Version('2.3.0.0'))
self.assertTrue(Version('2.3.0.680') > Version('2.3.0.670'))
self.assertTrue(Version('2.3.0.681') > Version('2.3.0.680'))
- self.assertTrue(Version('2.3.0.1build0') > Version('2.3.0.1')) # 4th
part fallback to str cmp
- self.assertTrue(Version('2.3.0.build0') > Version('2.3.0.1')) # 4th
part fallback to str cmp
- self.assertTrue(Version('2.3.0') < Version('2.3.0.build'))
-
- self.assertTrue(Version('4-a') <= Version('4.0.0'))
- self.assertTrue(Version('4-a') <= Version('4.0-alpha1'))
- self.assertTrue(Version('4-a') <= Version('4.0-beta1'))
- self.assertTrue(Version('4.0.0') >= Version('4.0.0'))
- self.assertTrue(Version('4.0.0.421') >= Version('4.0.0'))
- self.assertTrue(Version('4.0.1') >= Version('4.0.0'))
+
+ # If builds are equal then a prerelease always comes before
+ self.assertTrue(Version('2.3.0.1-SNAPSHOT') < Version('2.3.0.1'))
+
+ # If both have prereleases we fall back to a string compare
+ self.assertTrue(Version('2.3.0.1-SNAPSHOT') <
Version('2.3.0.1-ZNAPSHOT'))
+
self.assertTrue(Version('2.3.0') == Version('2.3.0'))
self.assertTrue(Version('2.3.32') == Version('2.3.32'))
self.assertTrue(Version('2.3.32') == Version('2.3.32.0'))
- self.assertTrue(Version('2.3.0.build') == Version('2.3.0.build'))
+ self.assertTrue(Version('2.3.0-SNAPSHOT') == Version('2.3.0-SNAPSHOT'))
- self.assertTrue(Version('4') == Version('4.0.0'))
self.assertTrue(Version('4.0') == Version('4.0.0.0'))
self.assertTrue(Version('4.0') > Version('3.9.3'))
- self.assertTrue(Version('4.0') > Version('4.0-SNAPSHOT'))
- self.assertTrue(Version('4.0-SNAPSHOT') == Version('4.0-SNAPSHOT'))
- self.assertTrue(Version('4.0.0-SNAPSHOT') == Version('4.0-SNAPSHOT'))
- self.assertTrue(Version('4.0.0-SNAPSHOT') == Version('4.0.0-SNAPSHOT'))
- self.assertTrue(Version('4.0.0.build5-SNAPSHOT') ==
Version('4.0.0.build5-SNAPSHOT'))
- self.assertTrue(Version('4.1-SNAPSHOT') > Version('4.0-SNAPSHOT'))
- self.assertTrue(Version('4.0.1-SNAPSHOT') > Version('4.0.0-SNAPSHOT'))
- self.assertTrue(Version('4.0.0.build6-SNAPSHOT') >
Version('4.0.0.build5-SNAPSHOT'))
- self.assertTrue(Version('4.0-SNAPSHOT2') > Version('4.0-SNAPSHOT1'))
- self.assertTrue(Version('4.0-SNAPSHOT2') > Version('4.0.0-SNAPSHOT1'))
-
- self.assertTrue(Version('4.0.0-alpha1-SNAPSHOT') >
Version('4.0.0-SNAPSHOT'))
+
+ equalTuples = [
+ (Version('4.0-SNAPSHOT'), Version('4.0-SNAPSHOT')),
+ (Version('4.0.0-SNAPSHOT'), Version('4.0-SNAPSHOT')),
+ (Version('4.0.0-SNAPSHOT'), Version('4.0.0-SNAPSHOT')),
+ (Version('4.0.0.5-SNAPSHOT'), Version('4.0.0.5-SNAPSHOT'))
+ ]
+ for (a,b) in equalTuples:
+ self.assertEqual(a, b)
+ self.assertEqual(hash(a), hash(b))
+
+ leftgreaterTuples = [
+ (Version('4.0'), Version('4.0-SNAPSHOT')),
+ (Version('4.1-SNAPSHOT'), Version('4.0-SNAPSHOT')),
+ (Version('4.0.1-SNAPSHOT'), Version('4.0.0-SNAPSHOT')),
+ (Version('4.0.0.6-SNAPSHOT'), Version('4.0.0.5-SNAPSHOT')),
+ (Version('4.0-SNAPSHOT2'), Version('4.0-SNAPSHOT1')),
+ (Version('4.0-SNAPSHOT2'), Version('4.0.0-SNAPSHOT1')),
+ (Version('4.0.0-alpha1-SNAPSHOT'), Version('4.0.0-SNAPSHOT'))
+ ]
+ for (a,b) in leftgreaterTuples:
+ self.assertGreater(a, b)
+ self.assertNotEqual(hash(a), hash(b))
+
Review Comment:
I worried about this but I thought it would be better to have the checks in
place since in the vast majority of cases collisions are extremely unlikely.
But I don't feel super-strongly about it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
