Fix Highest/Lowest comparisons with unbounded bounds

KSP-CKAN · Dec 14, 2016 · c36ace0 · c36ace0
1 parent 0763a89
commit c36ace0
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 3 deletions.
diff --git a/Core/Versioning/KspVersionBound.cs b/Core/Versioning/KspVersionBound.cs
@@ -94,7 +94,11 @@ public static KspVersionBound Lowest(params KspVersionBound[] versionBounds)
             if (versionBounds.Any(i => i == null))
                 throw new ArgumentException("Value cannot contain null.", "versionBounds");
 
-            return versionBounds.OrderBy(i => i.Value).ThenBy(i => i.Inclusive).First();
+            return versionBounds
+                .OrderBy(i => i == Unbounded)
+                .ThenBy(i => i.Value)
+                .ThenBy(i => i.Inclusive)
+                .First();
         }
 
         /// <summary>
@@ -115,7 +119,11 @@ public static KspVersionBound Highest(params KspVersionBound[] versionBounds)
             if (versionBounds.Any(i => i == null))
                 throw new ArgumentException("Value cannot contain null.", "versionBounds");
 
-            return versionBounds.OrderByDescending(i => i.Value).ThenBy(i => i.Inclusive).First();
+            return versionBounds
+                .OrderBy(i => i == Unbounded)
+                .ThenByDescending(i => i.Value)
+                .ThenBy(i => i.Inclusive)
+                .First();
         }
     }
 }
diff --git a/Tests/Core/Versioning/KspVersionRangeTests.cs b/Tests/Core/Versioning/KspVersionRangeTests.cs
@@ -271,6 +271,51 @@ public sealed class KspVersionRangeTests
                 ),
                 null
             },
+            new object[]
+            {
+                new KspVersionRange(
+                    new KspVersionBound(new KspVersion(1, 0, 4, 0), true),
+                    new KspVersionBound()
+                ),
+                new KspVersionRange(
+                    new KspVersionBound(new KspVersion(1, 0, 4, 0), true),
+                    new KspVersionBound(new KspVersion(1, 0, 5, 0), false)
+                ),
+                new KspVersionRange(
+                    new KspVersionBound(new KspVersion(1, 0, 4, 0), true),
+                    new KspVersionBound(new KspVersion(1, 0, 5, 0), false)
+                )
+            },
+            new object[]
+            {
+                new KspVersionRange(
+                    new KspVersionBound(),
+                    new KspVersionBound(new KspVersion(1, 0, 4, 0), true)
+                ),
+                new KspVersionRange(
+                    new KspVersionBound(new KspVersion(1, 0, 4, 0), true),
+                    new KspVersionBound(new KspVersion(1, 0, 5, 0), false)
+                ),
+                new KspVersionRange(
+                    new KspVersionBound(new KspVersion(1, 0, 4, 0), true),
+                    new KspVersionBound(new KspVersion(1, 0, 4, 0), true)
+                )
+            },
+            new object[]
+            {
+                new KspVersionRange(
+                    new KspVersionBound(),
+                    new KspVersionBound(new KspVersion(1, 0, 4, 0), false)
+                ),
+                new KspVersionRange(
+                    new KspVersionBound(new KspVersion(1, 0, 3, 0), true),
+                    new KspVersionBound(new KspVersion(1, 0, 4, 0), false)
+                ),
+                new KspVersionRange(
+                    new KspVersionBound(new KspVersion(1, 0, 3, 0), true),
+                    new KspVersionBound(new KspVersion(1, 0, 4, 0), false)
+                )
+            }
         };
 
         private static readonly object[] IsSupersetOfCases =
@@ -376,7 +421,7 @@ public sealed class KspVersionRangeTests
                     new KspVersionBound(new KspVersion(2, 0, 0, 0), true)
                 ),
                 true
-            }
+            },
         };
 
         [Test]