Merge branch 'couchbaselabs:master' into master

Author: Ronith-J

src/com/couchbase/tools/performer/BuildPerformer.groovy

@@ -144,12 +144,8 @@ class BuildPerformer {
                 case Sdk.DOTNET:
                     // 3.3.0 is earliest supported
                     def target = ImplementationVersion.from("3.3.0")
-                    def skipVersions = [
-                            new ImplementationVersion(3, 4, 10, "rc1"),
-                            new ImplementationVersion(3, 4, 5, "rc2")
-                    ]
                     def vers = DotNetVersions.allReleases
-                            .findAll { (it.isAbove(target) || it.equals(target)) && !skipVersions.contains(it)}
+                            .findAll { it.isAbove(target) || it.equals(target) }
                     def implementation = new PerfConfig.Implementation(".NET", "3.X.0", null)
                     versions = Versions.versions(env, implementation, ".NET", vers)
                     break

src/com/couchbase/versions/DotNetVersions.groovy

@@ -15,6 +15,11 @@ class DotNetVersions {
 
     @Memoized
     static Set<ImplementationVersion> getAllReleases() {
-        return GithubVersions.getAllReleases(REPO)
+        var allVersions = GithubVersions.getAllReleases(REPO)
+        var skipVersions = [
+                new ImplementationVersion(3, 4, 10, "-rc1"),
+                new ImplementationVersion(3, 4, 5, "-rc2")
+        ]
+        return allVersions.findAll {it -> !skipVersions.contains(it) }
     }
 }

test/src/com/couchbase/versions/DotnetVersionsTest.groovy

@@ -0,0 +1,18 @@
+package com.couchbase.versions
+
+import org.junit.jupiter.api.Test
+import static org.junit.jupiter.api.Assertions.assertFalse
+
+class DotNetVersionsTest {
+
+    @Test
+    void testGetAllReleases() {
+        Set<ImplementationVersion> allReleases = DotNetVersions.getAllReleases()
+
+        ImplementationVersion version1 = new ImplementationVersion(3, 4, 5, "-rc2")
+        ImplementationVersion version2 = new ImplementationVersion(3, 4, 10, "-rc1")
+
+        assertFalse(allReleases.contains(version1), "Version 3.4.5-rc2 should be filtered out")
+        assertFalse(allReleases.contains(version2), "Version 3.4.10-rc1 should be filtered out")
+    }
+}