Skip to content

Commit 8b1a3a2

Browse files
authored
Merge pull request #942 from nextcloud/testSharedFavoritedSearch
Test: share a file, favorite it and search then for favorites
2 parents 5e06a6f + 20e674b commit 8b1a3a2

File tree

2 files changed

+49
-0
lines changed

2 files changed

+49
-0
lines changed

library/src/androidTest/java/com/owncloud/android/AbstractIT.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,11 @@ public static File extractAsset(String fileName, Context context) throws IOExcep
240240

241241
@After
242242
public void after() {
243+
removeOnClient(client);
244+
removeOnClient(client2);
245+
}
246+
247+
private void removeOnClient(OwnCloudClient client) {
243248
RemoteOperationResult result = new ReadFolderRemoteOperation("/").execute(client);
244249
assertTrue(result.getLogMessage(), result.isSuccess());
245250

library/src/androidTest/java/com/owncloud/android/lib/resources/files/SearchRemoteOperationIT.java

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
import com.owncloud.android.lib.common.OwnCloudClientFactory;
4141
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
4242
import com.owncloud.android.lib.resources.files.model.RemoteFile;
43+
import com.owncloud.android.lib.resources.shares.CreateShareRemoteOperation;
44+
import com.owncloud.android.lib.resources.shares.ShareType;
4345
import com.owncloud.android.lib.resources.status.GetCapabilitiesRemoteOperation;
4446
import com.owncloud.android.lib.resources.status.OCCapability;
4547

@@ -180,6 +182,48 @@ public void oneFavorite() {
180182
assertEquals(path, remoteFile.getRemotePath());
181183
}
182184

185+
@Test
186+
public void favoriteFiles() throws IOException {
187+
// share a file by second user to test user
188+
String sharedFile = createFile("sharedFavoriteImage.jpg");
189+
String sharedRemotePath = "/sharedFavoriteImage.jpg";
190+
assertTrue(new UploadFileRemoteOperation(sharedFile, sharedRemotePath, "image/jpg", RANDOM_MTIME)
191+
.execute(client2).isSuccess());
192+
193+
// share
194+
assertTrue(new CreateShareRemoteOperation(sharedRemotePath,
195+
ShareType.USER,
196+
client.getUserId(),
197+
false,
198+
"",
199+
31).execute(client2)
200+
.isSuccess()
201+
);
202+
203+
// test user: favorite it
204+
assertTrue(new ToggleFavoriteRemoteOperation(true, sharedRemotePath).execute(client).isSuccess());
205+
206+
String filePath = createFile("favoriteImage.jpg");
207+
String remotePath = "/favoriteImage.jpg";
208+
assertTrue(new UploadFileRemoteOperation(filePath, remotePath, "image/jpg", RANDOM_MTIME)
209+
.execute(client).isSuccess());
210+
211+
assertTrue(new ToggleFavoriteRemoteOperation(true, remotePath).execute(client).isSuccess());
212+
213+
SearchRemoteOperation sut = new SearchRemoteOperation("",
214+
SearchRemoteOperation.SearchType.FAVORITE_SEARCH,
215+
false,
216+
capability);
217+
RemoteOperationResult<List<RemoteFile>> result = sut.execute(client);
218+
219+
// test
220+
assertTrue(result.isSuccess());
221+
assertEquals(2, result.getResultData().size());
222+
223+
assertEquals(remotePath, result.getResultData().get(0).getRemotePath());
224+
assertEquals(sharedRemotePath, result.getResultData().get(1).getRemotePath());
225+
}
226+
183227
/**
184228
* shows just all files, but sorted by date
185229
*/

0 commit comments

Comments
 (0)