flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-10-31 10:27:45 +00:00
Code Issues Releases Wiki Activity

add basic test functionality for andorid library

Browse Source
This commit is contained in:
Christian Schabesberger 2020-09-15 13:51:56 +02:00 committed by Abel García de Prada
parent a28c1df23a
commit 06fbff130b
3 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
owncloudComLibrary/build.gradle
View File

@ -15,7 +15,7 @@ dependencies {
}
kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
testImplementation 'junit:junit:4.13'
testImplementation "junit:junit:4.13.1"
}
android {

6
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.kt
View File

@ -68,7 +68,7 @@ class GetRemoteStatusOperation : RemoteOperation<OwnCloudVersion>() {
return latestResult
}
private fun updateLocationWithRelativePath(oldLocation: String, redirectedLocation: String): String {
fun updateLocationWithRedirectPath(oldLocation: String, redirectedLocation: String): String {
if(!redirectedLocation.startsWith("/"))
return redirectedLocation
val oldLocation = URL(oldLocation)
@ -97,7 +97,7 @@ class GetRemoteStatusOperation : RemoteOperation<OwnCloudVersion>() {
return successfulConnection
}
var redirectedLocation = updateLocationWithRelativePath(baseUrlStr, latestResult.redirectedLocation)
var redirectedLocation = updateLocationWithRedirectPath(baseUrlStr, latestResult.redirectedLocation)
while (!redirectedLocation.isNullOrEmpty() && !latestResult.isSuccess) {
isRedirectToNonSecureConnection =
isRedirectToNonSecureConnection ||
@ -112,7 +112,7 @@ class GetRemoteStatusOperation : RemoteOperation<OwnCloudVersion>() {
status = client.executeHttpMethod(getMethod)
latestResult = RemoteOperationResult(getMethod)
redirectedLocation = updateLocationWithRelativePath(redirectedLocation, latestResult.redirectedLocation)
redirectedLocation = updateLocationWithRedirectPath(redirectedLocation, latestResult.redirectedLocation)
}
if (isSuccess(status)) {

42
owncloudComLibrary/src/test/java/com/owncloud/android/lib/GetRemoteStatusOperationTest.kt Normal file
View File

@ -0,0 +1,42 @@
package com.owncloud.android.lib
import com.owncloud.android.lib.resources.status.GetRemoteStatusOperation
import org.junit.Assert.assertEquals
import org.junit.Test
class GetRemoteStatusOperationTest {
private val remoteStatusOperation = GetRemoteStatusOperation()
@Test
fun `update location with an absolute path`() {
val newLocation = remoteStatusOperation.updateLocationWithRedirectPath(
"https://cloud.somewhere.com", "https://cloud.somewhere.com/subdir"
)
assertEquals("https://cloud.somewhere.com/subdir", newLocation)
}
@Test
fun `update location with a smaler aboslute path`() {
val newLocation = remoteStatusOperation.updateLocationWithRedirectPath(
"https://cloud.somewhere.com/subdir", "https://cloud.somewhere.com/"
)
assertEquals("https://cloud.somewhere.com/", newLocation)
}
@Test
fun `update location with a relative path`() {
val newLocation = remoteStatusOperation.updateLocationWithRedirectPath(
"https://cloud.somewhere.com", "/subdir"
)
assertEquals("https://cloud.somewhere.com/subdir", newLocation)
}
@Test
fun `update location by replacing the relative path`() {
val newLocation = remoteStatusOperation.updateLocationWithRedirectPath(
"https://cloud.somewhere.com/some/other/subdir", "/subdir"
)
assertEquals("https://cloud.somewhere.com/subdir", newLocation)
}
}