Test all string extension branches that were missing

Sources/Evergreen/Evergreen+String.swift

@@ -36,7 +36,16 @@ extension String {
     /// - Returns: The new string with the first match, if applicable, replaced
 
     func replaceFirst(matching: NSRegularExpression, with template: String, in range: NSRange? = nil, options: NSRegularExpression.MatchingOptions = []) -> String {
-        let matchedRange = range ?? fullRange()
+        var matchedRange: NSRange!
+
+        if let r = range {
+            matchedRange = r
+        } else {
+            guard let match = matching.firstMatch(in: self, options: [], range: fullRange()) else {
+                return self
+            }
+            matchedRange = match.range
+        }
 
         return matching.stringByReplacingMatches(in: self, options: options, range: matchedRange, withTemplate: template)
     }

Tests/EvergreenTests/StringExtensionTests.swift

@@ -0,0 +1,80 @@
+import Foundation
+import XCTest
+@testable import Evergreen
+
+final class StringExtensionTests: XCTestCase {
+    func testReplaceAllMethod() {
+        let str = "replace replace none replace"
+        let match = try! NSRegularExpression(pattern: "replace", options: [])
+
+        let replaced = str.replaceAll(matching: match, with: "_")
+
+        XCTAssertEqual(replaced, "_ _ none _")
+    }
+
+    func testReplaceFirstMethod() {
+        let str = "replace replace none replace"
+        let match = try! NSRegularExpression(pattern: "replace", options: [])
+
+        let replaced = str.replaceFirst(matching: match, with: "_")
+
+        XCTAssertEqual(replaced, "_ replace none replace")
+    }
+
+    func testReplaceFirstMethodWithMissingRegex() {
+        let str = "replace replace none replace"
+        let match = try! NSRegularExpression(pattern: "missing", options: [])
+
+        let replaced = str.replaceFirst(matching: match, with: "_")
+
+        XCTAssertEqual(replaced, "replace replace none replace")
+    }
+
+    func testReplaceFirstWithPassedRange() {
+        let str = "replace replace none replace"
+        let match = try! NSRegularExpression(pattern: "replace", options: [])
+
+        let range = match.firstMatch(in: str, options: [], range: str.fullRange())?.range
+
+        let replaced = str.replaceFirst(matching: match, with: "_", in: range)
+
+        XCTAssertEqual(replaced, "_ replace none replace")
+    }
+
+    func testStringFromMatchWithPassedRange() {
+        let str = "replace replace none replace"
+
+        let match = try! NSRegularExpression(pattern: "replace", options: [])
+
+        let range = match.firstMatch(in: str, options: [], range: str.fullRange())?.range
+
+        let badMatch = try! NSRegularExpression(pattern: "none", options: [])
+
+        let result = str.stringFromMatch(badMatch, in: range)
+
+        XCTAssertEqual(result, "")
+    }
+
+    func testReplaceRangeWithPassedRange() {
+        var str = "replace replace none replace"
+
+        let match = try! NSRegularExpression(pattern: "replace", options: [])
+
+        let range = match.firstMatch(in: str, options: [], range: str.fullRange())?.range
+
+        let badMatch = try! NSRegularExpression(pattern: "none", options: [])
+
+        str.replaceRange(matching: badMatch, with: "nothing", options: [], range: range)
+
+        XCTAssertEqual(str, "replace replace none replace")
+    }
+
+    static var allTests = [
+        "testReplaceAll",
+        "testReplaceFirstMethod",
+        "testReplaceFirstMethodWithMissingRegex",
+        "testReplaceFirstWithPassedRange",
+        "testStringFromMatchWithPassedRange",
+        "testReplaceRangeWithPassedRange"
+    ]
+}