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

Jump to bottom

Make dataChangeCount part of BackupManagerServiceState. #6266

Merged
merged 1 commit into from
Mar 10, 2021
Merged

Make dataChangeCount part of BackupManagerServiceState. #6266

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions robolectric/src/test/java/org/robolectric/shadows/ShadowBackupManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ public void dataChanged() {
assertThat(shadowOf(backupManager).isDataChanged()).isTrue();
assertThat(shadowOf(backupManager).getDataChangedCount()).isEqualTo(i);
}

ShadowBackupManager.reset();
assertThat(shadowOf(backupManager).isDataChanged()).isFalse();
assertThat(shadowOf(backupManager).getDataChangedCount()).isEqualTo(0);
}

@Test
Expand Down
14 changes: 7 additions & 7 deletions shadows/framework/src/main/java/org/robolectric/shadows/ShadowBackupManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public class ShadowBackupManager {
private static BackupManagerServiceState serviceState = new BackupManagerServiceState();

@RealObject private BackupManager realBackupManager;
private int dataChangedCount;
private Context context;

@Resetter
Expand All @@ -59,17 +58,17 @@ protected void __constructor__(Context context) {

@Implementation
protected void dataChanged() {
dataChangedCount++;
serviceState.dataChangedCount.merge(context.getPackageName(), 1, Integer::sum);
}

/** Returns whether {@link #dataChanged()} was called. */
public boolean isDataChanged() {
return dataChangedCount > 0;
return serviceState.dataChangedCount.containsKey(context.getPackageName());
}

/** Returns number of times {@link #dataChanged()} was called. */
public int getDataChangedCount() {
return dataChangedCount;
return serviceState.dataChangedCount.getOrDefault(context.getPackageName(), 0);
}

@Implementation(minSdk = LOLLIPOP)
Expand Down Expand Up @@ -161,12 +160,12 @@ public int restoreSome(long token, IRestoreObserver observer, String[] packages)
}

// Override method for SDK <= 28
public int restoreSome(long token, IRestoreObserver observer, IBackupManagerMonitor monitor,
String[] packages) throws RemoteException {
public int restoreSome(
long token, IRestoreObserver observer, IBackupManagerMonitor monitor, String[] packages)
throws RemoteException {
return restorePackages(token, observer, packages, monitor);
}


public int restorePackages(
long token, IRestoreObserver observer, String[] packages, IBackupManagerMonitor monitor)
throws RemoteException {
Expand Down Expand Up @@ -235,6 +234,7 @@ private void post(RemoteRunnable runnable) {
private static class BackupManagerServiceState {
boolean backupEnabled = true;
long lastRestoreToken = 0L;
final Map<String, Integer> dataChangedCount = new HashMap<>();
final Map<Long, List<String>> restoreData = new HashMap<>();
final Map<String, Long> restoredPackages = new HashMap<>();
}
Expand Down