Lint and test fixes

mozilla-mobile · Sep 22, 2020 · c74f17e · c74f17e
1 parent 55367ec
commit c74f17e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/...s/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/FirefoxAccount.kt b/...s/service/firefox-accounts/src/main/java/mozilla/components/service/fxa/FirefoxAccount.kt
@@ -106,7 +106,8 @@ class FirefoxAccount internal constructor(
 
     override suspend fun beginPairingFlow(
         pairingUrl: String,
-        scopes: Set<String>, entryPoint: String
+        scopes: Set<String>,
+        entryPoint: String
     ) = withContext(scope.coroutineContext) {
         // Eventually we should specify this as a param here, but for now, let's
         // use a generic value (it's used only for server-side telemetry, so the

diff --git a/...ce/firefox-accounts/src/test/java/mozilla/components/service/fxa/FxaAccountManagerTest.kt b/...ce/firefox-accounts/src/test/java/mozilla/components/service/fxa/FxaAccountManagerTest.kt
@@ -1065,7 +1065,7 @@ class FxaAccountManagerTest {
 
         // Try again, without any network problems this time.
         `when`(mockAccount.beginOAuthFlow(any(), anyString())).thenReturn(AuthFlowUrl(EXPECTED_AUTH_STATE, "auth://url"))
-        `when`(constellation.finalizeDevice(any(), any(), any())).thenReturn(ServiceResult.Ok)
+        `when`(constellation.finalizeDevice(any(), any())).thenReturn(ServiceResult.Ok)
 
         assertEquals("auth://url", manager.beginAuthentication())
 
@@ -1112,7 +1112,7 @@ class FxaAccountManagerTest {
 
         // Try again, without any network problems this time.
         `when`(mockAccount.beginPairingFlow(anyString(), any(), anyString())).thenReturn(AuthFlowUrl(EXPECTED_AUTH_STATE, "auth://url"))
-        `when`(constellation.finalizeDevice(any(), any(), any())).thenReturn(ServiceResult.Ok)
+        `when`(constellation.finalizeDevice(any(), any())).thenReturn(ServiceResult.Ok)
 
         assertEquals("auth://url", manager.beginAuthentication(pairingUrl = "auth://pairing"))
 
@@ -1330,7 +1330,7 @@ class FxaAccountManagerTest {
 
         `when`(mockAccount.deviceConstellation()).thenReturn(constellation)
         `when`(mockAccount.getCurrentDeviceId()).thenReturn("testDeviceId")
-        `when`(constellation.finalizeDevice(any(), any(), any())).thenReturn(ServiceResult.Ok)
+        `when`(constellation.finalizeDevice(any(), any())).thenReturn(ServiceResult.Ok)
         `when`(mockAccount.getProfile(ignoreCache = false)).thenReturn(null)
         `when`(mockAccount.beginOAuthFlow(any(), anyString())).thenReturn(AuthFlowUrl(EXPECTED_AUTH_STATE, "auth://url"))
         `when`(mockAccount.completeOAuthFlow(anyString(), anyString())).thenReturn(true)
@@ -1589,7 +1589,7 @@ class FxaAccountManagerTest {
 
         `when`(mockAccount.getCurrentDeviceId()).thenReturn("testDeviceId")
         `when`(mockAccount.deviceConstellation()).thenReturn(constellation)
-        `when`(constellation.finalizeDevice(any(), any(), any())).thenReturn(ServiceResult.Ok)
+        `when`(constellation.finalizeDevice(any(), any())).thenReturn(ServiceResult.Ok)
         doAnswer {
             throw FxaPanicException("500")
         }.`when`(mockAccount).getProfile(ignoreCache = false)

diff --git a/...ents/service/firefox-accounts/src/test/java/mozilla/components/service/fxa/UtilsKtTest.kt b/...ents/service/firefox-accounts/src/test/java/mozilla/components/service/fxa/UtilsKtTest.kt
@@ -307,17 +307,17 @@ class UtilsKtTest {
     fun `as auth flow pairing`() = runBlocking {
         val account: OAuthAccount = mock()
         val authFlowUrl: AuthFlowUrl = mock()
-        `when`(account.beginPairingFlow("http://pairing.url", emptySet())).thenReturn(authFlowUrl)
-        verify(account, never()).beginOAuthFlow(emptySet())
+        `when`(account.beginPairingFlow(eq("http://pairing.url"), eq(emptySet()), anyString())).thenReturn(authFlowUrl)
+        verify(account, never()).beginOAuthFlow(eq(emptySet()), anyString())
         assertEquals(authFlowUrl, "http://pairing.url".asAuthFlowUrl(account, emptySet()))
     }
 
     @Test
     fun `as auth flow regular`() = runBlocking {
         val account: OAuthAccount = mock()
         val authFlowUrl: AuthFlowUrl = mock()
-        `when`(account.beginOAuthFlow(emptySet())).thenReturn(authFlowUrl)
-        verify(account, never()).beginPairingFlow(anyString(), eq(emptySet()))
+        `when`(account.beginOAuthFlow(eq(emptySet()), anyString())).thenReturn(authFlowUrl)
+        verify(account, never()).beginPairingFlow(anyString(), eq(emptySet()), anyString())
         assertEquals(authFlowUrl, null.asAuthFlowUrl(account, emptySet()))
     }
 

diff --git a/components/support/sync-telemetry/docs/metrics.md b/components/support/sync-telemetry/docs/metrics.md
@@ -1,7 +1,7 @@
 <!-- AUTOGENERATED BY glean_parser.  DO NOT EDIT. -->
 
 # Metrics
-This document enumerates the metrics collected by this project.
+This document enumerates the metrics collected by this project using the [Glean SDK](https://mozilla.github.io/glean/book/index.html).
 This project may depend on other projects which also collect metrics.
 This means you might have to go searching through the dependency tree to get a full picture of everything collected by this project.