From 9f6244147b2b8d164ad3a2751d2c35b64ec7a3de Mon Sep 17 00:00:00 2001
From: agarcia <agarcia@solidgeargroup.com>
Date: Thu, 24 Sep 2020 15:18:59 +0200
Subject: [PATCH] Update some tests naming and remove unused dependencies

---
 owncloudComLibrary/build.gradle               |  1 -
 .../lib/GetRemoteStatusOperationTest.kt       | 26 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/owncloudComLibrary/build.gradle b/owncloudComLibrary/build.gradle
index b41ba2ac..17de4bf3 100644
--- a/owncloudComLibrary/build.gradle
+++ b/owncloudComLibrary/build.gradle
@@ -32,7 +32,6 @@ android {
         // This is pretty ugly but manifest placeholders don't seem to work very well when using different modules
         // See https://github.com/openid/AppAuth-Android/issues/325
         manifestPlaceholders = [appAuthRedirectScheme: '']
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     lintOptions {
diff --git a/owncloudComLibrary/src/test/java/com/owncloud/android/lib/GetRemoteStatusOperationTest.kt b/owncloudComLibrary/src/test/java/com/owncloud/android/lib/GetRemoteStatusOperationTest.kt
index 7838215f..8cb93022 100644
--- a/owncloudComLibrary/src/test/java/com/owncloud/android/lib/GetRemoteStatusOperationTest.kt
+++ b/owncloudComLibrary/src/test/java/com/owncloud/android/lib/GetRemoteStatusOperationTest.kt
@@ -14,26 +14,26 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-@Config(sdk = [Build.VERSION_CODES.O_MR1])
+@Config(sdk = [Build.VERSION_CODES.O], manifest = Config.NONE)
 class GetRemoteStatusOperationTest {
 
     @Test
-    fun use_http_or_https_ok_http() {
+    fun `uses http or https - ok - http`() {
         assertTrue(GetRemoteStatusOperation.usesHttpOrHttps(Uri.parse(HTTP_SOME_OWNCLOUD)))
     }
 
     @Test
-    fun uses_http_or_https_ok_https() {
+    fun `uses http or https - ok - https`() {
         assertTrue(GetRemoteStatusOperation.usesHttpOrHttps(Uri.parse(HTTPS_SOME_OWNCLOUD)))
     }
 
     @Test
-    fun use_http_or_https_ok_no_http_or_https() {
+    fun `uses http or https - ok - no http or https`() {
         assertFalse(GetRemoteStatusOperation.usesHttpOrHttps(Uri.parse(SOME_OWNCLOUD)))
     }
 
     @Test
-    fun build_full_https_url_ok_http() {
+    fun `build full https url - ok - http`() {
         assertEquals(
             Uri.parse(HTTP_SOME_OWNCLOUD),
             GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(HTTP_SOME_OWNCLOUD))
@@ -41,7 +41,7 @@ class GetRemoteStatusOperationTest {
     }
 
     @Test
-    fun build_full_https_url_ok_https() {
+    fun `build full https url - ok - https`() {
         assertEquals(
             Uri.parse(HTTPS_SOME_OWNCLOUD),
             GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(HTTPS_SOME_OWNCLOUD))
@@ -49,7 +49,7 @@ class GetRemoteStatusOperationTest {
     }
 
     @Test
-    fun build_full_https_url_ok_no_prefix() {
+    fun `build full https url - ok - no prefix`() {
         assertEquals(
             Uri.parse(HTTPS_SOME_OWNCLOUD),
             GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(SOME_OWNCLOUD))
@@ -57,7 +57,7 @@ class GetRemoteStatusOperationTest {
     }
 
     @Test
-    fun build_full_https_url_ok_no_https_with_subdir() {
+    fun `build full https url - ok - no https with subdir`() {
         assertEquals(
             Uri.parse(HTTPS_SOME_OWNCLOUD_WITH_SUBDIR), GetRemoteStatusOperation.buildFullHttpsUrl(
                 Uri.parse(
@@ -68,7 +68,7 @@ class GetRemoteStatusOperationTest {
     }
 
     @Test
-    fun build_full_https_url_ok_no_prefix_with_subdir() {
+    fun `build full https url - ok - no prefix with subdir`() {
         assertEquals(
             Uri.parse(HTTPS_SOME_OWNCLOUD_WITH_SUBDIR), GetRemoteStatusOperation.buildFullHttpsUrl(
                 Uri.parse(
@@ -79,17 +79,17 @@ class GetRemoteStatusOperationTest {
     }
 
     @Test
-    fun build_full_https_url_ok_ip() {
+    fun `build full https url - ok - ip`() {
         assertEquals(Uri.parse(HTTPS_SOME_IP), GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(SOME_IP)))
     }
 
     @Test
-    fun build_full_https_url_http_ip() {
+    fun `build full https url - ok - http ip`() {
         assertEquals(Uri.parse(HTTP_SOME_IP), GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(HTTP_SOME_IP)))
     }
 
     @Test
-    fun build_full_https_url_ok_ip_with_port() {
+    fun `build full https url - ok - ip with port`() {
         assertEquals(
             Uri.parse(HTTPS_SOME_IP_WITH_PORT),
             GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(SOME_IP_WITH_PORT))
@@ -97,7 +97,7 @@ class GetRemoteStatusOperationTest {
     }
 
     @Test
-    fun build_full_https_url_ok_ip_with_http_and_port() {
+    fun `build full https url - ok - ip with http and port`() {
         assertEquals(
             Uri.parse(HTTP_SOME_IP_WITH_PORT),
             GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(HTTP_SOME_IP_WITH_PORT))