mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 15:15:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix tests

Browse source 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2020-11-25 11:26:54 +01:00
parent 71894243f0
commit d3306ba516
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/nextcloud/client/network/ConnectivityServiceImpl.java
View file

@ -74,7 +74,7 @@ class ConnectivityServiceImpl implements ConnectivityService {
int status = get.execute(client);
boolean result = !(status == HttpStatus.SC_NO_CONTENT && (get.getResponseBodyAsString().length() == 0));
boolean result = !(status == HttpStatus.SC_NO_CONTENT && (get.getResponseContentLength() == 0));
if (get != null) {
get.releaseConnection();

23
src/test/java/com/nextcloud/client/network/ConnectivityServiceTest.kt
View file

@ -25,15 +25,15 @@ import com.nextcloud.client.account.Server
import com.nextcloud.client.account.User
import com.nextcloud.client.account.UserAccountManager
import com.nextcloud.client.logger.Logger
import com.nextcloud.common.PlainClient
import com.nextcloud.operations.GetMethod
import com.nhaarman.mockitokotlin2.any
import com.nhaarman.mockitokotlin2.mock
import com.nhaarman.mockitokotlin2.never
import com.nhaarman.mockitokotlin2.verify
import com.nhaarman.mockitokotlin2.whenever
import com.owncloud.android.lib.resources.status.OwnCloudVersion
import org.apache.commons.httpclient.HttpClient
import org.apache.commons.httpclient.HttpStatus
import org.apache.commons.httpclient.methods.GetMethod
import org.junit.Assert.assertFalse
import org.junit.Assert.assertSame
import org.junit.Assert.assertTrue
@ -81,7 +81,7 @@ class ConnectivityServiceTest {
lateinit var clientFactory: ClientFactory
@Mock
lateinit var client: HttpClient
lateinit var client: PlainClient
@Mock
lateinit var getRequest: GetMethod
@ -199,11 +199,11 @@ class ConnectivityServiceTest {
}
fun mockResponse(maintenance: Boolean = true, httpStatus: Int = HttpStatus.SC_OK) {
whenever(client.executeMethod(getRequest)).thenReturn(httpStatus)
whenever(client.execute(getRequest)).thenReturn(httpStatus)
val body =
"""{"maintenance":$maintenance}"""
whenever(getRequest.responseContentLength).thenReturn(body.length.toLong())
whenever(getRequest.responseBodyAsString).thenReturn(body)
whenever(getRequest.getResponseContentLength()).thenReturn(body.length.toLong())
whenever(getRequest.getResponseBodyAsString()).thenReturn(body)
}
@Test
@ -260,15 +260,14 @@ class ConnectivityServiceTest {
// request is not sent
assertTrue("Server should not be accessible", result)
verify(requestBuilder, never()).invoke(any())
verify(client, never()).executeMethod(any())
verify(client, never()).executeMethod(any(), any())
verify(client, never()).executeMethod(any(), any(), any())
verify(client, never()).execute(any())
}
fun mockResponse(contentLength: Long = 0, status: Int = HttpStatus.SC_OK) {
whenever(client.executeMethod(any())).thenReturn(status)
whenever(getRequest.statusCode).thenReturn(status)
whenever(getRequest.responseContentLength).thenReturn(contentLength)
whenever(client.execute(any())).thenReturn(status)
whenever(getRequest.getStatusCode()).thenReturn(status)
whenever(getRequest.getResponseContentLength()).thenReturn(contentLength)
whenever(getRequest.execute(client)).thenReturn(status)
}
@Test