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

Merge "Add support to show first impression type suggestions"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-10 01:53:29 +00:00
committed by Android (Google) Code Review
parent a844469037 7afbf0f3a2
commit 95e60e9816
5 changed files with 91 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
View File

@@ -111,9 +111,9 @@ public class SuggestionFeatureProviderImplTest {
public void getSuggestionIdentifier_nullContext_shouldNotCrash() {
final Tile suggestion = new Tile();
suggestion.intent = new Intent()
.setClassName(RuntimeEnvironment.application.getPackageName(), "123");
.setClassName(RuntimeEnvironment.application.getPackageName(), "123");
assertThat(mProvider.getSuggestionIdentifier(null, suggestion))
.isNotEmpty();
.isNotEmpty();
}
@Test
@@ -152,6 +152,5 @@ public class SuggestionFeatureProviderImplTest {
.setComponentEnabledSetting(mSuggestion.intent.getComponent(),
PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP);
verify(mSuggestionParser).markCategoryDone(mSuggestion.category);
}
}

121
tests/robotests/src/com/android/settings/suggestions/SettingsSuggestionsTest.java
View File

@@ -16,17 +16,13 @@
package com.android.settings.suggestions;
import static com.android.settings.TestConfig.MANIFEST_PATH;
import static com.google.common.truth.Truth.assertThat;
import android.annotation.StringRes;
import android.content.Context;
import com.android.settings.R;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RuntimeEnvironment;
@@ -36,59 +32,78 @@ import org.robolectric.manifest.AndroidManifest;
import org.robolectric.manifest.IntentFilterData;
import org.robolectric.shadows.ShadowApplication;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import static com.android.settings.TestConfig.MANIFEST_PATH;
import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SettingsSuggestionsTest {
@Test
public void zenModeAutomationSuggestion_isValid() {
assertSuggestionEquals("Settings$ZenModeAutomationSuggestionActivity",
R.string.zen_mode_automation_suggestion_title,
R.string.zen_mode_automation_suggestion_summary);
}
private static final String CATEGORY_FIRST_IMPRESSION =
"com.android.settings.suggested.category.FIRST_IMPRESSION";
@Test
public void wallpaperSuggestion_isValid() {
assertSuggestionEquals("com.android.settings.wallpaper.WallpaperSuggestionActivity",
R.string.wallpaper_suggestion_title, R.string.wallpaper_suggestion_summary);
}
private static final String CATEGORY_SETTINGS_ONLY =
"com.android.settings.suggested.category.SETTINGS_ONLY";
@Test
public void fingerprintSuggestion_isValid() {
assertSuggestionEquals("com.android.settings.Settings$FingerprintSuggestionActivity",
R.string.suggestion_additional_fingerprints,
R.string.suggestion_additional_fingerprints_summary);
}
@Test
public void wifiCallingSuggestion_isValid() {
assertSuggestionEquals("Settings$WifiCallingSuggestionActivity",
R.string.wifi_calling_suggestion_title, R.string.wifi_calling_suggestion_summary);
}
private void assertSuggestionEquals(String activityName, @StringRes int title,
@StringRes int summary) {
final AndroidManifest androidManifest = ShadowApplication.getInstance().getAppManifest();
final ActivityData activityData = androidManifest.getActivityData(activityName);
final Map<String, Object> metaData = activityData.getMetaData().getValueMap();
final Context context = RuntimeEnvironment.application;
final String expectedTitle = context.getString(title);
final String expectedSummary = context.getString(summary);
final String pName= context.getPackageName();
final String actualTitle = context.getString(context.getResources().getIdentifier(
((String) metaData.get("com.android.settings.title")).substring(8), "string", pName));
final String actualSummary = context.getString(context.getResources().getIdentifier(
((String) metaData.get("com.android.settings.summary")).substring(8), "string", pName));
assertThat(actualTitle).isEqualTo(expectedTitle);
assertThat(actualSummary).isEqualTo(expectedSummary);
final List<IntentFilterData> intentFilters = activityData.getIntentFilters();
final List<String> categories = new ArrayList<>();
for (IntentFilterData intentFilter : intentFilters) {
categories.addAll(intentFilter.getCategories());
@Test
public void zenModeAutomationSuggestion_isValid() {
assertSuggestionEquals("Settings$ZenModeAutomationSuggestionActivity",
CATEGORY_FIRST_IMPRESSION,
R.string.zen_mode_automation_suggestion_title,
R.string.zen_mode_automation_suggestion_summary);
}
assertThat(categories).contains("com.android.settings.suggested.category.SETTINGS_ONLY");
}
@Test
public void wallpaperSuggestion_isValid() {
assertSuggestionEquals("com.android.settings.wallpaper.WallpaperSuggestionActivity",
CATEGORY_SETTINGS_ONLY,
R.string.wallpaper_suggestion_title, R.string.wallpaper_suggestion_summary);
}
@Test
public void fingerprintSuggestion_isValid() {
assertSuggestionEquals("com.android.settings.Settings$FingerprintSuggestionActivity",
CATEGORY_FIRST_IMPRESSION,
R.string.suggestion_additional_fingerprints,
R.string.suggestion_additional_fingerprints_summary);
}
@Test
public void wifiCallingSuggestion_isValid() {
assertSuggestionEquals("Settings$WifiCallingSuggestionActivity",
CATEGORY_FIRST_IMPRESSION,
R.string.wifi_calling_suggestion_title, R.string.wifi_calling_suggestion_summary);
}
private void assertSuggestionEquals(String activityName, String category, @StringRes int title,
@StringRes int summary) {
final AndroidManifest androidManifest = ShadowApplication.getInstance().getAppManifest();
final ActivityData activityData = androidManifest.getActivityData(activityName);
final Map<String, Object> metaData = activityData.getMetaData().getValueMap();
final Context context = RuntimeEnvironment.application;
final String expectedTitle = context.getString(title);
final String expectedSummary = context.getString(summary);
final String pName = context.getPackageName();
final String actualTitle = context.getString(context.getResources().getIdentifier(
((String) metaData.get("com.android.settings.title")).substring(8), "string",
pName));
final String actualSummary = context.getString(context.getResources().getIdentifier(
((String) metaData.get("com.android.settings.summary")).substring(8), "string",
pName));
assertThat(actualTitle).isEqualTo(expectedTitle);
assertThat(actualSummary).isEqualTo(expectedSummary);
final List<IntentFilterData> intentFilters = activityData.getIntentFilters();
final List<String> categories = new ArrayList<>();
for (IntentFilterData intentFilter : intentFilters) {
categories.addAll(intentFilter.getCategories());
}
assertThat(categories).contains(category);
}
}