From 0fb26da35590721250c6e88bc6575b7bce841b4e Mon Sep 17 00:00:00 2001 From: ariskotsomitopoulos Date: Mon, 10 Jan 2022 11:26:03 +0200 Subject: [PATCH] PR Remarks --- .../java/org/matrix/android/sdk/common/RetryTestRule.kt | 6 ------ .../java/org/matrix/android/sdk/common/TestConstants.kt | 2 +- .../android/sdk/internal/crypto/verification/SASTest.kt | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/RetryTestRule.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/RetryTestRule.kt index 5f1a59e585..c4cc32d8e9 100644 --- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/RetryTestRule.kt +++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/RetryTestRule.kt @@ -16,7 +16,6 @@ package org.matrix.android.sdk.common -import android.util.Log import org.junit.rules.TestRule import org.junit.runner.Description import org.junit.runners.model.Statement @@ -27,8 +26,6 @@ import org.junit.runners.model.Statement */ class RetryTestRule(val retryCount: Int = 3) : TestRule { - private val TAG = RetryTestRule::class.java.simpleName - override fun apply(base: Statement, description: Description): Statement { return statement(base, description) } @@ -46,11 +43,8 @@ class RetryTestRule(val retryCount: Int = 3) : TestRule { return } catch (t: Throwable) { caughtThrowable = t - Log.e(TAG, description.displayName + ": run " + (i + 1) + " failed") } } - - Log.e(TAG, description.displayName + ": giving up after " + retryCount + " failures") throw caughtThrowable!! } } diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt index ecfd587929..5c9b79361e 100644 --- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt +++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt @@ -22,7 +22,7 @@ object TestConstants { const val TESTS_HOME_SERVER_URL = "http://10.0.2.2:8080" - // Time out to use when waiting for server response. 20s + // Time out to use when waiting for server response. private const val AWAIT_TIME_OUT_MILLIS = 30_000 // Time out to use when waiting for server response, when the debugger is connected. 10 minutes diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt index d4350bd845..8cd725504d 100644 --- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt +++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt @@ -546,8 +546,6 @@ class SASTest : InstrumentedTest { val bobDeviceInfoFromAlicePOV: CryptoDeviceInfo? = aliceSession.cryptoService().getDeviceInfo(bobUserId, bobDeviceId) val aliceDeviceInfoFromBobPOV: CryptoDeviceInfo? = bobSession.cryptoService().getDeviceInfo(aliceSession.myUserId, aliceSession.cryptoService().getMyDevice().deviceId) - // latch wait a bit again - assertTrue("alice device should be verified from bob point of view", aliceDeviceInfoFromBobPOV!!.isVerified) assertTrue("bob device should be verified from alice point of view", bobDeviceInfoFromAlicePOV!!.isVerified) cryptoTestData.cleanUp(testHelper)