Fix android tests not working
This commit is contained in:
parent
e13281dc97
commit
83126d5f55
|
@ -19,4 +19,4 @@ package im.vector.matrix.android
|
||||||
import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
|
import im.vector.matrix.android.internal.util.MatrixCoroutineDispatchers
|
||||||
import kotlinx.coroutines.Dispatchers.Main
|
import kotlinx.coroutines.Dispatchers.Main
|
||||||
|
|
||||||
internal val testCoroutineDispatchers = MatrixCoroutineDispatchers(Main, Main, Main, Main, Main)
|
internal val testCoroutineDispatchers = MatrixCoroutineDispatchers(Main, Main, Main, Main)
|
||||||
|
|
|
@ -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)
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -16,20 +16,34 @@
|
||||||
|
|
||||||
package im.vector.matrix.android.internal.crypto
|
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.model.OlmSessionWrapper
|
||||||
import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
|
import im.vector.matrix.android.internal.crypto.store.IMXCryptoStore
|
||||||
|
import io.realm.Realm
|
||||||
|
import io.realm.RealmConfiguration
|
||||||
import org.junit.Assert.*
|
import org.junit.Assert.*
|
||||||
|
import org.junit.Before
|
||||||
import org.junit.Test
|
import org.junit.Test
|
||||||
|
import org.junit.runner.RunWith
|
||||||
import org.matrix.olm.OlmAccount
|
import org.matrix.olm.OlmAccount
|
||||||
import org.matrix.olm.OlmManager
|
import org.matrix.olm.OlmManager
|
||||||
import org.matrix.olm.OlmSession
|
import org.matrix.olm.OlmSession
|
||||||
|
|
||||||
private const val DUMMY_DEVICE_KEY = "DeviceKey"
|
private const val DUMMY_DEVICE_KEY = "DeviceKey"
|
||||||
|
|
||||||
class CryptoStoreTest {
|
@RunWith(AndroidJUnit4::class)
|
||||||
|
class CryptoStoreTest : InstrumentedTest {
|
||||||
|
|
||||||
private val cryptoStoreHelper = CryptoStoreHelper()
|
private val cryptoStoreHelper = CryptoStoreHelper()
|
||||||
|
|
||||||
|
@Before
|
||||||
|
fun setup() {
|
||||||
|
Realm.init(context())
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun test_metadata_realm_ok() {
|
fun test_metadata_realm_ok() {
|
||||||
val cryptoStore: IMXCryptoStore = cryptoStoreHelper.createStore()
|
val cryptoStore: IMXCryptoStore = cryptoStoreHelper.createStore()
|
||||||
|
|
|
@ -19,8 +19,10 @@ package im.vector.matrix.android.session.room.timeline
|
||||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||||
import com.zhuinden.monarchy.Monarchy
|
import com.zhuinden.monarchy.Monarchy
|
||||||
import im.vector.matrix.android.InstrumentedTest
|
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.helper.*
|
||||||
import im.vector.matrix.android.internal.database.model.ChunkEntity
|
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.internal.session.room.timeline.PaginationDirection
|
||||||
import im.vector.matrix.android.session.room.timeline.RoomDataHelper.createFakeListOfEvents
|
import im.vector.matrix.android.session.room.timeline.RoomDataHelper.createFakeListOfEvents
|
||||||
import im.vector.matrix.android.session.room.timeline.RoomDataHelper.createFakeMessageEvent
|
import im.vector.matrix.android.session.room.timeline.RoomDataHelper.createFakeMessageEvent
|
||||||
|
@ -43,7 +45,11 @@ internal class ChunkEntityTest : InstrumentedTest {
|
||||||
@Before
|
@Before
|
||||||
fun setup() {
|
fun setup() {
|
||||||
Realm.init(context())
|
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()
|
monarchy = Monarchy.Builder().setRealmConfiguration(testConfig).build()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue