Reorganize the lazy collection tests.

Reordered them so they appear in a somewhat more logical progression. Made the names more consistent.

Author: toddthomas

Tests/SwiftAlgorithmsTests/LazySplitCollectionTests.swift

@@ -20,6 +20,50 @@ final class LazySplitCollectionTests: XCTestCase {
     XCTAssertEqualSequences(testResult, expectedResult)
   }
 
+  func testIntsWithWhereClosure() {
+    let nums = [1, 2, 3, 4, 5, 6, 7]
+    let isEven = { $0 % 2 == 0 }
+    let expectedResult = nums.split(whereSeparator: isEven)
+    let testResult = nums.lazy.split(whereSeparator: isEven)
+    XCTAssertEqualSequences(testResult, expectedResult)
+  }
+
+  func testIntsWithMaxSplits() {
+    let nums = [1, 2, 42, 3, 4, 42, 5, 6, 42, 7]
+    let expectedResult = nums.split(separator: 42, maxSplits: 2)
+    let testResult = nums.lazy.split(separator: 42, maxSplits: 2)
+    XCTAssertEqualSequences(testResult, expectedResult)
+  }
+
+  func testZeroMaxSplits() {
+    let nums = [1, 2, 42, 3, 4, 42, 5, 6, 42, 7]
+    let expectedResult = nums.split(separator: 42, maxSplits: 0)
+    let testResult = nums.lazy.split(separator: 42, maxSplits: 0)
+    XCTAssertEqualSequences(testResult, expectedResult)
+  }
+
+  func testIntsNotOmittingEmpty() {
+    let nums = [1, 2, 42, 3, 4, 42, 42, 5, 6, 42, 7]
+    let expectedResult = nums.split(
+      separator: 42, omittingEmptySubsequences: false)
+    let testResult = nums.lazy.split(
+      separator: 42, omittingEmptySubsequences: false)
+    XCTAssertEqualSequences(testResult, expectedResult)
+  }
+
+  func testIntsEndsWithSeparatorNotOmittingEmpty() {
+    let nums = [7, 42]
+    let expectedResult = nums.split(
+      separator: 42,
+      omittingEmptySubsequences: false
+    )
+    let testResult = nums.lazy.split(
+      separator: 42,
+      omittingEmptySubsequences: false
+    )
+    XCTAssertEqualSequences(testResult, expectedResult)
+  }
+
   func testIntsWithMultipleAdjacentSeparators() {
     let nums = [1, 2, 42, 3, 4, 42, 42, 5, 6, 42, 7]
     let expectedResult = nums.split(separator: 42)
@@ -84,21 +128,21 @@ final class LazySplitCollectionTests: XCTestCase {
     XCTAssertEqualSequences(testResult, expectedResult)
   }
 
-  func testSingleElement() {
+  func testIntsSingleElement() {
     let num = [1]
     let expectedResult = num.split(separator: 42)
     let testResult = num.lazy.split(separator: 42)
     XCTAssertEqualSequences(testResult, expectedResult)
   }
 
-  func testSingleSeparator() {
+  func testIntsSingleSeparator() {
     let num = [42]
     let expectedResult = num.split(separator: 42)
     let testResult = num.lazy.split(separator: 42)
     XCTAssertEqualSequences(testResult, expectedResult)
   }
 
-  func testSingleSeparatorNotOmittingEmpty() {
+  func testIntsSingleSeparatorNotOmittingEmpty() {
     let num = [42]
     let expectedResult = num.split(
       separator: 42, omittingEmptySubsequences: false)
@@ -107,14 +151,14 @@ final class LazySplitCollectionTests: XCTestCase {
     XCTAssertEqualSequences(testResult, expectedResult)
   }
 
-  func testNonSeparatorSandwich() {
+  func testIntsNonSeparatorSandwich() {
     let nums = [42, 1, 42]
     let expectedResult = nums.split(separator: 42)
     let testResult = nums.lazy.split(separator: 42)
     XCTAssertEqualSequences(testResult, expectedResult)
   }
 
-  func testNonSeparatorSandwichNotOmittingEmpty() {
+  func testIntsNonSeparatorSandwichNotOmittingEmpty() {
     let nums = [42, 1, 42]
     let expectedResult = nums.split(
       separator: 42, omittingEmptySubsequences: false)
@@ -123,6 +167,33 @@ final class LazySplitCollectionTests: XCTestCase {
     XCTAssertEqualSequences(testResult, expectedResult)
   }
 
+  func testIntsEmptyEquatableCollection() {
+    let empty: [Int] = []
+    let expectedResult = empty.split(separator: 42)
+    let testResult = empty.lazy.split(separator: 42)
+    XCTAssertEqualSequences(expectedResult, testResult)
+  }
+
+  func testIntsSepCountEqualOrMoreThanElemCount() {
+    let nums = [0, 1, 0, 0, 2]
+    let expectedResult = nums.split(separator: 0)
+    let testResult = nums.lazy.split(separator: 0)
+    XCTAssertEqualSequences(testResult, expectedResult)
+  }
+
+  func testIntsSepCountEqualOrMoreThanElemCountNotOmittingEmpty() {
+    let nums = [0, 1, 0, 0, 2]
+    let expectedResult = nums.split(
+      separator: 0,
+      omittingEmptySubsequences: false
+    )
+    let testResult = nums.lazy.split(
+      separator: 0,
+      omittingEmptySubsequences: false
+    )
+    XCTAssertEqualSequences(testResult, expectedResult)
+  }
+
   func testString() {
     let path = "archive.tar.gz"
     let expectedResult = path.split(separator: ".")
@@ -137,36 +208,13 @@ final class LazySplitCollectionTests: XCTestCase {
     XCTAssertEqualSequences(testResult, expectedResult)
   }
 
-  func testIntsWithMaxSplits() {
-    let nums = [1, 2, 42, 3, 4, 42, 5, 6, 42, 7]
-    let expectedResult = nums.split(separator: 42, maxSplits: 2)
-    let testResult = nums.lazy.split(separator: 42, maxSplits: 2)
-    XCTAssertEqualSequences(testResult, expectedResult)
-  }
-
-  func testZeroMaxSplits() {
-    let nums = [1, 2, 42, 3, 4, 42, 5, 6, 42, 7]
-    let expectedResult = nums.split(separator: 42, maxSplits: 0)
-    let testResult = nums.lazy.split(separator: 42, maxSplits: 0)
-    XCTAssertEqualSequences(testResult, expectedResult)
-  }
-
   func testStringWithMaxSplits() {
     let path = "archive.tar.gz"
     let expectedResult = path.split(separator: ".", maxSplits: 1)
     let testResult = path.lazy.split(separator: ".", maxSplits: 1)
     XCTAssertEqualSequences(testResult, expectedResult)
   }
 
-  func testIntsNotOmittingEmpty() {
-    let nums = [1, 2, 42, 3, 4, 42, 42, 5, 6, 42, 7]
-    let expectedResult = nums.split(
-      separator: 42, omittingEmptySubsequences: false)
-    let testResult = nums.lazy.split(
-      separator: 42, omittingEmptySubsequences: false)
-    XCTAssertEqualSequences(testResult, expectedResult)
-  }
-
   func testStringNotOmittingEmpty() {
     let line = "BLANCHE:   I don't want realism. I want magic!"
     let expectedResult = line.split(
@@ -176,14 +224,6 @@ final class LazySplitCollectionTests: XCTestCase {
     XCTAssertEqualSequences(testResult, expectedResult)
   }
 
-  func testIntsWithWhereClosure() {
-    let nums = [1, 2, 3, 4, 5, 6, 7]
-    let isEven = { $0 % 2 == 0 }
-    let expectedResult = nums.split(whereSeparator: isEven)
-    let testResult = nums.lazy.split(whereSeparator: isEven)
-    XCTAssertEqualSequences(testResult, expectedResult)
-  }
-
   func testStringWithWhereClosure() {
     let line = "BLANCHE:   I don't want realism. I want magic!"
     let isSpace = { $0 == Character(" ") }
@@ -196,31 +236,4 @@ final class LazySplitCollectionTests: XCTestCase {
     let testSubject = "foo.bar".lazy.split(separator: ".")
     XCTAssertLazySequence(testSubject)
   }
-
-  func testEmptyEquatableCollection() {
-    let empty: [Int] = []
-    let expectedResult = empty.split(separator: 42)
-    let testResult = empty.lazy.split(separator: 42)
-    XCTAssertEqualSequences(expectedResult, testResult)
-  }
-
-  func testSepCountEqualOrMoreThanElemCount() {
-    let nums = [0, 1, 0, 0, 2]
-    let expectedResult = nums.split(separator: 0)
-    let testResult = nums.lazy.split(separator: 0)
-    XCTAssertEqualSequences(testResult, expectedResult)
-  }
-
-  func testSepCountEqualOrMoreThanElemCountNotOmittingEmpty() {
-    let nums = [0, 1, 0, 0, 2]
-    let expectedResult = nums.split(
-      separator: 0,
-      omittingEmptySubsequences: false
-    )
-    let testResult = nums.lazy.split(
-      separator: 0,
-      omittingEmptySubsequences: false
-    )
-    XCTAssertEqualSequences(testResult, expectedResult)
-  }
 }