mirror of
https://github.com/owncloud/android-library.git
synced 2026-08-11 16:33:03 +00:00
Update public share tests and refactored publicUpload permission handling
This commit is contained in:
+43
-8
@@ -64,13 +64,18 @@ public class UpdatePublicShareTest extends RemoteTest {
|
||||
/* File to share and update.*/
|
||||
private static final String FILE_TO_SHARE = "/fileToShare.txt";
|
||||
|
||||
/* Folder to share and update */
|
||||
private static final String FOLDER_TO_SHARE = "/folderToShare";
|
||||
|
||||
// Data for tests
|
||||
private static final String PASSWORD = "password";
|
||||
private static final String PASS_SPECIAL_CHARS = "p@ssw�rd";
|
||||
|
||||
private String mFullPath2FileToShare;
|
||||
private String mFullPath2FolderToShare;
|
||||
|
||||
private OCShare mShare;
|
||||
private OCShare mFolderShare;
|
||||
|
||||
String mServerUri, mUser, mPass;
|
||||
OwnCloudClient mClient = null;
|
||||
@@ -107,7 +112,7 @@ public class UpdatePublicShareTest extends RemoteTest {
|
||||
|
||||
Log.v(LOG_TAG, "Setting up the remote fixture...");
|
||||
|
||||
// Upload the files
|
||||
// Upload the file
|
||||
mFullPath2FileToShare = mBaseFolderPath + FILE_TO_SHARE;
|
||||
|
||||
File textFile = getActivity().extractAsset(TestActivity.ASSETS__TEXT_FILE_NAME);
|
||||
@@ -126,7 +131,7 @@ public class UpdatePublicShareTest extends RemoteTest {
|
||||
"",
|
||||
false,
|
||||
"",
|
||||
1);
|
||||
OCShare.READ_PERMISSION_FLAG);
|
||||
|
||||
if (result.isSuccess()){
|
||||
mShare = (OCShare) result.getData().get(0);
|
||||
@@ -134,7 +139,31 @@ public class UpdatePublicShareTest extends RemoteTest {
|
||||
mShare = null;
|
||||
}
|
||||
|
||||
Log.v(LOG_TAG, "Remote fixture created.");
|
||||
// Create the folder
|
||||
mFullPath2FolderToShare = mBaseFolderPath + FOLDER_TO_SHARE;
|
||||
result = getActivity().createFolder(
|
||||
mFullPath2FolderToShare,
|
||||
true);
|
||||
if (!result.isSuccess()) {
|
||||
Utils.logAndThrow(LOG_TAG, result);
|
||||
}
|
||||
|
||||
// Share the folder privately with a group
|
||||
result = getActivity().createShare(
|
||||
mFullPath2FolderToShare,
|
||||
ShareType.PUBLIC_LINK,
|
||||
"",
|
||||
false,
|
||||
"",
|
||||
OCShare.READ_PERMISSION_FLAG);
|
||||
|
||||
if (result.isSuccess()){
|
||||
mFolderShare = (OCShare) result.getData().get(0);
|
||||
} else{
|
||||
mFolderShare = null;
|
||||
}
|
||||
|
||||
Log.v(LOG_TAG, "Remote fixtures created.");
|
||||
|
||||
}
|
||||
|
||||
@@ -165,11 +194,11 @@ public class UpdatePublicShareTest extends RemoteTest {
|
||||
result = updateShare.execute(mClient);
|
||||
assertTrue(result.isSuccess());
|
||||
|
||||
// Update Share with edit permission
|
||||
updateShare = new UpdateRemoteShareOperation(mShare.getRemoteId());
|
||||
updateShare.setPublicUpload(true);
|
||||
result = updateShare.execute(mClient);
|
||||
assertTrue(result.isSuccess());
|
||||
// Update the Folder Share with edit permission
|
||||
updateShare = new UpdateRemoteShareOperation(mFolderShare.getRemoteId());
|
||||
updateShare.setPublicUpload(true);
|
||||
result = updateShare.execute(mClient);
|
||||
assertTrue(result.isSuccess());
|
||||
|
||||
// unsuccessful test
|
||||
// Update Share with expiration date in the past
|
||||
@@ -179,6 +208,12 @@ public class UpdatePublicShareTest extends RemoteTest {
|
||||
updateShare.setExpirationDate(expirationDateInMillis);
|
||||
result = updateShare.execute(mClient);
|
||||
assertFalse(result.isSuccess());
|
||||
|
||||
// Try to update the file Share with edit permission
|
||||
updateShare = new UpdateRemoteShareOperation(mShare.getRemoteId());
|
||||
updateShare.setPublicUpload(true);
|
||||
result = updateShare.execute(mClient);
|
||||
assertFalse(result.isSuccess());
|
||||
|
||||
// Unshare the file before the unsuccessful tests
|
||||
RemoveRemoteShareOperation unshare = new RemoveRemoteShareOperation((int) mShare.getRemoteId());
|
||||
|
||||
Reference in New Issue
Block a user