[FXIOS-12033] More unit tests

Author: mattreaganmozilla

firefox-ios/Client/Application/RemoteSettings/Application Services/ASSearchEngineUtilities.swift

@@ -50,7 +50,9 @@ struct ASSearchEngineUtilities {
         if let searchArg = searchURL.searchTermParamName, !searchURL.base.contains("{searchTerms}") {
             queryItems.append(URLQueryItem(name: searchArg, value: "{searchTerms}"))
         }
-        components.queryItems = queryItems
+        if !queryItems.isEmpty {
+            components.queryItems = queryItems
+        }
 
         return components.url?.absoluteString.removingPercentEncoding
     }

firefox-ios/firefox-ios-tests/Tests/ClientTests/RemoteSettings/ASSearchEngineUtilitiesTests.swift

@@ -10,6 +10,30 @@ import WebKit
 import MozillaAppServices
 
 class ASSearchEngineUtilitiesTests: XCTestCase {
+    private let leo_eng_deu_engine =
+    SearchEngineDefinition(
+        aliases: [],
+        charset: "UTF-8",
+        classification: .unknown,
+        identifier: "leo_ende_de",
+        name: "LEO Eng-Deu",
+        optional: false,
+        partnerCode: "",
+        telemetrySuffix: "",
+        urls: SearchEngineUrls(
+            search: SearchEngineUrl(
+                base: "https://dict.leo.org/englisch-deutsch/{searchTerms}",
+                method: "GET",
+                params: [],
+                searchTermParamName: nil
+            ),
+            suggestions: nil,
+            trending: nil,
+            searchForm: nil
+        ),
+        orderHint: nil,
+        clickUrl: nil
+    )
     private let google_US_testEngine =
     SearchEngineDefinition(
         aliases: ["google"],
@@ -89,4 +113,25 @@ class ASSearchEngineUtilitiesTests: XCTestCase {
         let expected = "https://www.google.com/complete/search?client=firefox&q={searchTerms}"
         XCTAssertEqual(result, expected)
     }
+
+    func testEmptyPartnerCodeSearchURL() {
+        var engine = google_US_testEngine
+
+        // Force an empty partnerCode string:
+        engine.partnerCode = ""
+
+        let result = ASSearchEngineUtilities.convertASSearchURLToOpenSearchURL(engine.urls.search,
+                                                                               for: engine)
+        let expected = "https://www.google.com/search?client=&q={searchTerms}"
+        XCTAssertEqual(result, expected)
+    }
+
+    func testSearchTermIncludedInBaseURL() {
+        let engine = leo_eng_deu_engine
+
+        let result = ASSearchEngineUtilities.convertASSearchURLToOpenSearchURL(engine.urls.search,
+                                                                               for: engine)
+        let expected = "https://dict.leo.org/englisch-deutsch/{searchTerms}"
+        XCTAssertEqual(result, expected)
+    }
 }