fix tests that failed on FSC (#352)

Author: thomaszurkan-optimizely

Sources/Data Model/Audience/SemanticVersion.swift

@@ -35,7 +35,8 @@ extension SemanticVersion {
         // Up to the precision of targetedVersion, expect version to match exactly.
         for (idx, _) in targetedVersionParts.enumerated() {
             if versionParts.count <= idx {
-              return -1;
+                // even if they are equal at this point. if the target is a prerelease then it must be greater than the pre release.
+                return targetedVersion.isPreRelease ?  1 : -1
             } else if !versionParts[idx].isNumber {
                 //Compare strings
                 if versionParts[idx] < targetedVersionParts[idx] {
@@ -55,7 +56,11 @@ extension SemanticVersion {
                 return -1;
             }
         }
-
+        
+        if self.isPreRelease && !targetedVersion.isPreRelease {
+            return -1;
+        }
+    
         return 0;
     }
 
@@ -78,8 +83,12 @@ extension SemanticVersion {
             targetSuffix = targetParts[1...]
         }
         // Expect a version string of the form x.y.z
+        let dotCount = targetPrefix.filter({$0 == "."}).count
+        if dotCount > 3 {
+            throw OptimizelyError.attributeFormatInvalid
+        }
         var targetedVersionParts = targetPrefix.split(separator: ".")
-        guard targetedVersionParts.count > 0 else {
+        guard targetedVersionParts.count == dotCount + 1 else {
             throw OptimizelyError.attributeFormatInvalid
         }
         if let targetSuffix = targetSuffix {

Tests/OptimizelyTests-DataModel/SemanticVersionTests.swift

@@ -140,18 +140,18 @@ class SemanticVersionTests: XCTestCase {
         XCTAssert(try version.compareVersion(targetedVersion: target) > 0)
     }
 
-    func testTargetWithVersionBetaEqual() {
+    func testTargetWithVersionBetaLess() {
         let target = "2.1.3"
         let version = "2.1.3-beta"
 
-        XCTAssert(try version.compareVersion(targetedVersion: target) == 0)
+        XCTAssert(try version.compareVersion(targetedVersion: target) < 0)
     }
 
-    func testVersionBetaLess() {
-        let target = "2.1.4"
-        let version = "2.1.3-beta"
+    func testTargetBetaLess() {
+        let target = "2.1.3-beta"
+        let version = "2.1.3"
 
-        XCTAssert(try version.compareVersion(targetedVersion: target) < 0)
+        XCTAssert(try version.compareVersion(targetedVersion: target) > 0)
     }
 
     func testOtherTests() {
@@ -165,7 +165,7 @@ class SemanticVersionTests: XCTestCase {
 
     func testInvalidAttributes() {
         let target = "2.1.0"
-        let versions = ["-", ".", "..", "+", "+test", " ", "2 .3. 0"]
+        let versions = ["-", ".", "..", "+", "+test", " ", "2 .3. 0", "2.", ".2.2"]
         for (_, version) in versions.enumerated() {
             XCTAssert(((try? (version.compareVersion(targetedVersion: target)) < 0) == nil))
         }