Update unit tests for suspend function signatures

Author: kidinov

libs/cardreader/src/main/java/com/woocommerce/android/cardreader/internal/connection/ConnectionManager.kt

@@ -146,7 +146,7 @@ internal class ConnectionManager(
             terminal.disconnectReader()
             updateReaderStatus(CardReaderStatus.NotConnected())
             true
-        } catch (e: TerminalException) {
+        } catch (@Suppress("SwallowedException") e: TerminalException) {
             updateReaderStatus(CardReaderStatus.NotConnected())
             false
         }

libs/cardreader/src/main/java/com/woocommerce/android/cardreader/internal/wrappers/TerminalWrapper.kt

@@ -24,8 +24,8 @@ import com.stripe.stripeterminal.external.models.TapToPayUxConfiguration.Color
 import com.stripe.stripeterminal.ktx.cancelPaymentIntent
 import com.stripe.stripeterminal.ktx.connectReader
 import com.stripe.stripeterminal.ktx.createPaymentIntent
-import com.stripe.stripeterminal.ktx.discoverReaders
 import com.stripe.stripeterminal.ktx.disconnectReader
+import com.stripe.stripeterminal.ktx.discoverReaders
 import com.stripe.stripeterminal.ktx.processPaymentIntent
 import com.stripe.stripeterminal.ktx.processRefund
 import com.stripe.stripeterminal.log.LogLevel

libs/cardreader/src/test/java/com/woocommerce/android/cardreader/internal/connection/ConnectionManagerTest.kt

@@ -1,8 +1,6 @@
 package com.woocommerce.android.cardreader.internal.connection
 
 import android.app.Application
-import com.stripe.stripeterminal.external.callable.Callback
-import com.stripe.stripeterminal.external.callable.ReaderCallback
 import com.stripe.stripeterminal.external.models.DeviceType
 import com.stripe.stripeterminal.external.models.Reader
 import com.stripe.stripeterminal.external.models.TerminalErrorCode
@@ -60,7 +58,6 @@ class ConnectionManagerTest : CardReaderBaseUnitTest() {
         val defaultReaderStatus: StateFlow<CardReaderStatus> = MutableStateFlow(CardReaderStatus.NotConnected())
         whenever(terminalListenerImpl.readerStatus).thenReturn(defaultReaderStatus)
 
-        // uses the previously created mock objects
         connectionManager = ConnectionManager(
             terminalWrapper,
             bluetoothReaderListener,
@@ -246,9 +243,7 @@ class ConnectionManagerTest : CardReaderBaseUnitTest() {
             val cardReader: CardReaderImpl = mock {
                 on { cardReader }.thenReturn(reader)
             }
-            whenever(terminalWrapper.connectToReader(any(), any(), any())).thenAnswer {
-                (it.arguments[2] as ReaderCallback).onSuccess(mock())
-            }
+            whenever(terminalWrapper.connectToReader(any(), any())).thenReturn(mock())
 
             connectionManager.startConnectionToReader(cardReader, "location_id")
 
@@ -270,9 +265,7 @@ class ConnectionManagerTest : CardReaderBaseUnitTest() {
                 on { errorMessage }.thenReturn(message)
                 on { this.errorCode }.thenReturn(errorCode)
             }
-            whenever(terminalWrapper.connectToReader(any(), any(), any())).thenAnswer {
-                (it.arguments[2] as ReaderCallback).onFailure(exception)
-            }
+            whenever(terminalWrapper.connectToReader(any(), any())).thenAnswer { throw exception }
 
             connectionManager.startConnectionToReader(cardReader, "location_id")
 
@@ -299,9 +292,7 @@ class ConnectionManagerTest : CardReaderBaseUnitTest() {
                 on { errorMessage }.thenReturn(message)
                 on { this.errorCode }.thenReturn(errorCode)
             }
-            whenever(terminalWrapper.connectToReader(any(), any(), any())).thenAnswer {
-                (it.arguments[2] as ReaderCallback).onFailure(exception)
-            }
+            whenever(terminalWrapper.connectToReader(any(), any())).thenAnswer { throw exception }
 
             connectionManager.startConnectionToReader(cardReader, "location_id")
 
@@ -322,9 +313,7 @@ class ConnectionManagerTest : CardReaderBaseUnitTest() {
             val cardReader: CardReaderImpl = mock {
                 on { cardReader }.thenReturn(reader)
             }
-            whenever(terminalWrapper.connectToReader(any(), any(), any())).thenAnswer {
-                (it.arguments[2] as ReaderCallback).onSuccess(cardReader.cardReader)
-            }
+            whenever(terminalWrapper.connectToReader(any(), any())).thenReturn(reader)
 
             connectionManager.startConnectionToReader(cardReader, "location_id")
 
@@ -336,9 +325,7 @@ class ConnectionManagerTest : CardReaderBaseUnitTest() {
 
     @Test
     fun `when disconnect succeeds, then status updated with not connected`() = testBlocking {
-        whenever(terminalWrapper.disconnectReader(any())).thenAnswer {
-            (it.arguments[0] as Callback).onSuccess()
-        }
+        whenever(terminalWrapper.disconnectReader()).thenReturn(Unit)
 
         connectionManager.disconnectReader()
 
@@ -347,9 +334,7 @@ class ConnectionManagerTest : CardReaderBaseUnitTest() {
 
     @Test
     fun `when disconnect succeeds, then true is returned`() = testBlocking {
-        whenever(terminalWrapper.disconnectReader(any())).thenAnswer {
-            (it.arguments[0] as Callback).onSuccess()
-        }
+        whenever(terminalWrapper.disconnectReader()).thenReturn(Unit)
 
         val result = connectionManager.disconnectReader()
 
@@ -358,9 +343,7 @@ class ConnectionManagerTest : CardReaderBaseUnitTest() {
 
     @Test
     fun `when disconnect fails, then false is returned`() = testBlocking {
-        whenever(terminalWrapper.disconnectReader(any())).thenAnswer {
-            (it.arguments[0] as Callback).onFailure(mock())
-        }
+        whenever(terminalWrapper.disconnectReader()).thenAnswer { throw mock<TerminalException>() }
 
         val result = connectionManager.disconnectReader()
 
@@ -369,9 +352,7 @@ class ConnectionManagerTest : CardReaderBaseUnitTest() {
 
     @Test
     fun `when disconnect fails, then false with not connected`() = testBlocking {
-        whenever(terminalWrapper.disconnectReader(any())).thenAnswer {
-            (it.arguments[0] as Callback).onFailure(mock())
-        }
+        whenever(terminalWrapper.disconnectReader()).thenAnswer { throw mock<TerminalException>() }
 
         connectionManager.disconnectReader()