flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-11-04 12:28:25 +00:00
Code Issues Releases Wiki Activity

pleasure the linter

Browse Source
This commit is contained in:
Christian Schabesberger 2020-09-17 12:33:03 +02:00 committed by Abel García de Prada
parent 270e127940
commit dac7bcc0e7
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/StatusRequester.kt
View File

@ -48,8 +48,8 @@ internal class StatusRequester {
fun updateLocationWithRedirectPath(oldLocation: String, redirectedLocation: String): String { fun updateLocationWithRedirectPath(oldLocation: String, redirectedLocation: String): String {
if (!redirectedLocation.startsWith("/")) if (!redirectedLocation.startsWith("/"))
return redirectedLocation return redirectedLocation
val oldLocation = URL(oldLocation) val oldLocationURL = URL(oldLocation)
return URL(oldLocation.protocol, oldLocation.host, oldLocation.port, redirectedLocation).toString() return URL(oldLocationURL.protocol, oldLocationURL.host, oldLocationURL.port, redirectedLocation).toString()
} }
private fun getGetMethod(url: String): GetMethod { private fun getGetMethod(url: String): GetMethod {

6
owncloudComLibrary/src/test/java/com/owncloud/android/lib/StatusRequestorTest.kt
View File

@ -33,7 +33,7 @@ class StatusRequestorTest {
@Test @Test
fun `update location with an absolute path`() { fun `update location with an absolute path`() {
val newLocation = requestor.updateLocationWithRedirectPath(TEST_DOMAIN, "$TEST_DOMAIN/subdir") val newLocation = requestor.updateLocationWithRedirectPath(TEST_DOMAIN, "$TEST_DOMAIN$SUB_PATH")
assertEquals("$TEST_DOMAIN$SUB_PATH", newLocation) assertEquals("$TEST_DOMAIN$SUB_PATH", newLocation)
} }
@ -46,9 +46,7 @@ class StatusRequestorTest {
@Test @Test
fun `update location with a relative path`() { fun `update location with a relative path`() {
val newLocation = requestor.updateLocationWithRedirectPath( val newLocation = requestor.updateLocationWithRedirectPath(TEST_DOMAIN, SUB_PATH)
TEST_DOMAIN, SUB_PATH
)
assertEquals("$TEST_DOMAIN$SUB_PATH", newLocation) assertEquals("$TEST_DOMAIN$SUB_PATH", newLocation)
} }