Skip to content

Commit 87d5671

Browse files
hichamboushabahichamboushaba
committed
Update unit tests
1 parent 5d7b893 commit 87d5671

File tree

4 files changed

+91
-43
lines changed

4 files changed

+91
-43
lines changed

‎WooCommerce/src/test/kotlin/com/woocommerce/android/ui/login/sitecredentials/LoginSiteCredentialsViewModelTest.kt‎

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
3939
import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
4040
import org.wordpress.android.fluxc.network.rest.wpapi.Nonce
4141
import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
42+
import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsConfiguration
4243
import org.wordpress.android.login.LoginAnalyticsListener
4344

4445
@ExperimentalCoroutinesApi
@@ -95,7 +96,10 @@ class LoginSiteCredentialsViewModelTest : BaseUnitTest() {
9596
applicationPasswordsNotifier = applicationPasswordsNotifier,
9697
analyticsTracker = analyticsTracker,
9798
appPrefs = appPrefs,
98-
applicationPasswordsClientId = clientId,
99+
applicationPasswordsConfiguration = object : ApplicationPasswordsConfiguration {
100+
override val applicationName: String = clientId
101+
override suspend fun isEnabledForJetpackAccess(): Boolean = true
102+
},
99103
resourceProvider = resourceProvider
100104
)
101105
}
@@ -292,22 +296,23 @@ class LoginSiteCredentialsViewModelTest : BaseUnitTest() {
292296
}
293297

294298
@Test
295-
fun `given application pwd disabled and wp-login-php accessible, when submitting login, then show error screen`() = testBlocking {
296-
setup {
297-
whenever(wpApiSiteRepository.checkIfUserIsEligible(testSite)).thenReturn(Result.failure(Exception()))
298-
}
299-
300-
viewModel.viewState.observeForTesting {
301-
viewModel.onUsernameChanged(testUsername)
302-
viewModel.onPasswordChanged(testPassword)
303-
viewModel.onContinueClick()
304-
applicationPasswordsUnavailableEvents.tryEmit(mock())
299+
fun `given application pwd disabled and wp-login-php accessible, when submitting login, then show error screen`() =
300+
testBlocking {
301+
setup {
302+
whenever(wpApiSiteRepository.checkIfUserIsEligible(testSite)).thenReturn(Result.failure(Exception()))
303+
}
304+
305+
viewModel.viewState.observeForTesting {
306+
viewModel.onUsernameChanged(testUsername)
307+
viewModel.onPasswordChanged(testPassword)
308+
viewModel.onContinueClick()
309+
applicationPasswordsUnavailableEvents.tryEmit(mock())
310+
}
311+
312+
assertThat(viewModel.event.value)
313+
.isEqualTo(ShowApplicationPasswordsUnavailableScreen(siteAddress, isJetpackConnected))
305314
}
306315

307-
assertThat(viewModel.event.value)
308-
.isEqualTo(ShowApplicationPasswordsUnavailableScreen(siteAddress, isJetpackConnected))
309-
}
310-
311316
@Test
312317
fun `give user role fetch fails, when submitting login, then show a snackbar`() = testBlocking {
313318
setup {
@@ -353,23 +358,24 @@ class LoginSiteCredentialsViewModelTest : BaseUnitTest() {
353358
}
354359

355360
@Test
356-
fun `given application passwords enabled and login fails for an unknown reason, when user attempts to sign-in, then show WebView login flow`() = testBlocking {
357-
setup {
358-
whenever(wpApiSiteRepository.login(siteAddress, testUsername, testPassword))
359-
.thenReturn(Result.failure(Exception()))
360-
whenever(wpApiSiteRepository.fetchSite(siteAddress))
361-
.thenReturn(Result.success(testSite.apply { applicationPasswordsAuthorizeUrl = urlAuthBase }))
361+
fun `given application passwords enabled and login fails for an unknown reason, when user attempts to sign-in, then show WebView login flow`() =
362+
testBlocking {
363+
setup {
364+
whenever(wpApiSiteRepository.login(siteAddress, testUsername, testPassword))
365+
.thenReturn(Result.failure(Exception()))
366+
whenever(wpApiSiteRepository.fetchSite(siteAddress))
367+
.thenReturn(Result.success(testSite.apply { applicationPasswordsAuthorizeUrl = urlAuthBase }))
368+
}
369+
370+
val event = viewModel.event.runAndCaptureValues {
371+
viewModel.onUsernameChanged(testUsername)
372+
viewModel.onPasswordChanged(testPassword)
373+
viewModel.viewState.getOrAwaitValue()
374+
viewModel.onContinueClick()
375+
}.last()
376+
377+
assertThat(event).isInstanceOf(LoginSiteCredentialsViewModel.ShowApplicationPasswordTutorialScreen::class.java)
378+
assertThat((event as LoginSiteCredentialsViewModel.ShowApplicationPasswordTutorialScreen).url)
379+
.isEqualTo(urlAuthFull)
362380
}
363-
364-
val event = viewModel.event.runAndCaptureValues {
365-
viewModel.onUsernameChanged(testUsername)
366-
viewModel.onPasswordChanged(testPassword)
367-
viewModel.viewState.getOrAwaitValue()
368-
viewModel.onContinueClick()
369-
}.last()
370-
371-
assertThat(event).isInstanceOf(LoginSiteCredentialsViewModel.ShowApplicationPasswordTutorialScreen::class.java)
372-
assertThat((event as LoginSiteCredentialsViewModel.ShowApplicationPasswordTutorialScreen).url)
373-
.isEqualTo(urlAuthFull)
374-
}
375381
}

‎libs/fluxc-plugin/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooNetwork.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ class WooNetwork @Inject constructor(
184184
"site: ${siteUrl},\n" +
185185
"path: ${requestContext.path},\n" +
186186
"method: ${requestContext.method},\n" +
187-
"error: HTTP status code ${error.volleyError.networkResponse?.statusCode}, " +
187+
"error: HTTP status code ${error.volleyError?.networkResponse?.statusCode}, " +
188188
"error message: ${error.errorCode?.ifEmpty { null } ?: error.message}",
189189
)
190190
}

‎libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooExperimentalNetworkTest.kt‎ renamed to ‎libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/network/rest/wpcom/wc/WooNetworkTest.kt‎

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,27 @@ import org.robolectric.RobolectricTestRunner
1111
import org.wordpress.android.fluxc.model.SiteModel
1212
import org.wordpress.android.fluxc.network.rest.wpapi.WPAPINetworkError
1313
import org.wordpress.android.fluxc.network.rest.wpapi.WPAPIResponse
14+
import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsConfiguration
1415
import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsNetwork
15-
import org.wordpress.android.fluxc.network.rest.wpapi.applicationpasswords.ApplicationPasswordsStore
1616
import org.wordpress.android.fluxc.network.rest.wpcom.JetpackTunnelWPAPINetwork
1717
import org.wordpress.android.fluxc.persistence.SiteSqlUtils
1818
import org.wordpress.android.fluxc.test
1919

2020
@RunWith(RobolectricTestRunner::class)
21-
class WooExperimentalNetworkTest {
22-
private val testSite = SiteModel()
21+
class WooNetworkTest {
22+
private val testSite = SiteModel().apply {
23+
url = "https://example.com"
24+
}
2325
private val testPath = "path"
26+
private val applicationPasswordsConfiguration = FakeApplicationPasswordsConfiguration()
2427
private val applicationPasswordsNetwork: ApplicationPasswordsNetwork = mock()
2528
private val jetpackTunnelWPAPINetwork: JetpackTunnelWPAPINetwork = mock()
26-
private val applicationPasswordsStore: ApplicationPasswordsStore = mock()
2729
private val siteSqlUtils: SiteSqlUtils = mock()
2830

29-
private val sut = WooExperimentalNetwork(
31+
private val sut = WooNetwork(
32+
applicationPasswordsConfiguration = applicationPasswordsConfiguration,
3033
applicationPasswordsNetwork = applicationPasswordsNetwork,
3134
jetpackTunnelWPAPINetwork = jetpackTunnelWPAPINetwork,
32-
applicationPasswordsStore = applicationPasswordsStore,
3335
siteSqlUtils = siteSqlUtils
3436
)
3537

@@ -59,7 +61,14 @@ class WooExperimentalNetworkTest {
5961
test {
6062
testSite.origin = SiteModel.ORIGIN_WPCOM_REST
6163
testSite.applicationPasswordsAuthorizeUrl = "authorize_url"
62-
givenAppPasswordsResponse(WPAPIResponse.Error(WPAPINetworkError(mock(), "error")))
64+
givenAppPasswordsResponse(
65+
WPAPIResponse.Error(
66+
WPAPINetworkError(
67+
mock(),
68+
"error"
69+
)
70+
)
71+
)
6372
val sampleResponse = SampleResponse("value")
6473
givenJetpackTunnelResponse(WPAPIResponse.Success(sampleResponse, emptyList()))
6574

@@ -89,6 +98,28 @@ class WooExperimentalNetworkTest {
8998
assertThat((response as WPAPIResponse.Success).data).isEqualTo(sampleResponse)
9099
}
91100

101+
@Test
102+
fun `when app passwords are disabled for jetpack access, then always use jetpack tunnel`() = test {
103+
applicationPasswordsConfiguration.isEnabledForJetpackAccessValue = false
104+
testSite.origin = SiteModel.ORIGIN_WPCOM_REST
105+
testSite.applicationPasswordsAuthorizeUrl = "authorize_url"
106+
val sampleResponse = SampleResponse("value")
107+
givenJetpackTunnelResponse(WPAPIResponse.Success(sampleResponse, emptyList()))
108+
109+
val response = sut.executeGetGsonRequest(
110+
site = testSite,
111+
path = testPath,
112+
clazz = SampleResponse::class.java
113+
)
114+
115+
assertThat((response as WPAPIResponse.Success).data).isEqualTo(sampleResponse)
116+
verify(applicationPasswordsNetwork, never()).executeGetGsonRequest(
117+
site = testSite,
118+
path = testPath,
119+
clazz = SampleResponse::class.java
120+
)
121+
}
122+
92123
@Test
93124
fun `when detecting that a site doesn't support app passwords, then update cached site with correct status`() =
94125
test {
@@ -139,4 +170,13 @@ class WooExperimentalNetworkTest {
139170
}
140171

141172
private data class SampleResponse(val value: String)
173+
174+
private class FakeApplicationPasswordsConfiguration : ApplicationPasswordsConfiguration {
175+
var isEnabledForJetpackAccessValue: Boolean = true
176+
177+
override val applicationName: String
178+
get() = "WooCommerce"
179+
180+
override suspend fun isEnabledForJetpackAccess(): Boolean = isEnabledForJetpackAccessValue
181+
}
142182
}

‎libs/fluxc/src/test/java/org/wordpress/android/fluxc/network/rest/wpapi/applicationpasswords/ApplicationPasswordManagerTests.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import org.wordpress.android.fluxc.model.SiteModel
1414
import org.wordpress.android.fluxc.network.BaseRequest.BaseNetworkError
1515
import org.wordpress.android.fluxc.network.BaseRequest.GenericErrorType
1616
import org.wordpress.android.fluxc.network.rest.wpcom.WPComGsonRequest.WPComGsonNetworkError
17-
import java.util.*
1817
import kotlin.test.assertEquals
1918

2019
@ExperimentalCoroutinesApi
@@ -34,7 +33,10 @@ class ApplicationPasswordManagerTests {
3433
private val mJetpackApplicationPasswordsRestClient: JetpackApplicationPasswordsRestClient = mock()
3534
private val mWpApiApplicationPasswordsRestClient: WPApiApplicationPasswordsRestClient = mock()
3635

37-
private val applicationPasswordsConfiguration = ApplicationPasswordsConfiguration(Optional.of(applicationName))
36+
private val applicationPasswordsConfiguration = object : ApplicationPasswordsConfiguration {
37+
override val applicationName: String = this@ApplicationPasswordManagerTests.applicationName
38+
override suspend fun isEnabledForJetpackAccess() = true
39+
}
3840

3941
private lateinit var mApplicationPasswordsManager: ApplicationPasswordsManager
4042

0 commit comments

Comments
 (0)