Add multi vers test for normalized version range

Signed-off-by: Keshav Priyadarshi <[email protected]>
aboutcode-org · Jul 24, 2024 · d2904b0 · d2904b0
1 parent f8a6d70
commit d2904b0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/src/univers/version_range.py b/src/univers/version_range.py
@@ -1299,8 +1299,6 @@ def build_range_from_snyk_advisory_string(scheme: str, string: Union[str, List])
     >>> vr = build_range_from_snyk_advisory_string("pypi", "(,9.21]")
     >>> assert str(vr) == "vers:pypi/<=9.21"
     """
-    # https://security.snyk.io/package/golang/github.com%2Fmattermost%2Fmattermost%2Fserver%2Fpublic%2Fmodel
-    # >=9.6.0-rc1 <9.8.1-rc1
     version_constraints = []
     vrc = RANGE_CLASS_BY_SCHEMES[scheme]
 

diff --git a/tests/test_normalized_range.py b/tests/test_normalized_range.py
@@ -18,20 +18,20 @@
 class TestNormalizedVersionRange(TestCase):
     purl_type = "pypi"
     all_versions = versions = [
-        "1.0",
-        "1.1",
-        "1.2",
-        "1.3",
-        "2.0",
-        "3.0",
+        "1.0.0",
+        "1.1.0",
+        "1.2.0",
+        "1.3.0",
+        "2.0.0",
+        "3.0.0",
     ]
     versions = [SemverVersion(i) for i in all_versions]
 
     def test_get_region(self):
 
-        constraint1 = VersionConstraint(comparator="<=", version=SemverVersion("1.0"))
-        constraint2 = VersionConstraint(comparator="!=", version=SemverVersion("1.1"))
-        constraint3 = VersionConstraint(comparator=">", version=SemverVersion("1.3"))
+        constraint1 = VersionConstraint(comparator="<=", version=SemverVersion("1.0.0"))
+        constraint2 = VersionConstraint(comparator="!=", version=SemverVersion("1.1.0"))
+        constraint3 = VersionConstraint(comparator=">", version=SemverVersion("1.3.0"))
 
         assert get_region(constraint=constraint1, versions=self.versions) == Span(0)
         assert get_region(constraint=constraint2, versions=self.versions) == Span(0).union(
@@ -64,7 +64,19 @@ def test_get_version_range_from_span(self):
         assert str(vr4) == "vers:pypi/1.0.0|>=1.2.0|<=1.3.0|3.0.0"
 
     def test_NormalizedVersionRange_from_vers(self):
-        vr = VersionRange.from_string("vers:pypi/<=1.3|>=2.0|<3.0.0")
-        nvr = NormalizedVersionRange.from_vers(vers_range=vr, all_versions=self.all_versions)
+        vr1 = VersionRange.from_string("vers:pypi/<=1.1.0|>=1.2.0|<=1.3.0|3.0.0")
+        nvr1 = NormalizedVersionRange.from_vers(vers_range=vr1, all_versions=self.all_versions)
 
-        assert str(nvr) == "vers:pypi/>=1.0|<=2.0"
+        vr2 = VersionRange.from_string("vers:pypi/>=1.0.0|<=1.1.0|>=1.2.0|<=1.3.0|3.0.0")
+        nvr2 = NormalizedVersionRange.from_vers(vers_range=vr2, all_versions=self.all_versions)
+
+        vr3 = VersionRange.from_string("vers:pypi/<=1.3.0|3.0.0")
+        nvr3 = NormalizedVersionRange.from_vers(vers_range=vr3, all_versions=self.all_versions)
+
+        vr4 = VersionRange.from_string("vers:pypi/<2.0.0|3.0.0")
+        nvr4 = NormalizedVersionRange.from_vers(vers_range=vr4, all_versions=self.all_versions)
+
+        assert str(nvr1) == "vers:pypi/>=1.0.0|<=1.3.0|3.0.0"
+        assert str(nvr2) == "vers:pypi/>=1.0.0|<=1.3.0|3.0.0"
+        assert str(nvr3) == "vers:pypi/>=1.0.0|<=1.3.0|3.0.0"
+        assert str(nvr4) == "vers:pypi/>=1.0.0|<=1.3.0|3.0.0"