More tests, better initializer labels

Author: KyNorthstar

Semantic Versioning/Semantic Version.swift

@@ -87,11 +87,11 @@ public struct SemanticVersion {
     /// Create a new Semantic Version with explicit parts
     ///
     /// - Parameters:
-    ///   - major: The MAJOR version
-    ///   - minor: The MINOR version
-    ///   - patch: The PATCH version
+    ///   - major:      The MAJOR version
+    ///   - minor:      The MINOR version
+    ///   - patch:      The PATCH version
     ///   - preRelease: Indicates some specific information about a pre-release build, like `RC.1`
-    ///   - build: The build number, like `123` or `exp.sha.5114f85` or `2018.01.14.00.01`
+    ///   - build:      The build number, like `123` or `exp.sha.5114f85` or `2018.01.14.00.01`
     public init(major: Major, minor: Minor, patch: Patch? = nil, preRelease: PreRelease? = nil, build: Build? = nil) {
         self.major = major
         self.minor = minor
@@ -104,12 +104,12 @@ public struct SemanticVersion {
     /// Create a new Semantic Version with explicit (yet unlabelled) parts
     ///
     /// - Parameters:
-    ///   - major: The MAJOR version
-    ///   - minor: The MINOR version
-    ///   - patch: The PATCH version
+    ///   - major:      The MAJOR version
+    ///   - minor:      The MINOR version
+    ///   - patch:      The PATCH version
     ///   - preRelease: Indicates some specific information about a pre-release build, like `RC.1`
-    ///   - build: The build number, like `123` or `exp.sha.5114f85` or `2018.01.14.00.01`
-    public init(_ major: Major, _ minor: Minor, _ patch: Patch? = nil, _ preRelease: PreRelease? = nil, _ build: Build? = nil) {
+    ///   - build:      The build number, like `123` or `exp.sha.5114f85` or `2018.01.14.00.01`
+    public init(_ major: Major, _ minor: Minor, _ patch: Patch? = nil, preRelease: PreRelease? = nil, build: Build? = nil) {
         self.init(major: major, minor: minor, patch: patch, preRelease: preRelease, build: build)
     }
 }

Semantic VersioningTests/Semantic_VersioningTests.swift

@@ -23,9 +23,9 @@ class Semantic_VersioningTests: XCTestCase {
 
 
     func testDescription() {
-        XCTAssertEqual(SemVer(01,2,3,"RC.4",567).description, "1.2.3-RC.4+567")
-        XCTAssertEqual(SemVer(01,2,3,["RC","4"],567).description, "1.2.3-RC.4+567")
-        XCTAssertEqual(SemVer(01,2,3,["RC","4"],[567]).description, "1.2.3-RC.4+567")
+        XCTAssertEqual(SemVer(01,2,3, preRelease: "RC.4", build: 567).description, "1.2.3-RC.4+567")
+        XCTAssertEqual(SemVer(01,2,3, preRelease: ["RC","4"], build: 567).description, "1.2.3-RC.4+567")
+        XCTAssertEqual(SemVer(01,2,3, preRelease: ["RC","4"], build: [567]).description, "1.2.3-RC.4+567")
         XCTAssertEqual(SemVer("1.2.3-RC.4+567")?.description, "1.2.3-RC.4+567")
     }
 
@@ -38,6 +38,7 @@ class Semantic_VersioningTests: XCTestCase {
         XCTAssertEqual(SemVer("1.2.3+567.8"), SemVer(major: 1, minor: 2, patch: 3, build: SemanticVersionBuild(identifiers: [567])))
         XCTAssertEqual(SemVer("1.2-RC.4+567.8"), SemVer(major: 1, minor: 2, preRelease: SemanticVersionPreRelease(identifiers: ["RC", "4"]), build: SemanticVersionBuild(identifiers: ["567", "8"])))
         XCTAssertEqual(SemVer("1.2.3-RC.4+567.8"), SemVer(major: 1, minor: 2, patch: 3, preRelease: SemanticVersionPreRelease(identifiers: ["RC", "4"]), build: SemanticVersionBuild(identifiers: ["567", "8"])))
+        XCTAssertEqual(SemVer("1.2.3-RC.4+567.8"), SemVer(1,2,3, preRelease: ["RC",4], build: [567,8]))
     }
 
 
@@ -56,4 +57,34 @@ class Semantic_VersioningTests: XCTestCase {
         XCTAssertLessThan(SemVer("1.0.0-beta.11")!, SemVer("1.0.0-rc.1")!)
         XCTAssertLessThan(SemVer("1.0.0-rc.1")!, SemVer("1.0.0")!)
     }
+    
+    
+    func testEquivalence() {
+        XCTAssertEqual(SemVer("1.0"), SemVer(major: 1, minor: 0, patch: 0))
+        XCTAssertEqual(SemVer("1.0"), SemVer("1.0.0"))
+        // According to https://semver.org/spec/v2.0.0.html#spec-item-11, "Build metadata does not figure into precedence"
+        XCTAssertEqual(SemVer("1.0+543"), SemVer("1.0+345"))
+        XCTAssertEqual(SemVer(major: 2, minor: 0, preRelease: ["RC", 1]), SemVer(2,0,0, preRelease: ["RC",1]))
+        XCTAssertEqual(SemVer(2,0,0, preRelease: ["RC",1]), SemVer("2.0-RC.1"))
+        XCTAssertEqual(SemVer("2.0-RC.1"), SemVer("2.0.0-RC.1"))
+    }
+    
+    
+    func testInvalid() {
+        XCTAssertNil(SemVer("Obviously Bad"))
+        XCTAssertNil(SemVer("1"))
+        XCTAssertNil(SemVer("-2.0"))
+        XCTAssertNil(SemVer("2.0-β"))
+        XCTAssertNil(SemVer("2.0-beta_1"))
+        XCTAssertNil(SemVer("1.-2"))
+        XCTAssertNil(SemVer("1.2.-3"))
+        XCTAssertNil(SemVer("1.2.3.4"))
+    }
+    
+    
+    func testBasicFixes() {
+        XCTAssertEqual(SemVer(1,2,3), SemVer("01.2.3"))
+        XCTAssertEqual(SemVer(1,2,3), SemVer("1.02.3"))
+        XCTAssertEqual(SemVer(1,2,3), SemVer("1.2.03"))
+    }
 }