[MNY-79]: Reorgs tests; adds Comparable

Money.xcodeproj/project.pbxproj

@@ -27,8 +27,12 @@
 		657FA5301F6C7DF6005B0CE9 /* MoneyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 657FA52B1F6C7DF6005B0CE9 /* MoneyProtocol.swift */; };
 		657FA5311F6C7DF6005B0CE9 /* Money.swift in Sources */ = {isa = PBXBuildFile; fileRef = 657FA52C1F6C7DF6005B0CE9 /* Money.swift */; };
 		657FA5321F6C7DF6005B0CE9 /* CurrencyProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 657FA52D1F6C7DF6005B0CE9 /* CurrencyProtocol.swift */; };
-		657FA5351F6C7E02005B0CE9 /* MoneyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 657FA5331F6C7E02005B0CE9 /* MoneyTests.swift */; };
+		657FA5351F6C7E02005B0CE9 /* InitTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 657FA5331F6C7E02005B0CE9 /* InitTests.swift */; };
 		657FA5361F6C7E02005B0CE9 /* MoneyTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 657FA5341F6C7E02005B0CE9 /* MoneyTestCase.swift */; };
+		657FA5381F6C80FA005B0CE9 /* AdditionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 657FA5371F6C80FA005B0CE9 /* AdditionTests.swift */; };
+		657FA53A1F6C8114005B0CE9 /* SubtractionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 657FA5391F6C8114005B0CE9 /* SubtractionTests.swift */; };
+		657FA53C1F6C811F005B0CE9 /* MultiplicationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 657FA53B1F6C811F005B0CE9 /* MultiplicationTests.swift */; };
+		657FA53E1F6C812C005B0CE9 /* ComparisonTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 657FA53D1F6C812C005B0CE9 /* ComparisonTests.swift */; };
 		65ECB2B11DB3DC9900F96F46 /* Money.h in Headers */ = {isa = PBXBuildFile; fileRef = 65599E6A1DB3CFD300EC123C /* Money.h */; settings = {ATTRIBUTES = (Public, ); }; };
 /* End PBXBuildFile section */
 
@@ -56,8 +60,12 @@
 		657FA52B1F6C7DF6005B0CE9 /* MoneyProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoneyProtocol.swift; sourceTree = "<group>"; };
 		657FA52C1F6C7DF6005B0CE9 /* Money.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Money.swift; sourceTree = "<group>"; };
 		657FA52D1F6C7DF6005B0CE9 /* CurrencyProtocol.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CurrencyProtocol.swift; sourceTree = "<group>"; };
-		657FA5331F6C7E02005B0CE9 /* MoneyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoneyTests.swift; sourceTree = "<group>"; };
+		657FA5331F6C7E02005B0CE9 /* InitTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InitTests.swift; sourceTree = "<group>"; };
 		657FA5341F6C7E02005B0CE9 /* MoneyTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MoneyTestCase.swift; sourceTree = "<group>"; };
+		657FA5371F6C80FA005B0CE9 /* AdditionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionTests.swift; sourceTree = "<group>"; };
+		657FA5391F6C8114005B0CE9 /* SubtractionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubtractionTests.swift; sourceTree = "<group>"; };
+		657FA53B1F6C811F005B0CE9 /* MultiplicationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiplicationTests.swift; sourceTree = "<group>"; };
+		657FA53D1F6C812C005B0CE9 /* ComparisonTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComparisonTests.swift; sourceTree = "<group>"; };
 		65AA39ED1DFEF418000942A7 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
 		65ECB2BF1DB4134C00F96F46 /* Autogenerate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Autogenerate.h; sourceTree = "<group>"; };
 		65ECB2C01DB4134C00F96F46 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -94,9 +102,13 @@
 		655155141DB3D59900368D35 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
-				657FA5341F6C7E02005B0CE9 /* MoneyTestCase.swift */,
-				657FA5331F6C7E02005B0CE9 /* MoneyTests.swift */,
 				6551551A1DB3D59900368D35 /* Info.plist */,
+				657FA5371F6C80FA005B0CE9 /* AdditionTests.swift */,
+				657FA5331F6C7E02005B0CE9 /* InitTests.swift */,
+				657FA5341F6C7E02005B0CE9 /* MoneyTestCase.swift */,
+				657FA5391F6C8114005B0CE9 /* SubtractionTests.swift */,
+				657FA53B1F6C811F005B0CE9 /* MultiplicationTests.swift */,
+				657FA53D1F6C812C005B0CE9 /* ComparisonTests.swift */,
 			);
 			path = Tests;
 			sourceTree = "<group>";
@@ -300,8 +312,12 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				657FA53E1F6C812C005B0CE9 /* ComparisonTests.swift in Sources */,
 				657FA5361F6C7E02005B0CE9 /* MoneyTestCase.swift in Sources */,
-				657FA5351F6C7E02005B0CE9 /* MoneyTests.swift in Sources */,
+				657FA5381F6C80FA005B0CE9 /* AdditionTests.swift in Sources */,
+				657FA53C1F6C811F005B0CE9 /* MultiplicationTests.swift in Sources */,
+				657FA53A1F6C8114005B0CE9 /* SubtractionTests.swift in Sources */,
+				657FA5351F6C7E02005B0CE9 /* InitTests.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Sources/ISOMoney.swift

@@ -79,17 +79,25 @@ struct ISOMoney<C: ISOCurrencyProtocol>: MoneyProtocol {
 
 extension ISOMoney: Equatable {
 
-    static func ==<C>(lhs: ISOMoney<C>, rhs: ISOMoney<C>) -> Bool {
+    static func ==(lhs: ISOMoney<C>, rhs: ISOMoney<C>) -> Bool {
         return lhs.decimal == rhs.decimal
             && lhs.currency.code == rhs.currency.code
             && lhs.currency.scale == rhs.currency.scale
             && lhs.currency.symbol == rhs.currency.symbol
     }
 }
 
-extension ISOMoney: ExpressibleByFloatLiteral { }
+extension ISOMoney: Comparable {
 
+    static func <(lhs: ISOMoney<C>, rhs: ISOMoney<C>) -> Bool {
 
+        if lhs.currency.code != rhs.currency.code {
+            return lhs.currency.code < rhs.currency.code
+        }
+
+        return lhs.decimal < rhs.decimal
+    }
+}
 
 
 

Sources/Money.swift

@@ -85,3 +85,14 @@ extension Money: Equatable {
     }
 }
 
+extension Money: Comparable {
+
+    static func <(lhs: Money, rhs: Money) -> Bool {
+
+        if lhs.currency.code != rhs.currency.code {
+            return lhs.currency.code < rhs.currency.code
+        }
+
+        return lhs.decimal < rhs.decimal
+    }
+}

Tests/AdditionTests.swift

@@ -0,0 +1,55 @@
+//
+// Money
+// File created on 15/09/2017.
+// 	
+// Copyright (c) 2015-2017 Daniel Thorpe
+// 
+// Money is licensed under the MIT License. Read the full license at 
+// https://github.com/danthorpe/Money/blob/master/LICENSE
+//
+
+import XCTest
+
+@testable import Money
+
+extension MoneyTestCase {
+
+    func test__money_addition() {
+        money = 10
+        let result = money + Money(decimal: Decimal(integerLiteral: 10))
+        XCTAssertEqual(result, 20)
+    }
+
+    func test__money_addition_by_integer_literals() {
+        money = 10
+        let result = 3 + money + 2
+        XCTAssertEqual(result, 15)
+    }
+
+    func test__money_addition_by_float_literals() {
+        money = 10
+        let result = 3.5 + money + 2.5
+        XCTAssertEqual(result, 16)
+    }
+}
+
+extension MoneyTestCase {
+
+    func test__iso_addition() {
+        gbp = 10
+        let result = gbp + GBP(decimal: Decimal(integerLiteral: 10))
+        XCTAssertEqual(result, 20)
+    }
+
+    func test__iso_addition_by_integer_literals() {
+        gbp = 10
+        let result = 3 + gbp + 2
+        XCTAssertEqual(result, 15)
+    }
+
+    func test__iso_addition_by_float_literals() {
+        gbp = 10
+        let result = 3.5 + gbp + 2.5
+        XCTAssertEqual(result, 16)
+    }
+}

Tests/ComparisonTests.swift

@@ -0,0 +1,39 @@
+//
+// Money
+// File created on 15/09/2017.
+// 	
+// Copyright (c) 2015-2017 Daniel Thorpe
+// 
+// Money is licensed under the MIT License. Read the full license at 
+// https://github.com/danthorpe/Money/blob/master/LICENSE
+//
+
+import XCTest
+
+@testable import Money
+
+extension MoneyTestCase {
+
+    func test__less_than() {
+        money = 10
+        XCTAssertLessThan(money, 11)
+    }
+
+    func test__greater_than() {
+        money = 10
+        XCTAssertGreaterThan(money, 9)
+    }
+}
+
+extension MoneyTestCase {
+
+    func test__iso_less_than() {
+        gbp = 10
+        XCTAssertLessThan(gbp, 11)
+    }
+
+    func test__iso_greater_than() {
+        gbp = 10
+        XCTAssertGreaterThan(gbp, 9)
+    }
+}

Tests/InitTests.swift

@@ -0,0 +1,39 @@
+//
+// Money
+// File created on 15/09/2017.
+// 	
+// Copyright (c) 2015-2017 Daniel Thorpe
+// 
+// Money is licensed under the MIT License. Read the full license at 
+// https://github.com/danthorpe/Money/blob/master/LICENSE
+//
+
+import XCTest
+
+@testable import Money
+
+extension MoneyTestCase {
+
+    func test__Given_initialized_with_no_argument__Then_money_is_zero() {
+        money = Money()
+        XCTAssertEqual(money, .makeZero())
+        XCTAssertEqual(money, 0)
+    }
+
+    func test__Given_initialized_with_no_argument__Then_gbp_is_zero() {
+        gbp = GBP()
+        XCTAssertEqual(gbp, 0)
+    }
+
+    func test__Given_initialized_with_one__Then_gbp_is_one() {
+        gbp = GBP(integerLiteral: 1)
+        XCTAssertEqual(gbp, 1)
+    }
+
+    func test__Given_initialized_with_double__Then_gbp_is_one() {
+        gbp = GBP(floatLiteral: 10.0)
+        XCTAssertEqual(gbp, 10.0)
+    }
+
+}
+