mirror of
https://github.com/owncloud/android-library.git
synced 2025-06-07 16:06:08 +00:00
Updated RemoveShareTest to work with an empty OC server
This commit is contained in:
parent
309043774e
commit
f4181930b3
@ -24,19 +24,25 @@
|
|||||||
|
|
||||||
package com.owncloud.android.lib.test_project.test;
|
package com.owncloud.android.lib.test_project.test;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
|
||||||
import com.owncloud.android.lib.resources.shares.OCShare;
|
import com.owncloud.android.lib.resources.shares.OCShare;
|
||||||
|
import com.owncloud.android.lib.resources.shares.ShareType;
|
||||||
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
|
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
|
||||||
import com.owncloud.android.lib.test_project.TestActivity;
|
import com.owncloud.android.lib.test_project.TestActivity;
|
||||||
|
|
||||||
import android.test.ActivityInstrumentationTestCase2;
|
import android.test.ActivityInstrumentationTestCase2;
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
public class RemoveShareTest extends ActivityInstrumentationTestCase2<TestActivity> {
|
public class RemoveShareTest extends ActivityInstrumentationTestCase2<TestActivity> {
|
||||||
|
|
||||||
private static final String TAG = RemoveShareTest.class.getSimpleName();
|
private static final String LOG_TAG = RemoveShareTest.class.getCanonicalName();
|
||||||
|
|
||||||
|
private static final String FILE_TO_UNSHARE = "/fileToUnshare.txt";
|
||||||
|
|
||||||
private TestActivity mActivity;
|
private TestActivity mActivity;
|
||||||
|
|
||||||
|
private long mShareId;
|
||||||
|
|
||||||
public RemoveShareTest() {
|
public RemoveShareTest() {
|
||||||
super(TestActivity.class);
|
super(TestActivity.class);
|
||||||
|
|
||||||
@ -47,28 +53,42 @@ public class RemoveShareTest extends ActivityInstrumentationTestCase2<TestActivi
|
|||||||
super.setUp();
|
super.setUp();
|
||||||
setActivityInitialTouchMode(false);
|
setActivityInitialTouchMode(false);
|
||||||
mActivity = getActivity();
|
mActivity = getActivity();
|
||||||
|
|
||||||
|
File textFile = mActivity.extractAsset(TestActivity.ASSETS__TEXT_FILE_NAME);
|
||||||
|
RemoteOperationResult result = mActivity.uploadFile(
|
||||||
|
textFile.getAbsolutePath(),
|
||||||
|
FILE_TO_UNSHARE,
|
||||||
|
"txt/plain");
|
||||||
|
if (!result.isSuccess()) {
|
||||||
|
Utils.logAndThrow(LOG_TAG, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
result = mActivity.createShare(FILE_TO_UNSHARE, ShareType.PUBLIC_LINK, "", false, "", 1);
|
||||||
|
if (!result.isSuccess()) {
|
||||||
|
Utils.logAndThrow(LOG_TAG, result);
|
||||||
|
} else {
|
||||||
|
OCShare created = (OCShare) result.getData().get(0);
|
||||||
|
mShareId = created.getIdRemoteShared();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test Remove Share: the server must support SHARE API
|
* Test Remove Share: the server must support SHARE API
|
||||||
*/
|
*/
|
||||||
public void testRemoveShare() {
|
public void testRemoveShare() {
|
||||||
// Get the shares
|
RemoteOperationResult result = mActivity.removeShare((int) mShareId);
|
||||||
RemoteOperationResult result = mActivity.getShares();
|
assertTrue(result.isSuccess());
|
||||||
if (result.isSuccess()) {
|
|
||||||
int size = result.getData().size();
|
|
||||||
|
|
||||||
if (size > 0) {
|
|
||||||
OCShare share = ((OCShare) result.getData().get(size -1));
|
|
||||||
long id = share.getIdRemoteShared();
|
|
||||||
Log.d(TAG, "File to unshare: " + share.getPath() );
|
|
||||||
result = mActivity.removeShare((int) id); // Unshare
|
|
||||||
assertTrue(result.isSuccess());
|
|
||||||
} else {
|
|
||||||
assertTrue(true);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
assertTrue(true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void tearDown() throws Exception {
|
||||||
|
RemoteOperationResult removeResult = mActivity.removeFile(FILE_TO_UNSHARE);
|
||||||
|
if (!removeResult.isSuccess()) {
|
||||||
|
Utils.logAndThrow(LOG_TAG, removeResult);
|
||||||
|
}
|
||||||
|
super.tearDown();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user