flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

add fixes according to review

Browse Source
This commit is contained in:
Christian Schabesberger 2020-09-24 12:16:46 +02:00 committed by Abel García de Prada
parent 1c24df556d
commit 4fbf002807
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
owncloudComLibrary/src/androidTest/java/com/owncloud/android/lib/GetRemoteStatusOperationTest.kt
View File

@ -12,22 +12,22 @@ import org.junit.Test
class GetRemoteStatusOperationTest { class GetRemoteStatusOperationTest {
@Test @Test
fun urlStartingWithHttpMustBeDetectedAsSuch() { fun use_http_or_https_ok_http() {
assertTrue(GetRemoteStatusOperation.usesHttpOrHttps(Uri.parse(HTTP_SOME_OWNCLOUD))) assertTrue(GetRemoteStatusOperation.usesHttpOrHttps(Uri.parse(HTTP_SOME_OWNCLOUD)))
} }
@Test @Test
fun urlStartingWithHttpsMustBeDetectedAsSuch() { fun uses_http_or_https_ok_https() {
assertTrue(GetRemoteStatusOperation.usesHttpOrHttps(Uri.parse(HTTPS_SOME_OWNCLOUD))) assertTrue(GetRemoteStatusOperation.usesHttpOrHttps(Uri.parse(HTTPS_SOME_OWNCLOUD)))
} }
@Test @Test
fun incompleteUrlWithoutHttpsOrHttpSchemeMustBeDetectedAsSuch() { fun use_http_or_https_ok_no_http_or_https() {
assertFalse(GetRemoteStatusOperation.usesHttpOrHttps(Uri.parse(SOME_OWNCLOUD))) assertFalse(GetRemoteStatusOperation.usesHttpOrHttps(Uri.parse(SOME_OWNCLOUD)))
} }
@Test @Test
fun completeUrlWithHttpMustBeReturnedAsSuch() { fun build_full_https_url_ok_http() {
assertEquals( assertEquals(
Uri.parse(HTTP_SOME_OWNCLOUD), Uri.parse(HTTP_SOME_OWNCLOUD),
GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(HTTP_SOME_OWNCLOUD)) GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(HTTP_SOME_OWNCLOUD))
@ -35,7 +35,7 @@ class GetRemoteStatusOperationTest {
} }
@Test @Test
fun completeUrlWithHttpsMustBeReturnedAsSuch() { fun build_full_https_url_ok_https() {
assertEquals( assertEquals(
Uri.parse(HTTPS_SOME_OWNCLOUD), Uri.parse(HTTPS_SOME_OWNCLOUD),
GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(HTTPS_SOME_OWNCLOUD)) GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(HTTPS_SOME_OWNCLOUD))
@ -43,7 +43,7 @@ class GetRemoteStatusOperationTest {
} }
@Test @Test
fun incompleteUrlWithoutHttpPrefixMustBeConvertedToProperUrlWithHttpsPrefix() { fun build_full_https_url_ok_no_prefix() {
assertEquals( assertEquals(
Uri.parse(HTTPS_SOME_OWNCLOUD), Uri.parse(HTTPS_SOME_OWNCLOUD),
GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(SOME_OWNCLOUD)) GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(SOME_OWNCLOUD))
@ -51,7 +51,7 @@ class GetRemoteStatusOperationTest {
} }
@Test @Test
fun completeUrlWithSubdirAndHttpsMustBeReturnedAsSuch() { fun build_full_https_url_ok_no_https_with_subdir() {
assertEquals( assertEquals(
Uri.parse(HTTPS_SOME_OWNCLOUD_WITH_SUBDIR), GetRemoteStatusOperation.buildFullHttpsUrl( Uri.parse(HTTPS_SOME_OWNCLOUD_WITH_SUBDIR), GetRemoteStatusOperation.buildFullHttpsUrl(
Uri.parse( Uri.parse(
@ -62,7 +62,7 @@ class GetRemoteStatusOperationTest {
} }
@Test @Test
fun incompleteUrlWithSubdirAndWithoutHttpPrefixMustBeConvertedToProperUrlWithHttpsPrefix() { fun build_full_https_url_ok_no_prefix_with_subdir() {
assertEquals( assertEquals(
Uri.parse(HTTPS_SOME_OWNCLOUD_WITH_SUBDIR), GetRemoteStatusOperation.buildFullHttpsUrl( Uri.parse(HTTPS_SOME_OWNCLOUD_WITH_SUBDIR), GetRemoteStatusOperation.buildFullHttpsUrl(
Uri.parse( Uri.parse(
@ -73,17 +73,17 @@ class GetRemoteStatusOperationTest {
} }
@Test @Test
fun ipMustBeConvertedToProperUrl() { fun build_full_https_url_ok_ip() {
assertEquals(Uri.parse(HTTPS_SOME_IP), GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(SOME_IP))) assertEquals(Uri.parse(HTTPS_SOME_IP), GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(SOME_IP)))
} }
@Test @Test
fun urlContainingIpAndHttpPrefixMustBeReturnedAsSuch() { fun build_full_https_url_http_ip() {
assertEquals(Uri.parse(HTTP_SOME_IP), GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(HTTP_SOME_IP))) assertEquals(Uri.parse(HTTP_SOME_IP), GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(HTTP_SOME_IP)))
} }
@Test @Test
fun ipAndPortMustBeConvertedToProperUrl() { fun build_full_https_url_ok_ip_with_port() {
assertEquals( assertEquals(
Uri.parse(HTTPS_SOME_IP_WITH_PORT), Uri.parse(HTTPS_SOME_IP_WITH_PORT),
GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(SOME_IP_WITH_PORT)) GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(SOME_IP_WITH_PORT))
@ -91,7 +91,7 @@ class GetRemoteStatusOperationTest {
} }
@Test @Test
fun urlContainingIpAndPortAndHttpPrefixMustBeReturnedAsSuch() { fun build_full_https_url_ok_ip_with_http_and_port() {
assertEquals( assertEquals(
Uri.parse(HTTP_SOME_IP_WITH_PORT), Uri.parse(HTTP_SOME_IP_WITH_PORT),
GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(HTTP_SOME_IP_WITH_PORT)) GetRemoteStatusOperation.buildFullHttpsUrl(Uri.parse(HTTP_SOME_IP_WITH_PORT))
@ -99,20 +99,20 @@ class GetRemoteStatusOperationTest {
} }
companion object { companion object {
val SOME_OWNCLOUD = "some_owncloud.com" const val SOME_OWNCLOUD = "some_owncloud.com"
val HTTP_SOME_OWNCLOUD = "$HTTP_PREFIX$SOME_OWNCLOUD" const val HTTP_SOME_OWNCLOUD = "$HTTP_PREFIX$SOME_OWNCLOUD"
val HTTPS_SOME_OWNCLOUD = "$HTTPS_PREFIX$SOME_OWNCLOUD" const val HTTPS_SOME_OWNCLOUD = "$HTTPS_PREFIX$SOME_OWNCLOUD"
val SOME_OWNCLOUD_WITH_SUBDIR = "some_owncloud.com/subdir" const val SOME_OWNCLOUD_WITH_SUBDIR = "some_owncloud.com/subdir"
val HTTP_SOME_OWNCLOUD_WITH_SUBDIR = "$HTTP_PREFIX$SOME_OWNCLOUD_WITH_SUBDIR" const val HTTP_SOME_OWNCLOUD_WITH_SUBDIR = "$HTTP_PREFIX$SOME_OWNCLOUD_WITH_SUBDIR"
val HTTPS_SOME_OWNCLOUD_WITH_SUBDIR = "$HTTPS_PREFIX$SOME_OWNCLOUD_WITH_SUBDIR" const val HTTPS_SOME_OWNCLOUD_WITH_SUBDIR = "$HTTPS_PREFIX$SOME_OWNCLOUD_WITH_SUBDIR"
val SOME_IP = "184.123.185.12" const val SOME_IP = "184.123.185.12"
val HTTP_SOME_IP = "$HTTP_PREFIX$SOME_IP" const val HTTP_SOME_IP = "$HTTP_PREFIX$SOME_IP"
val HTTPS_SOME_IP = "$HTTPS_PREFIX$SOME_IP" const val HTTPS_SOME_IP = "$HTTPS_PREFIX$SOME_IP"
val SOME_IP_WITH_PORT = "184.123.185.12:5678" const val SOME_IP_WITH_PORT = "184.123.185.12:5678"
val HTTP_SOME_IP_WITH_PORT = "$HTTP_PREFIX$SOME_IP_WITH_PORT" const val HTTP_SOME_IP_WITH_PORT = "$HTTP_PREFIX$SOME_IP_WITH_PORT"
val HTTPS_SOME_IP_WITH_PORT = "$HTTPS_PREFIX$SOME_IP_WITH_PORT" const val HTTPS_SOME_IP_WITH_PORT = "$HTTPS_PREFIX$SOME_IP_WITH_PORT"
} }
} }

8
owncloudComLibrary/src/androidTest/java/com/owncloud/android/lib/StatusRequestorTest.kt → owncloudComLibrary/src/test/java/com/owncloud/android/lib/StatusRequestorTest.kt
View File

@ -32,25 +32,25 @@ class StatusRequestorTest {
private val requestor = StatusRequester() private val requestor = StatusRequester()
@Test @Test
fun testUpdateLocationWithAnAbsolutePath() { fun `update location - ok - absolute path`() {
val newLocation = requestor.updateLocationWithRedirectPath(TEST_DOMAIN, "$TEST_DOMAIN$SUB_PATH") val newLocation = requestor.updateLocationWithRedirectPath(TEST_DOMAIN, "$TEST_DOMAIN$SUB_PATH")
assertEquals("$TEST_DOMAIN$SUB_PATH", newLocation) assertEquals("$TEST_DOMAIN$SUB_PATH", newLocation)
} }
@Test @Test
fun updateLocationWithASmallerAbsolutePath() { fun `update location - ok - smaller absolute path`() {
val newLocation = requestor.updateLocationWithRedirectPath("$TEST_DOMAIN$SUB_PATH", TEST_DOMAIN) val newLocation = requestor.updateLocationWithRedirectPath("$TEST_DOMAIN$SUB_PATH", TEST_DOMAIN)
assertEquals(TEST_DOMAIN, newLocation) assertEquals(TEST_DOMAIN, newLocation)
} }
@Test @Test
fun updateLocationWithARelativePath() { fun `update location - ok - relative path`() {
val newLocation = requestor.updateLocationWithRedirectPath(TEST_DOMAIN, SUB_PATH) val newLocation = requestor.updateLocationWithRedirectPath(TEST_DOMAIN, SUB_PATH)
assertEquals("$TEST_DOMAIN$SUB_PATH", newLocation) assertEquals("$TEST_DOMAIN$SUB_PATH", newLocation)
} }
@Test @Test
fun updateLocationByReplacingTheRelativePath() { fun `update location - ok - replace relative path`() {
val newLocation = requestor.updateLocationWithRedirectPath( val newLocation = requestor.updateLocationWithRedirectPath(
"$TEST_DOMAIN/some/other/subdir", SUB_PATH "$TEST_DOMAIN/some/other/subdir", SUB_PATH
) )