Skip to content
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

Enhance failed uploads #6161

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Enhance failed uploads #6161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8e44c0
- first check constraints, then get failed uploads based on this cons…
tobiasKaminsky May 27, 2020
ddf7176
sort failed uploads according to UI
tobiasKaminsky May 29, 2020
975be14
Revert "sort failed uploads according to UI"
tobiasKaminsky May 29, 2020
bf5eb64
Create thumbnail only if it does not yet exist
tobiasKaminsky Jun 2, 2020
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
209 changes: 193 additions & 16 deletions src/androidTest/java/com/owncloud/android/datamodel/UploadStorageManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@

import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Random;

import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;

import static com.owncloud.android.datamodel.UploadsStorageManager.UploadStatus.UPLOAD_FAILED;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
Expand Down Expand Up @@ -94,7 +96,7 @@ public void largeTest() {
int size = 3000;
ArrayList<OCUpload> uploads = new ArrayList<>();

assertEquals(0, uploadsStorageManager.getAllStoredUploads().length);
assertEquals(0, uploadsStorageManager.getAllStoredUploads().size());

for (int i = 0; i < size; i++) {
OCUpload upload = createUpload(account);
Expand All @@ -103,11 +105,11 @@ public void largeTest() {
uploadsStorageManager.storeUpload(upload);
}

OCUpload[] storedUploads = uploadsStorageManager.getAllStoredUploads();
assertEquals(size, uploadsStorageManager.getAllStoredUploads().length);
List<OCUpload> storedUploads = uploadsStorageManager.getAllStoredUploads();
assertEquals(size, uploadsStorageManager.getAllStoredUploads().size());

for (int i = 0; i < size; i++) {
assertTrue(contains(uploads, storedUploads[i]));
assertTrue(contains(uploads, storedUploads.get(i)));
}
}

Expand All @@ -127,15 +129,6 @@ public void testIsSame() {
assertFalse(upload1.isSame(new OCFile("/test")));
}

private boolean contains(ArrayList<OCUpload> uploads, OCUpload storedUpload) {
for (int i = 0; i < uploads.size(); i++) {
if (storedUpload.isSame(uploads.get(i))) {
return true;
}
}
return false;
}

@Test(expected = IllegalArgumentException.class)
public void corruptedUpload() {
OCUpload corruptUpload = new OCUpload(File.separator + "LocalPath",
Expand All @@ -149,6 +142,192 @@ public void corruptedUpload() {
uploadsStorageManager.getAllStoredUploads();
}

@Test
public void testConstraintsWithFailedUploads() {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This test is pretty intimidating by it's size. I'd consider splitting that into smaller units.

// no constraints
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account.name)
.setUploadStatus(UPLOAD_FAILED)
.setUseWifiOnly(false)
.setWhileChargingOnly(false));

uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account.name)
.setUploadStatus(UPLOAD_FAILED)
.setLastResult(UploadResult.LOCK_FAILED)
.setUseWifiOnly(false)
.setWhileChargingOnly(false));

// wifi only
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account.name)
.setUploadStatus(UPLOAD_FAILED)
.setUseWifiOnly(true)
.setWhileChargingOnly(false));

uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account.name)
.setUploadStatus(UPLOAD_FAILED)
.setUseWifiOnly(true)
.setWhileChargingOnly(false));

// charging only
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account.name)
.setUploadStatus(UPLOAD_FAILED)
.setUseWifiOnly(false)
.setWhileChargingOnly(true));

uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account.name)
.setUploadStatus(UPLOAD_FAILED)
.setUseWifiOnly(false)
.setWhileChargingOnly(true));

uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account.name)
.setUploadStatus(UPLOAD_FAILED)
.setUseWifiOnly(false)
.setWhileChargingOnly(true));

// wifi only, charging only
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account.name)
.setUploadStatus(UPLOAD_FAILED)
.setUseWifiOnly(true)
.setWhileChargingOnly(true));

uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account.name)
.setUploadStatus(UPLOAD_FAILED)
.setUseWifiOnly(true)
.setWhileChargingOnly(true));

uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account.name)
.setUploadStatus(UPLOAD_FAILED)
.setUseWifiOnly(true)
.setWhileChargingOnly(true));

uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account.name)
.setUploadStatus(UPLOAD_FAILED)
.setUseWifiOnly(true)
.setWhileChargingOnly(true));

// should not automatically retried
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account.name)
.setUploadStatus(UPLOAD_FAILED)
.setLastResult(UploadResult.SYNC_CONFLICT)
.setUseWifiOnly(false)
.setWhileChargingOnly(false));

uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account.name)
.setUploadStatus(UPLOAD_FAILED)
.setLastResult(UploadResult.FILE_NOT_FOUND)
.setUseWifiOnly(false)
.setWhileChargingOnly(false));

assertEquals(11, uploadsStorageManager.getFailedUploads().size());
assertEquals(2, uploadsStorageManager.getFailedUploads(false, false).size());
assertEquals(2, uploadsStorageManager.getFailedUploads(true, false).size());
assertEquals(3, uploadsStorageManager.getFailedUploads(false, true).size());
assertEquals(4, uploadsStorageManager.getFailedUploads(true, true).size());

// scenario "no wifi, no charging"
List<OCUpload> failedUploads;
failedUploads = uploadsStorageManager.getFailedUploads(false, false);
assertEquals(2, failedUploads.size());
failedUploads.clear();

// scenario "wifi, no charging"
failedUploads = uploadsStorageManager.getFailedUploads(false, false);
failedUploads.addAll(uploadsStorageManager.getFailedUploads(true, false));
assertEquals(4, failedUploads.size());
failedUploads.clear();

// scenario "no wifi, charging"
failedUploads = uploadsStorageManager.getFailedUploads(false, false);
failedUploads.addAll(uploadsStorageManager.getFailedUploads(false, true));
assertEquals(5, failedUploads.size());
failedUploads.clear();

// scenario "wifi, charging"
failedUploads = uploadsStorageManager.getFailedUploads(false, false);
failedUploads.addAll(uploadsStorageManager.getFailedUploads(true, false));
failedUploads.addAll(uploadsStorageManager.getFailedUploads(false, true));
failedUploads.addAll(uploadsStorageManager.getFailedUploads(true, true));
assertEquals(11, failedUploads.size());
failedUploads.clear();
}

@Test
public void testDeleteUploadsWithOneValidAccount() {
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account.name)
.setUploadStatus(UPLOAD_FAILED));
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", "oldAccount1")
.setUploadStatus(UPLOAD_FAILED));
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", "oldAccount2")
.setUploadStatus(UPLOAD_FAILED));
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", "oldAccount3")
.setUploadStatus(UPLOAD_FAILED));

assertEquals(4, uploadsStorageManager.getFailedUploads().size());

ArrayList<Account> accountList = new ArrayList<>();
accountList.add(account);
uploadsStorageManager.removeUploadsWithExpiredUsers(accountList);

assertEquals(1, uploadsStorageManager.getFailedUploads().size());
}

@Test
public void testDeleteUploadsWithTwoValidAccount() {
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account.name)
.setUploadStatus(UPLOAD_FAILED));
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account2.name)
.setUploadStatus(UPLOAD_FAILED));
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", "oldAccount1")
.setUploadStatus(UPLOAD_FAILED));
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", "oldAccount2")
.setUploadStatus(UPLOAD_FAILED));

assertEquals(4, uploadsStorageManager.getFailedUploads().size());

ArrayList<Account> accountList = new ArrayList<>();
accountList.add(account);
accountList.add(account2);
uploadsStorageManager.removeUploadsWithExpiredUsers(accountList);

assertEquals(2, uploadsStorageManager.getFailedUploads().size());
}

@Test
public void testDeleteUploadsWithManyValidAccount() {
Account account3 = new Account("[email protected]", "Test-Type");

uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account.name)
.setUploadStatus(UPLOAD_FAILED));
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account2.name)
.setUploadStatus(UPLOAD_FAILED));
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", account3.name)
.setUploadStatus(UPLOAD_FAILED));
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", "oldAccount1")
.setUploadStatus(UPLOAD_FAILED));
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", "oldAccount2")
.setUploadStatus(UPLOAD_FAILED));
uploadsStorageManager.storeUpload(new OCUpload("/test", "/test", "oldAccount3")
.setUploadStatus(UPLOAD_FAILED));

assertEquals(6, uploadsStorageManager.getFailedUploads().size());

ArrayList<Account> accountList = new ArrayList<>();
accountList.add(account);
accountList.add(account2);
accountList.add(account3);
uploadsStorageManager.removeUploadsWithExpiredUsers(accountList);

assertEquals(3, uploadsStorageManager.getFailedUploads().size());
}

private boolean contains(ArrayList<OCUpload> uploads, OCUpload storedUpload) {
for (int i = 0; i < uploads.size(); i++) {
if (storedUpload.isSame(uploads.get(i))) {
return true;
}
}
return false;
}

private void insertUploads(Account account, int rowsToInsert) {
for (int i = 0; i < rowsToInsert; i++) {
uploadsStorageManager.storeUpload(createUpload(account));
Expand Down Expand Up @@ -177,9 +356,7 @@ private OCUpload createUpload(Account account) {

@After
public void tearDown() {
for (Account account : getAllAccounts()) {
uploadsStorageManager.removeAccountUploads(account);
}
uploadsStorageManager.removeAllUploads();

AccountManager platformAccountManager = AccountManager.get(targetContext);
platformAccountManager.removeAccountExplicitly(account2);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,15 +681,15 @@ private int getThumbnailDimension() {
private Bitmap doFileInBackground() {
File file = (File)mFile;

final String imageKey;
String imageKey;
if (mImageKey != null) {
imageKey = mImageKey;
} else {
imageKey = String.valueOf(file.hashCode());
}

// local file should always generate a thumbnail
mImageKey = PREFIX_THUMBNAIL + mImageKey;
imageKey = PREFIX_THUMBNAIL + imageKey;

// Check disk cache in background thread
Bitmap thumbnail = getBitmapFromDiskCache(imageKey);
Expand Down
Loading