From 83126d5f5585cf1ea63ad7ce58cd25adf2ab2246 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 20 Dec 2019 11:54:59 +0100 Subject: [PATCH] Fix android tests not working --- .../SingleThreadCoroutineDispatcher.kt | 2 +- .../android/auth/AuthenticationServiceTest.kt | 60 ------------------- .../internal/crypto/CryptoStoreTest.kt | 16 ++++- .../session/room/timeline/ChunkEntityTest.kt | 8 ++- 4 files changed, 23 insertions(+), 63 deletions(-) delete mode 100644 matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/auth/AuthenticationServiceTest.kt diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/SingleThreadCoroutineDispatcher.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/SingleThreadCoroutineDispatcher.kt index e63123f3b3..f2fbde3fe7 100644 --- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/SingleThreadCoroutineDispatcher.kt +++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/SingleThreadCoroutineDispatcher.kt @@ -19,4 +19,4 @@ package im.vector.matrix.android import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers import kotlinx.coroutines.Dispatchers.Main -internal val testCoroutineDispatchers = MatrixCoroutineDispatchers(Main, Main, Main, Main, Main) +internal val testCoroutineDispatchers = MatrixCoroutineDispatchers(Main, Main, Main, Main) diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/auth/AuthenticationServiceTest.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/auth/AuthenticationServiceTest.kt deleted file mode 100644 index c3babd7e5a..0000000000 --- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/auth/AuthenticationServiceTest.kt +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2019 New Vector Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package im.vector.matrix.android.auth - -import androidx.test.annotation.UiThreadTest -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.rule.GrantPermissionRule -import im.vector.matrix.android.InstrumentedTest -import im.vector.matrix.android.OkReplayRuleChainNoActivity -import im.vector.matrix.android.api.auth.AuthenticationService -import okreplay.* -import org.junit.ClassRule -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith - -@RunWith(AndroidJUnit4::class) -internal class AuthenticationServiceTest : InstrumentedTest { - - lateinit var authenticationService: AuthenticationService - lateinit var okReplayInterceptor: OkReplayInterceptor - - private val okReplayConfig = OkReplayConfig.Builder() - .tapeRoot(AndroidTapeRoot( - context(), javaClass)) - .defaultMode(TapeMode.READ_WRITE) // or TapeMode.READ_ONLY - .sslEnabled(true) - .interceptor(okReplayInterceptor) - .build() - - @get:Rule - val testRule = OkReplayRuleChainNoActivity(okReplayConfig).get() - - @Test - @UiThreadTest - @OkReplay(tape = "auth", mode = TapeMode.READ_WRITE) - fun auth() { - } - - companion object { - @ClassRule - @JvmField - val grantExternalStoragePermissionRule: GrantPermissionRule = - GrantPermissionRule.grant(android.Manifest.permission.WRITE_EXTERNAL_STORAGE) - } -} diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreTest.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreTest.kt index 3fc3079cc7..bab0a366ce 100644 --- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreTest.kt +++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/internal/crypto/CryptoStoreTest.kt @@ -16,20 +16,34 @@ package im.vector.matrix.android.internal.crypto +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.zhuinden.monarchy.Monarchy +import im.vector.matrix.android.InstrumentedTest import im.vector.matrix.android.internal.crypto.model.OlmSessionWrapper import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore +import io.realm.Realm +import io.realm.RealmConfiguration import org.junit.Assert.* +import org.junit.Before import org.junit.Test +import org.junit.runner.RunWith import org.matrix.olm.OlmAccount import org.matrix.olm.OlmManager import org.matrix.olm.OlmSession private const val DUMMY_DEVICE_KEY = "DeviceKey" -class CryptoStoreTest { +@RunWith(AndroidJUnit4::class) +class CryptoStoreTest : InstrumentedTest { private val cryptoStoreHelper = CryptoStoreHelper() + @Before + fun setup() { + Realm.init(context()) + } + + @Test fun test_metadata_realm_ok() { val cryptoStore: IMXCryptoStore = cryptoStoreHelper.createStore() diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/ChunkEntityTest.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/ChunkEntityTest.kt index abb990c979..9c81a8e18f 100644 --- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/ChunkEntityTest.kt +++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/session/room/timeline/ChunkEntityTest.kt @@ -19,8 +19,10 @@ package im.vector.matrix.android.session.room.timeline import androidx.test.ext.junit.runners.AndroidJUnit4 import com.zhuinden.monarchy.Monarchy import im.vector.matrix.android.InstrumentedTest +import im.vector.matrix.android.internal.crypto.store.db.RealmCryptoStoreModule import im.vector.matrix.android.internal.database.helper.* import im.vector.matrix.android.internal.database.model.ChunkEntity +import im.vector.matrix.android.internal.database.model.SessionRealmModule import im.vector.matrix.android.internal.session.room.timeline.PaginationDirection import im.vector.matrix.android.session.room.timeline.RoomDataHelper.createFakeListOfEvents import im.vector.matrix.android.session.room.timeline.RoomDataHelper.createFakeMessageEvent @@ -43,7 +45,11 @@ internal class ChunkEntityTest : InstrumentedTest { @Before fun setup() { Realm.init(context()) - val testConfig = RealmConfiguration.Builder().inMemory().name("test-realm").build() + val testConfig = RealmConfiguration.Builder() + .inMemory() + .name("test-realm") + .modules(SessionRealmModule()) + .build() monarchy = Monarchy.Builder().setRealmConfiguration(testConfig).build() }