Fix MasterkeyCryptoCloudProviderTest and enhance logging when test fails

data/build.gradle

@@ -17,6 +17,8 @@ android {
 
 		buildConfigField 'int', 'VERSION_CODE', "${globalConfiguration["androidVersionCode"]}"
 		buildConfigField "String", "VERSION_NAME", "\"${globalConfiguration["androidVersionName"]}\""
+
+		testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 	}
 
 	compileOptions {
@@ -98,6 +100,11 @@ dependencies {
 	// dagger
 	annotationProcessor dependencies.daggerCompiler
 	implementation dependencies.dagger
+
+	api dependencies.jsonWebTokenApi
+	implementation dependencies.jsonWebTokenImpl
+	implementation dependencies.jsonWebTokenJson
+
 	// cloud
 	implementation dependencies.dropbox
 	implementation dependencies.msgraph
@@ -150,6 +157,7 @@ dependencies {
 	testRuntimeOnly dependencies.junit4Engine
 
 	testImplementation dependencies.mockito
+	testImplementation dependencies.mockitoInline
 	testImplementation dependencies.hamcrest
 }
 
@@ -160,3 +168,16 @@ configurations {
 static def getApiKey(key) {
 	return System.getenv().getOrDefault(key, "")
 }
+
+tasks.withType(Test) {
+	testLogging {
+		events "failed"
+
+		showExceptions true
+		exceptionFormat "full"
+		showCauses true
+		showStackTraces true
+
+		showStandardStreams = false
+	}
+}

domain/build.gradle

@@ -16,6 +16,8 @@ android {
 
 		buildConfigField 'int', 'VERSION_CODE', "${globalConfiguration["androidVersionCode"]}"
 		buildConfigField "String", "VERSION_NAME", "\"${globalConfiguration["androidVersionName"]}\""
+
+		testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 	}
 
 	compileOptions {
@@ -50,10 +52,8 @@ dependencies {
 	implementation dependencies.appcompat
 
 	api dependencies.jsonWebTokenApi
-	runtimeOnly dependencies.jsonWebTokenImpl
+	implementation dependencies.jsonWebTokenImpl
-	runtimeOnly(dependencies.jsonWebTokenJson) {
+	implementation dependencies.jsonWebTokenJson
-		exclude group: 'org.json', module: 'json' //provided by Android natively
-	}
 
 	// test
 	testImplementation dependencies.junit
@@ -65,6 +65,7 @@ dependencies {
 	testRuntimeOnly dependencies.junit4Engine
 
 	testImplementation dependencies.mockito
+	testImplementation dependencies.mockitoInline
 	testImplementation dependencies.hamcrest
 }
 

presentation/build.gradle

@@ -169,12 +169,6 @@ dependencies {
 	implementation dependencies.zxcvbn
 	implementation dependencies.rxBinding
 
-	api dependencies.jsonWebTokenApi
-	runtimeOnly dependencies.jsonWebTokenImpl
-	runtimeOnly(dependencies.jsonWebTokenJson) {
-		exclude group: 'org.json', module: 'json' //provided by Android natively
-	}
-
 	// multidex
 	implementation dependencies.multidex
 
@@ -237,3 +231,16 @@ androidExtensions {
 static def getApiKey(key) {
 	return System.getenv().getOrDefault(key, "")
 }
+
+tasks.withType(Test) {
+	testLogging {
+		events "failed"
+
+		showExceptions true
+		exceptionFormat "full"
+		showCauses true
+		showStackTraces true
+
+		showStandardStreams = false
+	}
+}

util/build.gradle

@@ -73,3 +73,16 @@ dependencies {
 
 	implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
+
+tasks.withType(Test) {
+	testLogging {
+		events "failed"
+
+		showExceptions true
+		exceptionFormat "full"
+		showCauses true
+		showStackTraces true
+
+		showStandardStreams = false
+	}
+}