amended comparable function

-reverted order of StringConvertible

Author: masters3d

Sources/PlayingCard.swift

@@ -31,13 +31,13 @@ public func ==(lhs: PlayingCard, rhs: PlayingCard) -> Bool {
 extension PlayingCard: Comparable {}
 
 public func <(lhs: PlayingCard, rhs: PlayingCard) -> Bool {
-    return lhs.rank == rhs.rank ? lhs.suit == rhs.suit : lhs.rank < rhs.rank
+    return lhs.rank == rhs.rank ? lhs.suit < rhs.suit : lhs.rank < rhs.rank
 }
 
 // MARK: - CustomStringConvertible
 
 extension PlayingCard : CustomStringConvertible {
     public var description: String {
-        return "\(rank)\(suit)"
+        return "\(suit)\(rank)"
     }
 }

Tests/PlayingCard/CardTests.swift

@@ -13,25 +13,27 @@ import XCTest
 
 class CardTests: XCTestCase {
 
-    func testCardSingle(){
+    func testCardSingle() {
         let card1 = PlayingCard(rank: .queen, suit: .diamonds)
         let card2 = PlayingCard(rank: .king, suit: .diamonds)
         let card3 = PlayingCard(rank: .ace, suit: .clubs)
         let card4 = PlayingCard(rank: .queen, suit: .diamonds)
+        let card5 = PlayingCard(rank: .queen, suit: .clubs)
 
         XCTAssertGreaterThan(card2, card1)
         XCTAssertGreaterThan(card3, card2)
         XCTAssertEqual(card1, card4)
+        XCTAssertGreaterThan(card4, card5)
     }
 
-    func testCardStringEquality(){
+    func testCardStringEquality() {
         let card1 = PlayingCard(rank: .jack, suit: .clubs)
         let card2 = PlayingCard(rank: .two, suit: .hearts)
         let card3 = PlayingCard(rank: .queen, suit: .diamonds)
 
-        XCTAssertEqual(String(card1), "J♣︎")
-        XCTAssertEqual(String(card2), "2♡")
-        XCTAssertEqual(String(card3), "Q♢")
+        XCTAssertEqual(String(card1), "♣︎J")
+        XCTAssertEqual(String(card2), "♡2")
+        XCTAssertEqual(String(card3), "♢Q")
     }
 
 }

Tests/PlayingCard/RankTests.swift

@@ -13,7 +13,7 @@ import XCTest
 
 class RankTests: XCTestCase {
 
-    func testRankStringEquality(){
+    func testRankStringEquality() {
         let numbers = [2,3,4,5,6,7,8,9,10]
         let suits = numbers.map{Rank(rawValue:$0)}.flatMap{$0}.map{Int(String($0)) ?? 0}
 
@@ -24,7 +24,7 @@ class RankTests: XCTestCase {
         XCTAssertEqual(numbers, suits)
     }
 
-    func testRankComparable(){
+    func testRankComparable() {
         XCTAssertGreaterThan(Rank.ace, Rank.two)
         XCTAssertGreaterThan(Rank.ace, Rank.king)
         XCTAssertGreaterThan(Rank.king, Rank.queen)

Tests/PlayingCard/SuitTests.swift

@@ -13,19 +13,14 @@ import XCTest
 
 class SuitTests: XCTestCase {
 
-    func testSuitStringEquality(){
-        let c:Suit = .clubs
-        let d:Suit = .diamonds
-        let h:Suit = .hearts
-        let s:Suit = .spades
-        
-        XCTAssertEqual(String(s), "♠︎")
-        XCTAssertEqual(String(h), "♡")
-        XCTAssertEqual(String(d), "♢")
-        XCTAssertEqual(String(c), "♣︎")
+    func testSuitStringEquality() {
+        XCTAssertEqual(String(Suit.spades), "♠︎")
+        XCTAssertEqual(String(Suit.hearts), "♡")
+        XCTAssertEqual(String(Suit.diamonds), "♢")
+        XCTAssertEqual(String(Suit.clubs), "♣︎")
     }
 
-    func testSuitComparable(){
+    func testSuitComparable() {
         XCTAssertGreaterThan(Suit.spades, Suit.diamonds)
         XCTAssertGreaterThan(Suit.hearts, Suit.diamonds )
         XCTAssertGreaterThan(Suit.hearts, Suit.clubs)

Tests/PlayingCard/XCTestManifests.swift

@@ -8,7 +8,7 @@
  See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 */
 
-extension CardTests{
+extension CardTests {
 
     static var allTests : [(String, CardTests -> () throws -> Void)] {
         return [
@@ -18,7 +18,7 @@ extension CardTests{
     }
 }
 
-extension RankTests{
+extension RankTests {
 
     static var allTests : [(String, RankTests -> () throws -> Void)] {
         return [
@@ -28,7 +28,7 @@ extension RankTests{
     }
 }
 
-extension SuitTests{
+extension SuitTests {
 
     static var allTests : [(String, SuitTests -> () throws -> Void)] {
         return [