Skip to content

AbstractIT uses now NextcloudClient #1923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tobiasKaminsky wants to merge 1 commit into
base: master
Choose a base branch
from
Open

AbstractIT uses now NextcloudClient #1923

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions library/src/androidTest/java/com/owncloud/android/AbstractIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,13 @@
*/
package com.owncloud.android;

import static junit.framework.TestCase.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;

import android.content.Context;
import android.net.Uri;
import android.os.Bundle;

import androidx.test.platform.app.InstrumentationRegistry;

import com.nextcloud.android.lib.resources.files.ToggleFileLockRemoteOperation;
import com.nextcloud.common.NextcloudClient;
import com.nextcloud.operations.GetMethod;
import com.owncloud.android.lib.common.OwnCloudBasicCredentials;
import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.common.OwnCloudClientFactory;
Expand All @@ -40,7 +34,6 @@
import com.owncloud.android.lib.resources.status.OwnCloudVersion;

import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.BeforeClass;
Expand All @@ -57,8 +50,14 @@
import java.security.cert.X509Certificate;
import java.util.concurrent.TimeUnit;

import androidx.test.platform.app.InstrumentationRegistry;
import okhttp3.Credentials;

import static junit.framework.TestCase.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assume.assumeFalse;
import static org.junit.Assume.assumeTrue;

/**
* Common base for all integration tests
*/
Expand Down Expand Up @@ -113,20 +112,20 @@ public static void beforeAll() throws InterruptedException,
String credentials = Credentials.basic(loginName, password);
nextcloudClient = new NextcloudClient(url, userId, credentials, context);

waitForServer(client, url);
waitForServer(nextcloudClient, url);
testConnection();
}

private static void waitForServer(OwnCloudClient client, Uri baseUrl) {
private static void waitForServer(NextcloudClient client, Uri baseUrl) {
String statusUrl = baseUrl + "/status.php";
GetMethod get;
int maxRetries = 3;

for (int i = 0; i < maxRetries; i++) {
get = new GetMethod(statusUrl);
get = new GetMethod(statusUrl, false);

try {
if (client.executeMethod(get) == HttpStatus.SC_OK) {
if (client.execute(get) == HttpStatus.SC_OK) {
Log_OC.d(TAG, "Server is ready");
return;
}
Expand Down
Loading