CORE-532: Fix more tests (#1)

BRD wallet name is "BRD"; ETH wallet name is "eth". WalletEvents balancedUpdate/transferAdded can be either order, it seems. The address scheme id for BCH Testnet is "bitcoincash-testnet"
breadwallet · Sep 10, 2019 · 1c9c3ed · 1c9c3ed
1 parent 7c36fea
commit 1c9c3ed
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 31 deletions.
diff --git a/Swift/BRCrypto/BRCryptoSystem.swift b/Swift/BRCrypto/BRCryptoSystem.swift
@@ -145,7 +145,7 @@ public final class System {
         "ethereum-mainnet":     [.ethDefault],
         "ripple-mainnet":       [.genDefault],
         "bitcoin-testnet":      [.btcSegwit, .btcLegacy],
-        "bitcoin-cash-testnet": [.btcLegacy],
+        "bitcoincash-testnet":  [.btcLegacy],
         "ethereum-ropsten":     [.ethDefault],
         "ripple-testnet":       [.genDefault]
     ]
@@ -156,7 +156,7 @@ public final class System {
         "ethereum-mainnet":     .ethDefault,
         "ripple-mainnet":       .genDefault,
         "bitcoin-testnet":      .btcSegwit,
-        "bitcoin-cash-testnet": .btcLegacy,
+        "bitcoincash-testnet":  .btcLegacy,
         "ethereum-ropsten":     .ethDefault,
         "ripple-testnet":       .genDefault
     ]

diff --git a/Swift/BRCryptoTests/BRCryptoTransferTests.swift b/Swift/BRCryptoTests/BRCryptoTransferTests.swift
@@ -86,7 +86,12 @@ class BRCryptoTransferTests: BRCryptoSystemBaseTests {
 
     /// MARK: - BTC
 
-    func runTransferBTCTest () {
+    func runTransferBTCTest (mode: WalletManagerMode) {
+        isMainnet = false
+        currencyCodesNeeded = ["btc"]
+        modeMap = ["btc":mode]
+        prepareAccount (knownAccountSpecification)
+        prepareSystem()
 
         let walletManagerDisconnectExpectation = XCTestExpectation (description: "Wallet Manager Disconnect")
         listener.managerHandlers += [
@@ -146,19 +151,23 @@ class BRCryptoTransferTests: BRCryptoSystemBaseTests {
              EventMatcher (event: WalletManagerEvent.syncStarted),
              EventMatcher (event: WalletManagerEvent.changed(oldState: WalletManagerState.connected, newState: WalletManagerState.syncing)),
 
-             EventMatcher (event: WalletManagerEvent.syncProgress(timestamp: nil, percentComplete: 0), strict: false),
+             // Not in API_MODE
+             // EventMatcher (event: WalletManagerEvent.syncProgress(timestamp: nil, percentComplete: 0), strict: false),
              EventMatcher (event: WalletManagerEvent.walletChanged(wallet: wallet), strict: true, scan: true),
 
              EventMatcher (event: WalletManagerEvent.syncEnded(error: nil), strict: false, scan: true),
              EventMatcher (event: WalletManagerEvent.changed(oldState: WalletManagerState.syncing, newState: WalletManagerState.connected)),
              EventMatcher (event: WalletManagerEvent.changed(oldState: WalletManagerState.connected, newState: WalletManagerState.disconnected))
             ]))
-
-         XCTAssertTrue (listener.checkWalletEvents(
-            [EventMatcher (event: WalletEvent.created),
-             EventMatcher (event: WalletEvent.transferAdded(transfer: transfer), strict: true, scan: true),
-             EventMatcher (event: WalletEvent.balanceUpdated(amount: wallet.balance), strict: true, scan: true)
-            ]))
+
+        XCTAssertTrue (
+            listener.checkWalletEvents ([EventMatcher (event: WalletEvent.created),
+                                         EventMatcher (event: WalletEvent.transferAdded(transfer: transfer), strict: true, scan: true),
+                                         EventMatcher (event: WalletEvent.balanceUpdated(amount: wallet.balance), strict: true, scan: true)])
+                || listener.checkWalletEvents ([EventMatcher (event: WalletEvent.created),
+                                                EventMatcher (event: WalletEvent.balanceUpdated(amount: wallet.balance), strict: true, scan: true),
+                                                EventMatcher (event: WalletEvent.transferAdded(transfer: transfer), strict: true, scan: true)])
+        )
 
         XCTAssertTrue (listener.checkTransferEvents(
             [EventMatcher (event: TransferEvent.created),
@@ -168,23 +177,11 @@ class BRCryptoTransferTests: BRCryptoSystemBaseTests {
     }
 
     func testTransferBTC_API() {
-        isMainnet = false
-        currencyCodesNeeded = ["btc"]
-        modeMap = ["btc":WalletManagerMode.api_only]
-        prepareAccount (knownAccountSpecification)
-        prepareSystem()
-
-        runTransferBTCTest()
+        runTransferBTCTest(mode: WalletManagerMode.api_only)
     }
 
     func testTransferBTC_P2P() {
-        isMainnet = false
-        currencyCodesNeeded = ["btc"]
-        modeMap = ["btc":WalletManagerMode.p2p_only]
-        prepareAccount (knownAccountSpecification)
-        prepareSystem()
-
-        runTransferBTCTest()
+        runTransferBTCTest(mode: WalletManagerMode.p2p_only)
     }
 
     /// MARK: - BCH

diff --git a/Swift/BRCryptoTests/BRCryptoWalletTests.swift b/Swift/BRCryptoTests/BRCryptoWalletTests.swift
@@ -21,17 +21,26 @@ class BRCryptoWalletTests: BRCryptoSystemBaseTests {
     override func tearDown() {
     }
 
-    func testWalletBTC() {
+    func testWalletBTCAsAPI_ONLY() {
+        runWalletBTCTest(mode: WalletManagerMode.api_only)
+    }
+
+    func testWalletBTCAsP2P_ONLY() {
+        runWalletBTCTest(mode: WalletManagerMode.p2p_only)
+    }
+
+    func runWalletBTCTest (mode: WalletManagerMode) {
         isMainnet = false
         currencyCodesNeeded = ["btc"]
-        modeMap = ["btc":WalletManagerMode.api_only]
+        modeMap = ["btc":mode]
         prepareAccount (AccountSpecification (dict: [
             "identifier": "ginger",
             "paperKey":   "ginger settle marine tissue robot crane night number ramp coast roast critic",
             "timestamp":  "2018-01-01",
             "network":    (isMainnet ? "mainnet" : "testnet")
             ]))
-        prepareSystem ()
+
+         prepareSystem ()
 
         let walletManagerDisconnectExpectation = XCTestExpectation (description: "Wallet Manager Disconnect")
         listener.managerHandlers += [
@@ -152,19 +161,27 @@ class BRCryptoWalletTests: BRCryptoSystemBaseTests {
              EventMatcher (event: WalletManagerEvent.syncStarted),
              EventMatcher (event: WalletManagerEvent.changed(oldState: WalletManagerState.connected, newState: WalletManagerState.syncing)),
 
-             EventMatcher (event: WalletManagerEvent.syncProgress(timestamp: nil, percentComplete: 0), strict: false),
+             // On API_ONLY here is no .syncProgress
+             // EventMatcher (event: WalletManagerEvent.syncProgress(timestamp: nil, percentComplete: 0), strict: false),
              EventMatcher (event: WalletManagerEvent.walletChanged(wallet: wallet), strict: true, scan: true),
 
              EventMatcher (event: WalletManagerEvent.syncEnded(error: nil), strict: false, scan: true),
              EventMatcher (event: WalletManagerEvent.changed(oldState: WalletManagerState.syncing, newState: WalletManagerState.connected)),
              EventMatcher (event: WalletManagerEvent.changed(oldState: WalletManagerState.connected, newState: WalletManagerState.disconnected))
             ]))
 
+        // It seems `balanceUpdated` may occur before `transferAdded`
         XCTAssertTrue (listener.checkWalletEvents(
             [EventMatcher (event: WalletEvent.created),
              EventMatcher (event: WalletEvent.transferAdded(transfer: wallet.transfers[0]), strict: true, scan: true),
              EventMatcher (event: WalletEvent.balanceUpdated(amount: wallet.balance), strict: true, scan: true)
-            ]))
+            ])
+            || listener.checkWalletEvents(
+                [EventMatcher (event: WalletEvent.created),
+                 EventMatcher (event: WalletEvent.balanceUpdated(amount: wallet.balance), strict: true, scan: true),
+                 EventMatcher (event: WalletEvent.transferAdded(transfer: wallet.transfers[0]), strict: true, scan: true)
+                ]))
+
     }
 
     func testWalletBCH() {
@@ -249,7 +266,7 @@ class BRCryptoWalletTests: BRCryptoSystemBaseTests {
         XCTAssertNotEqual (w0, w1)
 
         XCTAssertEqual ("eth", w0.name)
-        XCTAssertEqual ("brd", w1.name)
+        XCTAssertEqual ("BRD", w1.name)
 
         let walletETH = manager.primaryWallet
         XCTAssertNotNil(walletETH)

diff --git a/Swift/BRCryptoTests/BRSupportTests.swift b/Swift/BRCryptoTests/BRSupportTests.swift
@@ -60,7 +60,7 @@ class BRSupportTests: XCTestCase {
     func testAsComparableInvert () {
         XCTAssertFalse (AsComparableInvert(value: AsComparable (item: p1, value: p1.age)) >  AsComparableInvert (value: AsComparable (item: p2, value: p2.age)))
         XCTAssertTrue  (AsComparableInvert(value: AsComparable (item: p1, value: p1.age)) <= AsComparableInvert (value: AsComparable (item: p2, value: p2.age)))
-        XCTAssertTrue  (AsComparableInvert(value: AsComparable (item: p1, value: p1.age)) == AsComparableInvert (value: AsComparable (item: p2, value: p2.age)))
+        XCTAssertTrue  (AsComparableInvert(value: AsComparable (item: p1, value: p1.age)) == AsComparableInvert (value: AsComparable (item: p3, value: p3.age)))
     }
 
     func testAsHashable () {