Fix errors and warnings. Builds, but tests will still fail.

Author: mindgraffiti

WooCommerce/Classes/Tools/Currency/MoneyFormatter.swift

@@ -117,6 +117,17 @@ extension MoneyFormatter {
         return stringResult
     }
 
+    /// Returns a string that displays the amount using all of the specified currency settings
+    /// - Parameters:
+    ///     - localizedAmount: a formatted string returned from `localizeAmount()`
+    ///     - currencyPosition: the currency position, either right, left, right_space, or left_space.
+    ///     - currencyCode: the three-letter country code used for a currency, e.g. CAD.
+
+    // -TODO: currency position should be an enum somewhere. Maybe in the Money struct?
+    func formatCurrency(using localizedAmount: String, positionedAt currencyPosition: String, with currencyCode: Currency.Code) -> String? {
+        return ""
+    }
+
 
     // MARK: - Helper methods
 

WooCommerce/WooCommerceTests/Tools/CurrencyTests.swift

@@ -9,7 +9,7 @@ class CurrencyTests: XCTestCase {
     /// Test currency symbol lookup returns correctly encoded symbol.
     ///
     func testCurrencySymbol() {
-        let currency = Currency(amount: 0.00, code: .AED)
+        let currency = Currency(amount: 0.00, code: .AED, position: .left)
         let symbol = currency.symbol
         XCTAssertEqual("د.إ", symbol)
     }

WooCommerce/WooCommerceTests/Tools/MoneyFormatterTests.swift

@@ -485,19 +485,26 @@ extension MoneyFormatter {
         guard let decimal = decimalAmount else {
             DDLogError("Error: invalid string amount. Cannot convert to decimal.")
             XCTFail()
+            return
         }
 
-        let localizedAmount = MoneyFormatter().localizeAmount(decimal: decimal,
+        let amount = MoneyFormatter().localizeAmount(decimal: decimal,
                                                              decimalSeparator: decimalSeparator,
                                                              decimalPosition: decimalPosition,
                                                              thousandSeparator: thousandSeparator)
 
+        guard let localizedAmount = amount else {
+            XCTFail()
+            return
+        }
+
         let formattedAmount = MoneyFormatter().formatCurrency(using: localizedAmount,
                                                               positionedAt: currencyPosition,
                                                               with: currencyCode)
 
         guard let actualResult = formattedAmount else {
             XCTFail()
+            return
         }
 
         XCTAssertEqual(expectedResult, actualResult)