diff options
| author | Albin <albin@mullvad.net> | 2024-08-29 10:38:56 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-08-29 10:38:56 +0200 |
| commit | 1ee762f4a7999886455cba0270769de16457a527 (patch) | |
| tree | 683b4405b07a4cb9e85cb21bdb682451945de3a9 /android/test/mockapi/src | |
| parent | 3286d40960d59f7f99109130042d72dc87f4aad1 (diff) | |
| parent | 981e97d254e180362d9e9a6407708a333e5e4f44 (diff) | |
| download | mullvadvpn-1ee762f4a7999886455cba0270769de16457a527.tar.xz mullvadvpn-1ee762f4a7999886455cba0270769de16457a527.zip | |
Merge branch 'deterministically-use-trailing-commas-in-kotlin-code-droid-89'
Diffstat (limited to 'android/test/mockapi/src')
4 files changed, 8 insertions, 8 deletions
diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt index 3539bad0fa..a2978808d7 100644 --- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt +++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt @@ -83,7 +83,7 @@ class MockApiDispatcher : Dispatcher() { .setBody( accessTokenJsonResponse( accessToken = DUMMY_ACCESS_TOKEN, - expiry = currentUtcTimeWithOffsetZero().plusDays(1) + expiry = currentUtcTimeWithOffsetZero().plusDays(1), ) .toString() ) @@ -114,7 +114,7 @@ class MockApiDispatcher : Dispatcher() { id = deviceId, name = devices!![deviceId]!!, // Should always exist publicKey = cachedKey, - creationDate = currentUtcTimeWithOffsetZero().minusDays(1) + creationDate = currentUtcTimeWithOffsetZero().minusDays(1), ) .toString() ) @@ -135,7 +135,7 @@ class MockApiDispatcher : Dispatcher() { id = devicePendingToGetCreated!!.first, name = devicePendingToGetCreated!!.second, publicKey = newKey, - creationDate = currentUtcTimeWithOffsetZero().minusDays(1) + creationDate = currentUtcTimeWithOffsetZero().minusDays(1), ) .toString() ) @@ -157,7 +157,7 @@ class MockApiDispatcher : Dispatcher() { id = entry.key, name = entry.value, publicKey = cachedKey, - creationDate = currentUtcTimeWithOffsetZero().minusDays(index + 1) + creationDate = currentUtcTimeWithOffsetZero().minusDays(index + 1), ) ) } @@ -174,7 +174,7 @@ class MockApiDispatcher : Dispatcher() { accountCreationJson( id = DUMMY_ID_1, expiry = DateTime(), - accountNumber = expectedAccountNumber + accountNumber = expectedAccountNumber, ) .toString() ) diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt index 74a47f3c3d..bd236bb978 100644 --- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt +++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt @@ -59,7 +59,7 @@ abstract class MockApiTest { InetAddress.getLocalHost().hostName, port, disableAddressCache = true, - disableTls = true + disableTls = true, ) } } diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt index c652bd403a..fbd3c3ca84 100644 --- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt +++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/TooManyDevicesMockApiTest.kt @@ -34,7 +34,7 @@ class TooManyDevicesMockApiTest : MockApiTest() { DUMMY_ID_2 to DUMMY_DEVICE_NAME_2, DUMMY_ID_3 to DUMMY_DEVICE_NAME_3, DUMMY_ID_4 to DUMMY_DEVICE_NAME_4, - DUMMY_ID_5 to DUMMY_DEVICE_NAME_5 + DUMMY_ID_5 to DUMMY_DEVICE_NAME_5, ) devicePendingToGetCreated = DUMMY_ID_6 to DUMMY_DEVICE_NAME_6 } diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/constant/Constants.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/constant/Constants.kt index 27099cc67a..e11e14879e 100644 --- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/constant/Constants.kt +++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/constant/Constants.kt @@ -31,5 +31,5 @@ val FULL_DEVICE_LIST = DUMMY_ID_2 to DUMMY_DEVICE_NAME_2, DUMMY_ID_3 to DUMMY_DEVICE_NAME_3, DUMMY_ID_4 to DUMMY_DEVICE_NAME_4, - DUMMY_ID_5 to DUMMY_DEVICE_NAME_5 + DUMMY_ID_5 to DUMMY_DEVICE_NAME_5, ) |