PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create a feature flag for Search v2.

Browse Source 
Also moved all other flags in a common file so we can track them more
easily.

Bug: 68825426
Bug: 64938328
Test: rerun robotests
Change-Id: I3fc805054cb960bedd965b1b907be759df50b95d
This commit is contained in:
Fan Zhang
2017-11-09 14:07:23 -08:00
parent 2260321fd8
commit ff4da23a65
13 changed files with 140 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
View File

@@ -18,13 +18,24 @@
package com.android.settings.search;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.robolectric.Shadows.shadowOf;
import android.app.Activity;
import android.content.ComponentName;
import android.content.Intent;
import android.util.FeatureFlagUtils;
import android.widget.Toolbar;
import com.android.settings.TestConfig;
import com.android.settings.core.FeatureFlags;
import com.android.settings.dashboard.SiteMapManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -32,13 +43,12 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric;
import org.robolectric.annotation.Config;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O, shadows = {
SettingsShadowSystemProperties.class
})
public class SearchFeatureProviderImplTest {
private SearchFeatureProviderImpl mProvider;
private Activity mActivity;
@@ -49,6 +59,11 @@ public class SearchFeatureProviderImplTest {
mProvider = spy(new SearchFeatureProviderImpl());
}
@After
public void tearDown() {
SettingsShadowSystemProperties.clear();
}
@Test
public void getSiteMapManager_shouldCacheInstance() {
final SiteMapManager manager1 = mProvider.getSiteMapManager();
@@ -75,13 +90,51 @@ public class SearchFeatureProviderImplTest {
verify(mProvider).cleanQuery(eq(query));
}
@Test
public void initSearchToolbar_searchV2_shouldInitWithOnClickListener() {
mProvider.initSearchToolbar(mActivity, null);
// Should not crash.
SettingsShadowSystemProperties.set(
FeatureFlagUtils.FFLAG_PREFIX + FeatureFlags.SEARCH_V2,
"true");
final Toolbar toolbar = new Toolbar(mActivity);
mProvider.initSearchToolbar(mActivity, toolbar);
toolbar.performClick();
final Intent launchIntent = shadowOf(mActivity).getNextStartedActivity();
assertThat(launchIntent.getAction())
.isEqualTo("com.android.settings.action.SETTINGS_SEARCH");
}
@Test
public void initSearchToolbar_searchV1_shouldInitWithOnClickListener() {
mProvider.initSearchToolbar(mActivity, null);
// Should not crash.
SettingsShadowSystemProperties.set(
FeatureFlagUtils.FFLAG_PREFIX + FeatureFlags.SEARCH_V2,
"false");
final Toolbar toolbar = new Toolbar(mActivity);
mProvider.initSearchToolbar(mActivity, toolbar);
toolbar.performClick();
final Intent launchIntent = shadowOf(mActivity).getNextStartedActivity();
assertThat(launchIntent.getComponent().getClassName())
.isEqualTo(SearchActivity.class.getName());
}
@Test(expected = IllegalArgumentException.class)
public void verifyLaunchSearchResultPageCaller_nullCaller_shouldCrash() {
mProvider.verifyLaunchSearchResultPageCaller(mActivity, null /* caller */);
}
@Test(expected = SecurityException.class)
public void everifyLaunchSearchResultPageCaller_badCaller_shouldCrash() {
public void verifyLaunchSearchResultPageCaller_badCaller_shouldCrash() {
final ComponentName cn = new ComponentName("pkg", "class");
mProvider.verifyLaunchSearchResultPageCaller(mActivity, cn);
}