From e9eada77f959f9f8d0d29d244bfa93dfe2d97a3d Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 3 Jul 2019 15:24:56 +0200 Subject: [PATCH] Add comment to run sonar analysis and fix compilation issue --- build.gradle | 24 +++++++++++++++++++ .../matrix/android/auth/AuthenticatorTest.kt | 9 +------ 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 961fa588..2817bcef 100644 --- a/build.gradle +++ b/build.gradle @@ -42,6 +42,10 @@ task clean(type: Delete) { apply plugin: 'org.sonarqube' +// To run a sonar analysis: +// Run './gradlew sonarqube -Dsonar.login=' +// The SONAR_KEY is stored in passbolt + sonarqube { properties { property "sonar.projectName", "RiotX-Android" @@ -67,3 +71,23 @@ project(":vector") { } } } + +//project(":matrix-sdk-android") { +// sonarqube { +// properties { +// property "sonar.sources", project(":matrix-sdk-android").android.sourceSets.main.java.srcDirs +// // exclude source code from analyses separated by a colon (:) +// // property "sonar.exclusions", "**/*.*" +// } +// } +//} +// +//project(":matrix-sdk-android-rx") { +// sonarqube { +// properties { +// property "sonar.sources", project(":matrix-sdk-android-rx").android.sourceSets.main.java.srcDirs +// // exclude source code from analyses separated by a colon (:) +// // property "sonar.exclusions", "**/*.*" +// } +// } +//} diff --git a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/auth/AuthenticatorTest.kt b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/auth/AuthenticatorTest.kt index 398507fa..3dfc0619 100644 --- a/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/auth/AuthenticatorTest.kt +++ b/matrix-sdk-android/src/androidTest/java/im/vector/matrix/android/auth/AuthenticatorTest.kt @@ -19,25 +19,18 @@ package im.vector.matrix.android.auth import androidx.test.annotation.UiThreadTest import androidx.test.rule.GrantPermissionRule import androidx.test.runner.AndroidJUnit4 -import com.zhuinden.monarchy.Monarchy import im.vector.matrix.android.InstrumentedTest import im.vector.matrix.android.OkReplayRuleChainNoActivity import im.vector.matrix.android.api.auth.Authenticator -import im.vector.matrix.android.internal.auth.AuthModule -import im.vector.matrix.android.internal.di.MatrixModule -import im.vector.matrix.android.internal.di.NetworkModule import okreplay.* import org.junit.ClassRule import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith -import org.koin.standalone.StandAloneContext.loadKoinModules -import org.koin.standalone.inject -import org.koin.test.KoinTest @RunWith(AndroidJUnit4::class) -internal class AuthenticatorTest : InstrumentedTest, KoinTest { +internal class AuthenticatorTest : InstrumentedTest { lateinit var authenticator: Authenticator lateinit var okReplayInterceptor: OkReplayInterceptor