diff options
| author | Albin <albin@mullvad.net> | 2023-10-02 16:35:34 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-10-02 16:35:34 +0200 |
| commit | bb3737bd8fa8daadac80de9b77efc38b9a1772ca (patch) | |
| tree | 774ca9099edc490aa4af9a0b641bed2dc308f88f /android/test/mockapi/src/main | |
| parent | c2183ff16c818f3062045ca05d6e71213605861e (diff) | |
| parent | 54a8e7178e255d276007260e418ae9d32966af36 (diff) | |
| download | mullvadvpn-bb3737bd8fa8daadac80de9b77efc38b9a1772ca.tar.xz mullvadvpn-bb3737bd8fa8daadac80de9b77efc38b9a1772ca.zip | |
Merge branch 'add-konsist-tests-droid-380'
Diffstat (limited to 'android/test/mockapi/src/main')
2 files changed, 4 insertions, 2 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 06f7164034..6a604bb09f 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 @@ -8,7 +8,10 @@ import net.mullvad.mullvadvpn.test.mockapi.constant.DUMMY_ACCESS_TOKEN import net.mullvad.mullvadvpn.test.mockapi.constant.DUMMY_DEVICE_NAME import net.mullvad.mullvadvpn.test.mockapi.constant.DUMMY_ID import net.mullvad.mullvadvpn.test.mockapi.constant.LOG_TAG +import net.mullvad.mullvadvpn.test.mockapi.util.accessTokenJsonResponse +import net.mullvad.mullvadvpn.test.mockapi.util.accountInfoJson import net.mullvad.mullvadvpn.test.mockapi.util.currentUtcTimeWithOffsetZero +import net.mullvad.mullvadvpn.test.mockapi.util.deviceJson import okhttp3.mockwebserver.Dispatcher import okhttp3.mockwebserver.MockResponse import okhttp3.mockwebserver.RecordedRequest diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/util/JsonUtils.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/util/JsonUtils.kt index 62320a07e6..2ccae9499e 100644 --- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/util/JsonUtils.kt +++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/util/JsonUtils.kt @@ -1,6 +1,5 @@ -package net.mullvad.mullvadvpn.test.mockapi +package net.mullvad.mullvadvpn.test.mockapi.util -import net.mullvad.mullvadvpn.test.mockapi.util.formatStrictlyAccordingToIso8601AndRfc3339 import org.joda.time.DateTime import org.json.JSONObject |