Merge "Remove the replaced activity checking to impact launching performance" into sc-v2-dev am: 6dbc3835f8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16426486

Change-Id: Iadc95c4f5961003d562982148f9e916cf2cf97c6
This commit is contained in:
TreeHugger Robot
2021-12-09 13:16:54 +00:00
committed by Automerger Merge Worker
2 changed files with 0 additions and 104 deletions

View File

@@ -21,11 +21,7 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -36,9 +32,7 @@ import android.content.Context;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -50,23 +44,13 @@ import org.robolectric.annotation.Config;
@RunWith(RobolectricTestRunner.class)
public class TopLevelBatteryPreferenceControllerTest {
private Context mContext;
private FakeFeatureFactory mFeatureFactory;
private TopLevelBatteryPreferenceController mController;
private BatterySettingsFeatureProvider mBatterySettingsFeatureProvider;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mFeatureFactory = FakeFeatureFactory.setupForTest();
mContext = spy(Robolectric.setupActivity(Activity.class));
mController = new TopLevelBatteryPreferenceController(mContext, "test_key");
mBatterySettingsFeatureProvider =
mFeatureFactory.batterySettingsFeatureProvider;
}
@After
public void cleanUp() {
TopLevelBatteryPreferenceController.sReplacingActivityMap.clear();
}
@Test
@@ -80,54 +64,6 @@ public class TopLevelBatteryPreferenceControllerTest {
assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
}
@Test
public void handlePreferenceTreeClick_noFragment_noCustomActivityCalled() {
Preference preference = new Preference(mContext);
assertThat(mController.handlePreferenceTreeClick(preference)).isFalse();
}
@Test
public void handlePreferenceTreeClick_sameActivityReturned_noCustomActivityCalled() {
String fragmentPath = "my.fragment.ClassName";
Preference preference = mock(Preference.class);
when(preference.getFragment()).thenReturn(fragmentPath);
ComponentName pathName = mController.convertClassPathToComponentName(fragmentPath);
when(mBatterySettingsFeatureProvider.getReplacingActivity(any())).thenReturn(pathName);
assertThat(mController.handlePreferenceTreeClick(preference)).isFalse();
}
@Test
public void handlePreferenceTreeClick_newActivityReturned_newActivityRedirected() {
String fragmentPath = "my.fragment.ClassName";
Preference preference = mock(Preference.class);
when(preference.getFragment()).thenReturn(fragmentPath);
String newFragmentPath = "my.fragment.NewClassName";
ComponentName newPathName = mController.convertClassPathToComponentName(newFragmentPath);
when(mBatterySettingsFeatureProvider.getReplacingActivity(any())).thenReturn(
newPathName);
doNothing().when(mContext).startActivity(any());
assertThat(mController.handlePreferenceTreeClick(preference)).isTrue();
}
@Test
public void handlePreferenceTreeClick_calledMultipleTimes_fetchedFromCache() {
String fragmentPath = "my.fragment.ClassName";
Preference preference = mock(Preference.class);
when(preference.getFragment()).thenReturn(fragmentPath);
String newFragmentPath = "my.fragment.NewClassName";
ComponentName newPathName = mController.convertClassPathToComponentName(newFragmentPath);
when(mBatterySettingsFeatureProvider.getReplacingActivity(any())).thenReturn(
newPathName);
doNothing().when(mContext).startActivity(any());
assertThat(mController.handlePreferenceTreeClick(preference)).isTrue();
assertThat(mController.handlePreferenceTreeClick(preference)).isTrue();
verify(mBatterySettingsFeatureProvider, times(1)).getReplacingActivity(any());
}
@Test
public void convertClassPathToComponentName_nullInput_returnsNull() {
assertThat(mController.convertClassPathToComponentName(null)).isNull();