Merge pull request #2944 from austinzheng/az-st2

Adding tests for String's replaceSubrange overloads for closed ranges

Author: gribozavr

stdlib/public/core/StringRangeReplaceableCollection.swift.gyb

@@ -185,7 +185,6 @@ extension String {
     _ bounds: ${Range}<Index>,
     with newElements: C
   ) where C : Collection, C.Iterator.Element == Character {
-    // FIXME: swift-3-indexing-model: tests.
     withMutableCharacters {
       (v: inout CharacterView)
       in v.replaceSubrange(bounds, with: newElements)
@@ -209,7 +208,6 @@ extension String {
   public mutating func replaceSubrange(
     _ bounds: ${Range}<Index>, with newElements: String
   ) {
-    // FIXME: swift-3-indexing-model: tests.
     replaceSubrange(bounds, with: newElements.characters)
   }
 % end

validation-test/stdlib/String.swift

@@ -1285,10 +1285,9 @@ StringTests.test("String.decodeCString/UTF32") {
 internal struct ReplaceSubrangeTest {
   let original: String
   let newElements: String
-  // RangeSelection is defined in CheckRangeReplaceableCollectionType
   let rangeSelection: RangeSelection
   let expected: String
-  let closedExpected: String?  // Expected array for closed ranges
+  let closedExpected: String?
   let loc: SourceLoc
 
   internal init(
@@ -1322,49 +1321,57 @@ let replaceSubrangeTests = [
     original: "eela",
     newElements: "m",
     rangeSelection: .leftEdge,
-    expected: "meela"
+    expected: "meela",
+    closedExpected: "mela"
   ),
   ReplaceSubrangeTest(
     original: "meel",
     newElements: "a",
     rangeSelection: .rightEdge,
-    expected: "meela"
+    expected: "meela",
+    closedExpected: "meea"
   ),
   ReplaceSubrangeTest(
     original: "a",
     newElements: "meel",
     rangeSelection: .leftEdge,
-    expected: "meela"
+    expected: "meela",
+    closedExpected: "meel"
   ),
   ReplaceSubrangeTest(
     original: "m",
     newElements: "eela",
     rangeSelection: .rightEdge,
-    expected: "meela"
+    expected: "meela",
+    closedExpected: "eela"
   ),
   ReplaceSubrangeTest(
     original: "alice",
     newElements: "bob",
     rangeSelection: .offsets(1, 1),
-    expected: "aboblice"
+    expected: "aboblice",
+    closedExpected: "abobice"
   ),
   ReplaceSubrangeTest(
     original: "alice",
     newElements: "bob",
     rangeSelection: .offsets(1, 2),
-    expected: "abobice"
+    expected: "abobice",
+    closedExpected: "abobce"
   ),
   ReplaceSubrangeTest(
     original: "alice",
     newElements: "bob",
     rangeSelection: .offsets(1, 3),
-    expected: "abobce"
+    expected: "abobce",
+    closedExpected: "abobe"
   ),
   ReplaceSubrangeTest(
     original: "alice",
     newElements: "bob",
     rangeSelection: .offsets(1, 4),
-    expected: "abobe"
+    expected: "abobe",
+    closedExpected: "abob"
   ),
   ReplaceSubrangeTest(
     original: "alice",
@@ -1376,7 +1383,8 @@ let replaceSubrangeTests = [
     original: "bob",
     newElements: "meela",
     rangeSelection: .offsets(1, 2),
-    expected: "bmeelab"
+    expected: "bmeelab",
+    closedExpected: "bmeela"
   ),
 ]
 
@@ -1407,4 +1415,37 @@ StringTests.test("String.replaceSubrange()/string/range") {
   }
 }
 
+StringTests.test("String.replaceSubrange()/characters/closedRange") {
+  for test in replaceSubrangeTests {
+    guard let closedExpected = test.closedExpected else {
+      continue
+    }
+    var theString = test.original
+    let c = test.original.characters
+    let rangeToReplace = test.rangeSelection.closedRange(in: c)
+    let newCharacters = Array(test.newElements.characters)
+    theString.replaceSubrange(rangeToReplace, with: newCharacters)
+    expectEqual(
+      theString,
+      closedExpected,
+      stackTrace: SourceLocStack().with(test.loc))
+  }
+}
+
+StringTests.test("String.replaceSubrange()/string/closedRange") {
+  for test in replaceSubrangeTests {
+    guard let closedExpected = test.closedExpected else {
+      continue
+    }
+    var theString = test.original
+    let c = test.original.characters
+    let rangeToReplace = test.rangeSelection.closedRange(in: c)
+    theString.replaceSubrange(rangeToReplace, with: test.newElements)
+    expectEqual(
+      theString,
+      closedExpected,
+      stackTrace: SourceLocStack().with(test.loc))
+  }
+}
+
 runAllTests()