From 5fdf1eef7bbbb13df509fe80fffc760a543c63de Mon Sep 17 00:00:00 2001 From: FarzadShbfn Date: Sat, 10 Dec 2016 14:09:50 +0330 Subject: [PATCH 1/4] Increase CodeCoverage --- DiffTests/DiffTests.swift | 4 +--- DiffTests/ExtendedPatchSortTests.swift | 1 + DiffTests/PatchSortTests.swift | 10 ++++------ 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/DiffTests/DiffTests.swift b/DiffTests/DiffTests.swift index f7d7edc..c4bb9ac 100644 --- a/DiffTests/DiffTests.swift +++ b/DiffTests/DiffTests.swift @@ -80,9 +80,7 @@ class DiffTests: XCTestCase { func testTracesOutOfBounds() { for expectation in expectations { - if tracesOutOfBounds(from: expectation.0, to: expectation.1) != [] { - XCTFail("traces out of bounds for \(expectation.0) -> \(expectation.1)") - } + XCTAssertEqual(tracesOutOfBounds(from: expectation.0, to: expectation.1), [], "traces out of bounds for \(expectation.0) -> \(expectation.1)") } } diff --git a/DiffTests/ExtendedPatchSortTests.swift b/DiffTests/ExtendedPatchSortTests.swift index ca8f2ee..0b3912a 100644 --- a/DiffTests/ExtendedPatchSortTests.swift +++ b/DiffTests/ExtendedPatchSortTests.swift @@ -53,6 +53,7 @@ class ExtendedPatchSortTests: XCTestCase { let expectations = [ ("gitten", "sitting", "D(4)M(0,4)I(0,s)I(4,i)"), ("1362", "31526", "M(0,2)M(1,3)I(2,5)"), + ("12345", "54321suvx", "M(0,4)M(0,3)M(0,2)M(0,1)I(5,s)I(6,u)I(7,v)I(8,x)") ] let sort: ExtendedSortingFunction = { fst, snd in diff --git a/DiffTests/PatchSortTests.swift b/DiffTests/PatchSortTests.swift index 0112e9e..de409aa 100644 --- a/DiffTests/PatchSortTests.swift +++ b/DiffTests/PatchSortTests.swift @@ -51,13 +51,12 @@ class PatchTests: XCTestCase { switch (element1, element2) { case (.insert(let at1), .insert(let at2)): return at1 < at2 - case (.insert, .delete): + case (.insert(_), .delete(_)): return true - case (.delete, .insert): + case (.delete(_), .insert(_)): return false case (.delete(let at1), .delete(let at2)): return at1 < at2 - default: fatalError() } } @@ -93,13 +92,12 @@ class PatchTests: XCTestCase { switch (element1, element2) { case (.insert(let at1), .insert(let at2)): return at1 < at2 - case (.insert, .delete): + case (.insert(_), .delete(_)): return false - case (.delete, .insert): + case (.delete(_), .insert(_)): return true case (.delete(let at1), .delete(let at2)): return at1 < at2 - default: fatalError() } } From ace3203547d8eeb616b8744ecfcf76d40bbcc52c Mon Sep 17 00:00:00 2001 From: FarzadShbfn Date: Sat, 10 Dec 2016 14:24:46 +0330 Subject: [PATCH 2/4] Fix a test-case to cover `case(.move, .insert)` case for sorting. --- DiffTests/ExtendedPatchSortTests.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DiffTests/ExtendedPatchSortTests.swift b/DiffTests/ExtendedPatchSortTests.swift index 0b3912a..2d74009 100644 --- a/DiffTests/ExtendedPatchSortTests.swift +++ b/DiffTests/ExtendedPatchSortTests.swift @@ -53,7 +53,7 @@ class ExtendedPatchSortTests: XCTestCase { let expectations = [ ("gitten", "sitting", "D(4)M(0,4)I(0,s)I(4,i)"), ("1362", "31526", "M(0,2)M(1,3)I(2,5)"), - ("12345", "54321suvx", "M(0,4)M(0,3)M(0,2)M(0,1)I(5,s)I(6,u)I(7,v)I(8,x)") + ("a1b2c3pq", "3sa1cz2rb", "D(7)D(6)M(5,0)M(3,5)M(3,4)I(1,s)I(5,z)I(7,r)") ] let sort: ExtendedSortingFunction = { fst, snd in @@ -62,8 +62,8 @@ class ExtendedPatchSortTests: XCTestCase { return true case (.insert, _): return false - case (.move, .insert): - return true + case (.move, .insert): + return true case (.move, _): return false } From ce6143d8e8edd544d91bbc3422bf99dbc6085ab8 Mon Sep 17 00:00:00 2001 From: FarzadShbfn Date: Sat, 10 Dec 2016 14:26:39 +0330 Subject: [PATCH 3/4] Fix lint --- DiffTests/ExtendedPatchSortTests.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DiffTests/ExtendedPatchSortTests.swift b/DiffTests/ExtendedPatchSortTests.swift index 2d74009..ecbcd4a 100644 --- a/DiffTests/ExtendedPatchSortTests.swift +++ b/DiffTests/ExtendedPatchSortTests.swift @@ -62,8 +62,8 @@ class ExtendedPatchSortTests: XCTestCase { return true case (.insert, _): return false - case (.move, .insert): - return true + case (.move, .insert): + return true case (.move, _): return false } From 04067b8749e99aa60e71c791f099f676af70b2c6 Mon Sep 17 00:00:00 2001 From: FarzadShbfn Date: Sat, 10 Dec 2016 15:11:24 +0330 Subject: [PATCH 4/4] run swiftformat --- DiffTests/DiffTests.swift | 2 +- DiffTests/ExtendedPatchSortTests.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DiffTests/DiffTests.swift b/DiffTests/DiffTests.swift index c4bb9ac..dd16a93 100644 --- a/DiffTests/DiffTests.swift +++ b/DiffTests/DiffTests.swift @@ -80,7 +80,7 @@ class DiffTests: XCTestCase { func testTracesOutOfBounds() { for expectation in expectations { - XCTAssertEqual(tracesOutOfBounds(from: expectation.0, to: expectation.1), [], "traces out of bounds for \(expectation.0) -> \(expectation.1)") + XCTAssertEqual(tracesOutOfBounds(from: expectation.0, to: expectation.1), [], "traces out of bounds for \(expectation.0) -> \(expectation.1)") } } diff --git a/DiffTests/ExtendedPatchSortTests.swift b/DiffTests/ExtendedPatchSortTests.swift index ecbcd4a..1aafdae 100644 --- a/DiffTests/ExtendedPatchSortTests.swift +++ b/DiffTests/ExtendedPatchSortTests.swift @@ -53,7 +53,7 @@ class ExtendedPatchSortTests: XCTestCase { let expectations = [ ("gitten", "sitting", "D(4)M(0,4)I(0,s)I(4,i)"), ("1362", "31526", "M(0,2)M(1,3)I(2,5)"), - ("a1b2c3pq", "3sa1cz2rb", "D(7)D(6)M(5,0)M(3,5)M(3,4)I(1,s)I(5,z)I(7,r)") + ("a1b2c3pq", "3sa1cz2rb", "D(7)D(6)M(5,0)M(3,5)M(3,4)I(1,s)I(5,z)I(7,r)"), ] let sort: ExtendedSortingFunction = { fst, snd in