diff options
| author | Albin <albin@mullvad.net> | 2024-08-28 20:33:46 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-08-28 20:44:14 +0200 |
| commit | b52c423d777213d5bb92430bccec880c6367a70b (patch) | |
| tree | 6ce254a809c1555fbde9a1c5692725042803854c /android/test/e2e/src | |
| parent | a71f1e7a6888bc6af5a9df355afd26d3f56d0e5c (diff) | |
| download | mullvadvpn-b52c423d777213d5bb92430bccec880c6367a70b.tar.xz mullvadvpn-b52c423d777213d5bb92430bccec880c6367a70b.zip | |
Reformat kotlin code using updated ktfmt plugin
This commit mostly adds trailing commas throughout the project,
but also includes a few other formatting changes.
Diffstat (limited to 'android/test/e2e/src')
5 files changed, 12 insertions, 12 deletions
diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/EndToEndTest.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/EndToEndTest.kt index 160ef52468..278def0b35 100644 --- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/EndToEndTest.kt +++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/EndToEndTest.kt @@ -23,7 +23,7 @@ abstract class EndToEndTest(private val infra: String) { (if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) { GrantPermissionExtension.grant( Manifest.permission.WRITE_EXTERNAL_STORAGE, - Manifest.permission.READ_EXTERNAL_STORAGE + Manifest.permission.READ_EXTERNAL_STORAGE, ) } else { GrantPermissionExtension.grant() diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/WebLinkTest.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/WebLinkTest.kt index d4caa1da56..5ea05159a6 100644 --- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/WebLinkTest.kt +++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/WebLinkTest.kt @@ -25,7 +25,7 @@ class WebLinkTest : EndToEndTest(BuildConfig.FLAVOR_infrastructure) { // Then device.findObjectWithTimeout( selector = By.text("Mullvad help center"), - timeout = WEB_TIMEOUT + timeout = WEB_TIMEOUT, ) } } diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/interactor/MullvadAccountInteractor.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/interactor/MullvadAccountInteractor.kt index 59c9b49b91..b4b3f19e05 100644 --- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/interactor/MullvadAccountInteractor.kt +++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/interactor/MullvadAccountInteractor.kt @@ -4,7 +4,7 @@ import net.mullvad.mullvadvpn.test.e2e.misc.SimpleMullvadHttpClient class MullvadAccountInteractor( private val httpClient: SimpleMullvadHttpClient, - private val testAccountNumber: String + private val testAccountNumber: String, ) { fun cleanupAccount() { httpClient.removeAllDevices(testAccountNumber) diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/AccountTestRule.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/AccountTestRule.kt index 6496f82e07..ff6276a69f 100644 --- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/AccountTestRule.kt +++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/AccountTestRule.kt @@ -23,7 +23,7 @@ class AccountTestRule : BeforeEachCallback { client.addTimeToAccountUsingPartnerAuth( accountNumber = validAccountNumber, daysToAdd = 1, - partnerAuth = partnerAuth + partnerAuth = partnerAuth, ) } else { validAccountNumber = diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt index eaff4290ed..d7fcfb05e8 100644 --- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt +++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt @@ -48,13 +48,13 @@ class SimpleMullvadHttpClient(context: Context) { fun addTimeToAccountUsingPartnerAuth( accountNumber: String, daysToAdd: Int, - partnerAuth: String + partnerAuth: String, ) { sendSimpleSynchronousRequest( method = Request.Method.POST, url = "$PARTNER_ACCOUNT_URL/$accountNumber/extend", body = JSONObject().apply { put("days", "$daysToAdd") }, - authorizationHeader = "Basic $partnerAuth" + authorizationHeader = "Basic $partnerAuth", ) } @@ -65,7 +65,7 @@ class SimpleMullvadHttpClient(context: Context) { sendSimpleSynchronousRequestArray( Request.Method.GET, DEVICE_LIST_URL, - token = accessToken + token = accessToken, ) return response!! @@ -85,7 +85,7 @@ class SimpleMullvadHttpClient(context: Context) { sendSimpleSynchronousRequestString( method = Request.Method.DELETE, url = "$DEVICE_LIST_URL/$deviceId", - authorizationHeader = "Bearer $token" + authorizationHeader = "Bearer $token", ) } @@ -95,7 +95,7 @@ class SimpleMullvadHttpClient(context: Context) { ?.let { json -> ConnCheckState( isConnected = json.getBoolean("mullvad_exit_ip"), - ipAddress = json.getString("ip") + ipAddress = json.getString("ip"), ) } } @@ -104,7 +104,7 @@ class SimpleMullvadHttpClient(context: Context) { method: Int, url: String, body: JSONObject? = null, - authorizationHeader: String? = null + authorizationHeader: String? = null, ): JSONObject? { val future = RequestFuture.newFuture<JSONObject>() @@ -134,7 +134,7 @@ class SimpleMullvadHttpClient(context: Context) { method: Int, url: String, body: String? = null, - authorizationHeader: String? = null + authorizationHeader: String? = null, ): String? { val future = RequestFuture.newFuture<String>() val request = @@ -163,7 +163,7 @@ class SimpleMullvadHttpClient(context: Context) { method: Int, url: String, body: JSONArray? = null, - token: String? = null + token: String? = null, ): JSONArray? { val future = RequestFuture.newFuture<JSONArray>() val request = |
