Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions Sources/Data Model/Audience/SemanticVersion.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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] {
Expand All @@ -55,7 +56,11 @@ extension SemanticVersion {
return -1;
}
}


if self.isPreRelease && !targetedVersion.isPreRelease {
return -1;
}

return 0;
}

Expand All @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions Tests/OptimizelyTests-DataModel/SemanticVersionTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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))
}
Expand Down