Skip to content

Commit 1d7dde7

Browse files
committed
Address code review feedback for card scan screen
Remove stale cardholderName parameter from test data, simplify ScanError verify to use direct value instead of match lambda, and fix import ordering.
1 parent 00d6666 commit 1d7dde7

4 files changed

Lines changed: 4 additions & 8 deletions

File tree

app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import com.bitwarden.cxf.ui.composition.LocalCredentialExchangeImporter
2222
import com.bitwarden.cxf.ui.composition.LocalCredentialExchangeRequestValidator
2323
import com.bitwarden.cxf.validator.CredentialExchangeRequestValidator
2424
import com.bitwarden.cxf.validator.dsl.credentialExchangeRequestValidator
25+
import com.bitwarden.ui.platform.composition.LocalCardTextAnalyzer
2526
import com.bitwarden.ui.platform.composition.LocalExitManager
2627
import com.bitwarden.ui.platform.composition.LocalIntentManager
27-
import com.bitwarden.ui.platform.composition.LocalCardTextAnalyzer
2828
import com.bitwarden.ui.platform.composition.LocalQrCodeAnalyzer
2929
import com.bitwarden.ui.platform.feature.cardscanner.util.CardDataParser
3030
import com.bitwarden.ui.platform.feature.cardscanner.util.CardDataParserImpl

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/cardscanner/CardScanViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import android.os.Parcelable
44
import androidx.lifecycle.SavedStateHandle
55
import com.bitwarden.ui.platform.base.BaseViewModel
66
import com.bitwarden.ui.platform.base.DeferredBackgroundEvent
7-
import com.bitwarden.ui.platform.feature.cardscanner.util.CardScanData
87
import com.bitwarden.ui.platform.feature.cardscanner.manager.CardScanManager
8+
import com.bitwarden.ui.platform.feature.cardscanner.util.CardScanData
99
import com.bitwarden.ui.platform.feature.cardscanner.util.CardScanResult
1010
import dagger.hilt.android.lifecycle.HiltViewModel
1111
import kotlinx.coroutines.flow.update

app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/cardscanner/CardScanViewModelTest.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package com.x8bit.bitwarden.ui.vault.feature.cardscanner
33
import androidx.lifecycle.SavedStateHandle
44
import app.cash.turbine.test
55
import com.bitwarden.ui.platform.base.BaseViewModelTest
6-
import com.bitwarden.ui.platform.feature.cardscanner.util.CardScanData
76
import com.bitwarden.ui.platform.feature.cardscanner.manager.CardScanManager
7+
import com.bitwarden.ui.platform.feature.cardscanner.util.CardScanData
88
import com.bitwarden.ui.platform.feature.cardscanner.util.CardScanResult
99
import io.mockk.every
1010
import io.mockk.just
@@ -41,9 +41,7 @@ class CardScanViewModelTest : BaseViewModelTest() {
4141
}
4242

4343
verify(exactly = 1) {
44-
cardScanManager.emitCardScanResult(
45-
match { it is CardScanResult.ScanError },
46-
)
44+
cardScanManager.emitCardScanResult(CardScanResult.ScanError())
4745
}
4846
}
4947

@@ -115,6 +113,5 @@ private val CARD_SCAN_DATA = CardScanData(
115113
number = "4111111111111111",
116114
expirationMonth = "12",
117115
expirationYear = "2025",
118-
cardholderName = "JOHN DOE",
119116
securityCode = "123",
120117
)

ui/src/test/kotlin/com/bitwarden/ui/platform/feature/cardscanner/manager/CardScanManagerTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ class CardScanManagerTest {
2020
number = "4111111111111111",
2121
expirationMonth = "12",
2222
expirationYear = "2025",
23-
cardholderName = "JOHN DOE",
2423
securityCode = "123",
2524
),
2625
)

0 commit comments

Comments
 (0)