Merge "Update suggestion rules and string description"

This commit is contained in:
TreeHugger Robot
2017-06-04 03:24:51 +00:00
committed by Android (Google) Code Review
5 changed files with 16 additions and 16 deletions

View File

@@ -17,13 +17,6 @@
package com.android.settings.fuelgauge;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import android.content.Context;
import android.content.Intent;
import android.os.BatteryManager;
@@ -45,6 +38,11 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH,
sdk = TestConfig.SDK_VERSION,

View File

@@ -60,7 +60,7 @@ public class SettingsSuggestionsTest {
@Test
public void wallpaperSuggestion_isValid() {
assertSuggestionEquals("com.android.settings.wallpaper.WallpaperSuggestionActivity",
CATEGORY_SETTINGS_ONLY,
CATEGORY_FIRST_IMPRESSION,
R.string.wallpaper_suggestion_title, R.string.wallpaper_suggestion_summary);
}