Merge "Fix PlatformCompatDashboardTest." into rvc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
f1fe93bc2f
@@ -88,11 +88,11 @@ public class PlatformCompatDashboardTest {
|
||||
public void setUp() throws RemoteException, NameNotFoundException {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mChanges = new CompatibilityChangeInfo[5];
|
||||
mChanges[0] = new CompatibilityChangeInfo(1L, "Default_Enabled", 0, false, "");
|
||||
mChanges[1] = new CompatibilityChangeInfo(2L, "Default_Disabled", 0, true, "");
|
||||
mChanges[2] = new CompatibilityChangeInfo(3L, "Enabled_After_SDK_1_1", 1, false, "");
|
||||
mChanges[3] = new CompatibilityChangeInfo(4L, "Enabled_After_SDK_1_2", 1, false, "");
|
||||
mChanges[4] = new CompatibilityChangeInfo(5L, "Enabled_After_SDK_2", 2, false, "");
|
||||
mChanges[0] = new CompatibilityChangeInfo(1L, "Default_Enabled", 0, false, false, "");
|
||||
mChanges[1] = new CompatibilityChangeInfo(2L, "Default_Disabled", 0, true, false, "");
|
||||
mChanges[2] = new CompatibilityChangeInfo(3L, "Enabled_After_SDK_1_1", 1, false, false, "");
|
||||
mChanges[3] = new CompatibilityChangeInfo(4L, "Enabled_After_SDK_1_2", 1, false, false, "");
|
||||
mChanges[4] = new CompatibilityChangeInfo(5L, "Enabled_After_SDK_2", 2, false, false, "");
|
||||
when(mPlatformCompat.listAllChanges()).thenReturn(mChanges);
|
||||
when(mPlatformCompat.getOverrideValidator()).thenReturn(mOverrideValidator);
|
||||
// By default, allow any change
|
||||
@@ -205,7 +205,7 @@ public class PlatformCompatDashboardTest {
|
||||
for (int i = 0; i < mChanges.length; ++i) {
|
||||
changesToAdd.add(new CompatibilityChangeInfo(mChanges[i].getId(), mChanges[i].getName(),
|
||||
mChanges[i].getEnableAfterTargetSdk(), mChanges[i].getDisabled(),
|
||||
mChanges[i].getDescription()));
|
||||
mChanges[i].getLoggingOnly(), mChanges[i].getDescription()));
|
||||
}
|
||||
|
||||
PreferenceCategory category = mDashboard.createChangeCategoryPreference(changesToAdd,
|
||||
|
Reference in New Issue
Block a user