Remove Suggestion v1 code.
Change-Id: Ie6e9c8f2b1b5b609d44e287accb9fbbef9054d34 Fixes: 68719093 Test: robotests
This commit is contained in:
@@ -28,13 +28,10 @@ import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.PendingIntent;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.res.Resources;
|
||||
import android.content.res.TypedArray;
|
||||
import android.graphics.drawable.Icon;
|
||||
import android.os.Bundle;
|
||||
import android.service.settings.suggestions.Suggestion;
|
||||
import android.support.v7.widget.RecyclerView;
|
||||
import android.util.DisplayMetrics;
|
||||
@@ -46,7 +43,6 @@ import com.android.settings.R;
|
||||
import com.android.settings.SettingsActivity;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.dashboard.conditional.Condition;
|
||||
import com.android.settings.dashboard.conditional.ConditionAdapter;
|
||||
import com.android.settings.dashboard.suggestions.SuggestionAdapter;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
@@ -94,12 +90,6 @@ public class DashboardAdapterTest {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mFactory = FakeFeatureFactory.setupForTest();
|
||||
when(mFactory.dashboardFeatureProvider.shouldTintIcon()).thenReturn(true);
|
||||
when(mFactory.suggestionsFeatureProvider
|
||||
.getSuggestionIdentifier(any(Context.class), any(Tile.class)))
|
||||
.thenAnswer(invocation -> {
|
||||
final Object[] args = invocation.getArguments();
|
||||
return ((Tile) args[1]).intent.getComponent().getPackageName();
|
||||
});
|
||||
|
||||
when(mContext.getResources()).thenReturn(mResources);
|
||||
when(mResources.getQuantityString(any(int.class), any(int.class), any()))
|
||||
@@ -108,14 +98,14 @@ public class DashboardAdapterTest {
|
||||
mConditionList = new ArrayList<>();
|
||||
mConditionList.add(mCondition);
|
||||
when(mCondition.shouldShow()).thenReturn(true);
|
||||
mDashboardAdapter = new DashboardAdapter(mContext, null, mConditionList, null, null, null);
|
||||
mDashboardAdapter = new DashboardAdapter(mContext, null, mConditionList, null, null);
|
||||
mSuggestionHeaderData = new DashboardData.SuggestionConditionHeaderData(mConditionList, 1);
|
||||
when(mView.getTag()).thenReturn(mCondition);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSuggestionsLogs_nullSuggestionsList_shouldNotCrash() {
|
||||
setupSuggestions(makeSuggestions("pkg1", "pkg2", "pkg3", "pkg4", "pkg5"));
|
||||
setupSuggestions(makeSuggestionsV2("pkg1", "pkg2", "pkg3", "pkg4", "pkg5"));
|
||||
mDashboardAdapter.onBindSuggestionConditionHeader(mSuggestionHolder, mSuggestionHeaderData);
|
||||
|
||||
// set suggestions to null
|
||||
@@ -131,9 +121,9 @@ public class DashboardAdapterTest {
|
||||
@Test
|
||||
public void testSuggestionDismissed_notOnlySuggestion_updateSuggestionOnly() {
|
||||
final DashboardAdapter adapter =
|
||||
spy(new DashboardAdapter(mContext, null, null, null, null, null));
|
||||
final List<Tile> suggestions = makeSuggestions("pkg1", "pkg2", "pkg3");
|
||||
adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
|
||||
spy(new DashboardAdapter(mContext, null, null, null, null));
|
||||
final List<Suggestion> suggestions = makeSuggestionsV2("pkg1", "pkg2", "pkg3");
|
||||
adapter.setSuggestions(suggestions);
|
||||
|
||||
final RecyclerView data = mock(RecyclerView.class);
|
||||
when(data.getResources()).thenReturn(mResources);
|
||||
@@ -150,7 +140,7 @@ public class DashboardAdapterTest {
|
||||
final DashboardData dashboardData = adapter.mDashboardData;
|
||||
reset(adapter); // clear interactions tracking
|
||||
|
||||
final Tile suggestionToRemove = suggestions.get(1);
|
||||
final Suggestion suggestionToRemove = suggestions.get(1);
|
||||
adapter.onSuggestionDismissed(suggestionToRemove);
|
||||
|
||||
assertThat(adapter.mDashboardData).isEqualTo(dashboardData);
|
||||
@@ -166,12 +156,11 @@ public class DashboardAdapterTest {
|
||||
when(itemView.findViewById(R.id.data)).thenReturn(data);
|
||||
final DashboardAdapter.SuggestionAndConditionContainerHolder holder =
|
||||
new DashboardAdapter.SuggestionAndConditionContainerHolder(itemView);
|
||||
final List<Tile> suggestions =
|
||||
makeSuggestions("pkg1", "pkg2", "pkg3", "pkg4");
|
||||
final List<Suggestion> suggestions = makeSuggestionsV2("pkg1", "pkg2", "pkg3", "pkg4");
|
||||
final DashboardAdapter adapter = spy(new DashboardAdapter(mContext, null /*savedInstance */,
|
||||
null /* conditions */, null /* suggestionParser */,
|
||||
null /* conditions */,
|
||||
null /* suggestionControllerMixin */, null /* callback */));
|
||||
adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
|
||||
adapter.setSuggestions(suggestions);
|
||||
adapter.onBindConditionAndSuggestion(
|
||||
holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
|
||||
// default mode, only displaying 2 suggestions
|
||||
@@ -180,16 +169,16 @@ public class DashboardAdapterTest {
|
||||
|
||||
// verify operations that access the lists will not cause ConcurrentModificationException
|
||||
assertThat(holder.data.getAdapter().getItemCount()).isEqualTo(1);
|
||||
adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
|
||||
adapter.setSuggestions(suggestions);
|
||||
// should not crash
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSuggestionDismissed_onlySuggestion_updateDashboardData() {
|
||||
DashboardAdapter adapter =
|
||||
spy(new DashboardAdapter(mContext, null, null, null, null, null));
|
||||
final List<Tile> suggestions = makeSuggestions("pkg1");
|
||||
adapter.setCategoriesAndSuggestions(null /* category */, suggestions);
|
||||
spy(new DashboardAdapter(mContext, null, null, null, null));
|
||||
final List<Suggestion> suggestions = makeSuggestionsV2("pkg1");
|
||||
adapter.setSuggestions(suggestions);
|
||||
final DashboardData dashboardData = adapter.mDashboardData;
|
||||
reset(adapter); // clear interactions tracking
|
||||
|
||||
@@ -199,22 +188,6 @@ public class DashboardAdapterTest {
|
||||
verify(adapter).notifyDashboardDataChanged(any());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSetCategoriesAndSuggestions_iconTinted() {
|
||||
TypedArray mockTypedArray = mock(TypedArray.class);
|
||||
doReturn(mockTypedArray).when(mContext).obtainStyledAttributes(any(int[].class));
|
||||
doReturn(0x89000000).when(mockTypedArray).getColor(anyInt(), anyInt());
|
||||
|
||||
List<Tile> packages = makeSuggestions("pkg1");
|
||||
Icon mockIcon = mock(Icon.class);
|
||||
packages.get(0).isIconTintable = true;
|
||||
packages.get(0).icon = mockIcon;
|
||||
|
||||
mDashboardAdapter.setCategoriesAndSuggestions(null /* category */, packages);
|
||||
|
||||
verify(mockIcon).setTint(eq(0x89000000));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSetCategories_iconTinted() {
|
||||
TypedArray mockTypedArray = mock(TypedArray.class);
|
||||
@@ -233,49 +206,14 @@ public class DashboardAdapterTest {
|
||||
verify(mockIcon).setTint(eq(0x89000000));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSetCategoriesAndSuggestions_limitSuggestionSize() {
|
||||
List<Tile> packages =
|
||||
makeSuggestions("pkg1", "pkg2", "pkg3", "pkg4", "pkg5", "pkg6", "pkg7");
|
||||
mDashboardAdapter.setCategoriesAndSuggestions(null /* category */, packages);
|
||||
|
||||
assertThat(mDashboardAdapter.mDashboardData.getSuggestions().size())
|
||||
.isEqualTo(DashboardAdapter.MAX_SUGGESTION_TO_SHOW);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testBindConditionAndSuggestion_shouldSetSuggestionAdapterAndNoCrash() {
|
||||
mDashboardAdapter = new DashboardAdapter(mContext, null, null, null, null, null);
|
||||
final List<Tile> suggestions = makeSuggestions("pkg1");
|
||||
final DashboardCategory category = new DashboardCategory();
|
||||
category.addTile(mock(Tile.class));
|
||||
|
||||
mDashboardAdapter.setCategoriesAndSuggestions(category, suggestions);
|
||||
|
||||
final RecyclerView data = mock(RecyclerView.class);
|
||||
when(data.getResources()).thenReturn(mResources);
|
||||
when(data.getContext()).thenReturn(mContext);
|
||||
when(mResources.getDisplayMetrics()).thenReturn(mock(DisplayMetrics.class));
|
||||
final View itemView = mock(View.class);
|
||||
when(itemView.findViewById(R.id.data)).thenReturn(data);
|
||||
final DashboardAdapter.SuggestionAndConditionContainerHolder holder =
|
||||
new DashboardAdapter.SuggestionAndConditionContainerHolder(itemView);
|
||||
|
||||
mDashboardAdapter.onBindConditionAndSuggestion(
|
||||
holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
|
||||
|
||||
verify(data).setAdapter(any(SuggestionAdapter.class));
|
||||
// should not crash
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testBindConditionAndSuggestion_v2_shouldSetSuggestionAdapterAndNoCrash() {
|
||||
mDashboardAdapter = new DashboardAdapter(mContext, null, null, null, null, null);
|
||||
mDashboardAdapter = new DashboardAdapter(mContext, null, null, null, null);
|
||||
final List<Suggestion> suggestions = makeSuggestionsV2("pkg1");
|
||||
final DashboardCategory category = new DashboardCategory();
|
||||
category.addTile(mock(Tile.class));
|
||||
|
||||
mDashboardAdapter.setSuggestionsV2(suggestions);
|
||||
mDashboardAdapter.setSuggestions(suggestions);
|
||||
|
||||
final RecyclerView data = mock(RecyclerView.class);
|
||||
when(data.getResources()).thenReturn(mResources);
|
||||
@@ -293,50 +231,6 @@ public class DashboardAdapterTest {
|
||||
// should not crash
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testBindConditionAndSuggestion_emptySuggestion_shouldSetConditionAdpater() {
|
||||
final Bundle savedInstance = new Bundle();
|
||||
savedInstance.putInt(DashboardAdapter.STATE_SUGGESTION_CONDITION_MODE,
|
||||
DashboardData.HEADER_MODE_FULLY_EXPANDED);
|
||||
mDashboardAdapter = new DashboardAdapter(mContext, savedInstance, mConditionList,
|
||||
null /* SuggestionParser */, null /* suggestionControllerMixin */,
|
||||
null /* SuggestionDismissController.Callback */);
|
||||
|
||||
final List<Tile> suggestions = new ArrayList<>();
|
||||
final DashboardCategory category = new DashboardCategory();
|
||||
category.addTile(mock(Tile.class));
|
||||
mDashboardAdapter.setCategoriesAndSuggestions(category, suggestions);
|
||||
|
||||
final RecyclerView data = mock(RecyclerView.class);
|
||||
when(data.getResources()).thenReturn(mResources);
|
||||
when(data.getContext()).thenReturn(mContext);
|
||||
when(mResources.getDisplayMetrics()).thenReturn(mock(DisplayMetrics.class));
|
||||
final View itemView = mock(View.class);
|
||||
when(itemView.findViewById(R.id.data)).thenReturn(data);
|
||||
final DashboardAdapter.SuggestionAndConditionContainerHolder holder =
|
||||
new DashboardAdapter.SuggestionAndConditionContainerHolder(itemView);
|
||||
|
||||
mDashboardAdapter.onBindConditionAndSuggestion(
|
||||
holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
|
||||
|
||||
verify(data).setAdapter(any(ConditionAdapter.class));
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated in favor of {@link #makeSuggestionsV2(String...)}
|
||||
*/
|
||||
@Deprecated
|
||||
private List<Tile> makeSuggestions(String... pkgNames) {
|
||||
final List<Tile> suggestions = new ArrayList<>();
|
||||
for (String pkgName : pkgNames) {
|
||||
Tile suggestion = new Tile();
|
||||
suggestion.intent = new Intent("action");
|
||||
suggestion.intent.setComponent(new ComponentName(pkgName, "cls"));
|
||||
suggestions.add(suggestion);
|
||||
}
|
||||
return suggestions;
|
||||
}
|
||||
|
||||
private List<Suggestion> makeSuggestionsV2(String... pkgNames) {
|
||||
final List<Suggestion> suggestions = new ArrayList<>();
|
||||
for (String pkgName : pkgNames) {
|
||||
@@ -348,13 +242,11 @@ public class DashboardAdapterTest {
|
||||
return suggestions;
|
||||
}
|
||||
|
||||
private void setupSuggestions(List<Tile> suggestions) {
|
||||
mDashboardAdapter.setCategoriesAndSuggestions(null /* category */, suggestions);
|
||||
private void setupSuggestions(List<Suggestion> suggestions) {
|
||||
final Context context = RuntimeEnvironment.application;
|
||||
mDashboardAdapter.setSuggestions(suggestions);
|
||||
mSuggestionHolder = new DashboardAdapter.SuggestionAndConditionHeaderHolder(
|
||||
LayoutInflater.from(context).inflate(
|
||||
R.layout.suggestion_condition_header, new RelativeLayout(context), true));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -23,10 +23,11 @@ import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.PendingIntent;
|
||||
import android.service.settings.suggestions.Suggestion;
|
||||
import android.support.annotation.NonNull;
|
||||
import android.support.v7.util.DiffUtil;
|
||||
import android.support.v7.util.ListUpdateCallback;
|
||||
import android.widget.RemoteViews;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.dashboard.conditional.AirplaneModeCondition;
|
||||
@@ -61,11 +62,10 @@ public class DashboardDataTest {
|
||||
@Mock
|
||||
private Tile mTestCategoryTile;
|
||||
@Mock
|
||||
private Tile mTestSuggestion;
|
||||
@Mock
|
||||
private Condition mTestCondition;
|
||||
@Mock
|
||||
private Condition mSecondCondition; // condition used to test insert in DiffUtil
|
||||
private Suggestion mTestSuggestion;
|
||||
|
||||
@Before
|
||||
public void SetUp() {
|
||||
@@ -74,8 +74,11 @@ public class DashboardDataTest {
|
||||
mDashboardCategory = new DashboardCategory();
|
||||
|
||||
// Build suggestions
|
||||
final List<Tile> suggestions = new ArrayList<>();
|
||||
mTestSuggestion.title = TEST_SUGGESTION_TITLE;
|
||||
final List<Suggestion> suggestions = new ArrayList<>();
|
||||
mTestSuggestion = new Suggestion.Builder("pkg")
|
||||
.setTitle(TEST_SUGGESTION_TITLE)
|
||||
.setPendingIntent(mock(PendingIntent.class))
|
||||
.build();
|
||||
suggestions.add(mTestSuggestion);
|
||||
|
||||
// Build oneItemConditions
|
||||
@@ -227,8 +230,7 @@ public class DashboardDataTest {
|
||||
final List<Condition> oneItemConditions = new ArrayList<>();
|
||||
when(mTestCondition.shouldShow()).thenReturn(true);
|
||||
oneItemConditions.add(mTestCondition);
|
||||
final List<Tile> suggestions = new ArrayList<>();
|
||||
mTestSuggestion.title = TEST_SUGGESTION_TITLE;
|
||||
final List<Suggestion> suggestions = new ArrayList<>();
|
||||
suggestions.add(mTestSuggestion);
|
||||
|
||||
final DashboardData oldData = new DashboardData.Builder()
|
||||
@@ -261,20 +263,16 @@ public class DashboardDataTest {
|
||||
public void testDiffUtil_typeSuggestedContainer_ResultDataNothingChanged() {
|
||||
//Build testResultData
|
||||
final List<ListUpdateResult.ResultData> testResultData = new ArrayList<>();
|
||||
testResultData.add(new ListUpdateResult.ResultData(
|
||||
ListUpdateResult.ResultData.TYPE_OPERATION_CHANGE, 0, 1));
|
||||
Tile tile = new Tile();
|
||||
tile.remoteViews = mock(RemoteViews.class);
|
||||
|
||||
DashboardData prevData = new DashboardData.Builder()
|
||||
.setConditions(null)
|
||||
.setCategory(null)
|
||||
.setSuggestions(Arrays.asList(tile))
|
||||
.setSuggestions(Arrays.asList(mTestSuggestion))
|
||||
.build();
|
||||
DashboardData currentData = new DashboardData.Builder()
|
||||
.setConditions(null)
|
||||
.setCategory(null)
|
||||
.setSuggestions(Arrays.asList(tile))
|
||||
.setSuggestions(Arrays.asList(mTestSuggestion))
|
||||
.build();
|
||||
testDiffUtil(prevData, currentData, testResultData);
|
||||
}
|
||||
|
||||
@@ -16,25 +16,6 @@
|
||||
|
||||
package com.android.settings.dashboard;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.dashboard.conditional.ConditionManager;
|
||||
import com.android.settings.dashboard.conditional.FocusRecyclerView;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settingslib.drawer.CategoryKey;
|
||||
import com.android.settingslib.drawer.DashboardCategory;
|
||||
import com.android.settingslib.drawer.Tile;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.nullable;
|
||||
import static org.mockito.Mockito.any;
|
||||
import static org.mockito.Mockito.doNothing;
|
||||
@@ -45,6 +26,27 @@ import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.service.settings.suggestions.Suggestion;
|
||||
import android.support.v7.widget.LinearLayoutManager;
|
||||
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.dashboard.conditional.ConditionManager;
|
||||
import com.android.settings.dashboard.conditional.FocusRecyclerView;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settingslib.drawer.CategoryKey;
|
||||
import com.android.settingslib.drawer.DashboardCategory;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
@@ -63,11 +65,13 @@ public class DashboardSummaryTest {
|
||||
@Mock
|
||||
private SummaryLoader mSummaryLoader;
|
||||
|
||||
private Context mContext;
|
||||
private DashboardSummary mSummary;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mSummary = spy(new DashboardSummary());
|
||||
ReflectionHelpers.setField(mSummary, "mAdapter", mAdapter);
|
||||
ReflectionHelpers.setField(mSummary, "mDashboardFeatureProvider",
|
||||
@@ -79,9 +83,10 @@ public class DashboardSummaryTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void updateCategoryAndSuggestion_shouldGetCategoryFromFeatureProvider() {
|
||||
public void updateCategory_shouldGetCategoryFromFeatureProvider() {
|
||||
doReturn(mock(Activity.class)).when(mSummary).getActivity();
|
||||
mSummary.updateCategoryAndSuggestion(null);
|
||||
mSummary.onAttach(mContext);
|
||||
mSummary.updateCategory();
|
||||
|
||||
verify(mSummaryLoader).updateSummaryToCache(nullable(DashboardCategory.class));
|
||||
verify(mDashboardFeatureProvider).getTilesForCategory(CategoryKey.CATEGORY_HOMEPAGE);
|
||||
@@ -135,7 +140,7 @@ public class DashboardSummaryTest {
|
||||
|
||||
@Test
|
||||
public void onSuggestionDismissed_shouldNotRebuildUI() {
|
||||
mSummary.onSuggestionDismissed(mock(Tile.class));
|
||||
mSummary.onSuggestionDismissed(mock(Suggestion.class));
|
||||
verify(mSummary, never()).rebuildUI();
|
||||
}
|
||||
}
|
||||
@@ -1,72 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2017 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License
|
||||
*/
|
||||
|
||||
package com.android.settings.dashboard.suggestions;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class EventStoreTest {
|
||||
|
||||
private EventStore mEventStore;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mEventStore = new EventStore(RuntimeEnvironment.application);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWriteRead() {
|
||||
mEventStore.writeEvent("pkg", EventStore.EVENT_SHOWN);
|
||||
long timeMs = System.currentTimeMillis();
|
||||
assertThat(mEventStore.readMetric("pkg", EventStore.EVENT_SHOWN, EventStore.METRIC_COUNT))
|
||||
.isEqualTo(1);
|
||||
assertThat(Math.abs(timeMs - mEventStore
|
||||
.readMetric("pkg", EventStore.EVENT_SHOWN, EventStore.METRIC_LAST_EVENT_TIME)) < 10000)
|
||||
.isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWriteRead_shouldHaveLatestValues() {
|
||||
mEventStore.writeEvent("pkg", EventStore.EVENT_DISMISSED);
|
||||
mEventStore.writeEvent("pkg", EventStore.EVENT_DISMISSED);
|
||||
assertThat(
|
||||
mEventStore.readMetric("pkg", EventStore.EVENT_DISMISSED, EventStore.METRIC_COUNT))
|
||||
.isEqualTo(2);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testWriteRead_shouldReturnDefaultIfNotAvailable() {
|
||||
assertThat(mEventStore.readMetric("pkg", EventStore.EVENT_SHOWN, EventStore.METRIC_COUNT))
|
||||
.isEqualTo(0);
|
||||
assertThat(
|
||||
mEventStore
|
||||
.readMetric("pkg", EventStore.EVENT_SHOWN, EventStore.METRIC_LAST_EVENT_TIME))
|
||||
.isEqualTo(0);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -16,28 +16,18 @@
|
||||
package com.android.settings.dashboard.suggestions;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Mockito.any;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.PendingIntent;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.graphics.drawable.Icon;
|
||||
import android.service.settings.suggestions.Suggestion;
|
||||
import android.view.ContextThemeWrapper;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.Button;
|
||||
import android.widget.FrameLayout;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.RemoteViews;
|
||||
import android.widget.TextView;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto;
|
||||
import com.android.settings.R;
|
||||
@@ -56,7 +46,6 @@ import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -111,37 +100,18 @@ public class SuggestionAdapterTest {
|
||||
@Test
|
||||
public void getItemCount_shouldReturnListSize() {
|
||||
mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
|
||||
mOneSuggestion, null /* suggestionV2 */, new ArrayList<>());
|
||||
mOneSuggestionV2, new ArrayList<>());
|
||||
assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(1);
|
||||
|
||||
mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
|
||||
mTwoSuggestions, null /* suggestionV2 */, new ArrayList<>());
|
||||
assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(2);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getItemCount_v2_shouldReturnListSize() {
|
||||
mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
|
||||
null /* suggestions */, mOneSuggestionV2, new ArrayList<>());
|
||||
assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(1);
|
||||
|
||||
mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
|
||||
null /* suggestions */, mTwoSuggestionsV2, new ArrayList<>());
|
||||
mTwoSuggestionsV2, new ArrayList<>());
|
||||
assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(2);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getItemViewType_shouldReturnSuggestionTile() {
|
||||
mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
|
||||
mOneSuggestion, null /* suggestionV2 */, new ArrayList<>());
|
||||
assertThat(mSuggestionAdapter.getItemViewType(0))
|
||||
.isEqualTo(R.layout.suggestion_tile);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getItemViewType_v2_shouldReturnSuggestionTile() {
|
||||
mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
|
||||
null /* suggestions */, mOneSuggestionV2, new ArrayList<>());
|
||||
mOneSuggestionV2, new ArrayList<>());
|
||||
assertThat(mSuggestionAdapter.getItemViewType(0))
|
||||
.isEqualTo(R.layout.suggestion_tile);
|
||||
}
|
||||
@@ -155,32 +125,19 @@ public class SuggestionAdapterTest {
|
||||
.setSummary("456")
|
||||
.build());
|
||||
mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
|
||||
null /* suggestions */, suggestions, new ArrayList<>());
|
||||
suggestions, new ArrayList<>());
|
||||
|
||||
assertThat(mSuggestionAdapter.getItemViewType(0))
|
||||
.isEqualTo(R.layout.suggestion_tile_with_button);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onBindViewHolder_shouldSetListener() {
|
||||
final View view = spy(LayoutInflater.from(mContext).inflate(
|
||||
R.layout.suggestion_tile, new LinearLayout(mContext), true));
|
||||
mSuggestionHolder = new DashboardAdapter.DashboardItemHolder(view);
|
||||
mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
|
||||
mOneSuggestion, null /* suggestionV2 */, new ArrayList<>());
|
||||
|
||||
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
|
||||
|
||||
verify(view).setOnClickListener(any(View.OnClickListener.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onBindViewHolder_shouldLog() {
|
||||
final View view = spy(LayoutInflater.from(mContext).inflate(
|
||||
R.layout.suggestion_tile, new LinearLayout(mContext), true));
|
||||
mSuggestionHolder = new DashboardAdapter.DashboardItemHolder(view);
|
||||
mSuggestionAdapter = new SuggestionAdapter(mContext, mSuggestionControllerMixin,
|
||||
null /* suggestionV1*/, mOneSuggestionV2, new ArrayList<>());
|
||||
mOneSuggestionV2, new ArrayList<>());
|
||||
|
||||
// Bind twice
|
||||
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
|
||||
@@ -193,53 +150,10 @@ public class SuggestionAdapterTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onBindViewHolder_shouldInflateRemoteView() {
|
||||
List<Tile> packages = makeSuggestions("pkg1");
|
||||
RemoteViews remoteViews = mock(RemoteViews.class);
|
||||
TextView textView = new TextView(RuntimeEnvironment.application);
|
||||
doReturn(textView).when(remoteViews).apply(any(Context.class), any(ViewGroup.class));
|
||||
packages.get(0).remoteViews = remoteViews;
|
||||
setupSuggestions(mActivity, packages, null);
|
||||
|
||||
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
|
||||
|
||||
assertThat(textView.getParent()).isSameAs(mSuggestionHolder.itemView);
|
||||
mSuggestionHolder.itemView.performClick();
|
||||
|
||||
verify(mActivity).startSuggestion(any(Intent.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onBindViewHolder_primaryViewShouldHandleClick() {
|
||||
Context context =
|
||||
new ContextThemeWrapper(RuntimeEnvironment.application, R.style.Theme_Settings);
|
||||
|
||||
List<Tile> packages = makeSuggestions("pkg1");
|
||||
RemoteViews remoteViews = mock(RemoteViews.class);
|
||||
FrameLayout layout = new FrameLayout(context);
|
||||
Button primary = new Button(context);
|
||||
primary.setId(android.R.id.primary);
|
||||
layout.addView(primary);
|
||||
doReturn(layout).when(remoteViews).apply(any(Context.class), any(ViewGroup.class));
|
||||
packages.get(0).remoteViews = remoteViews;
|
||||
setupSuggestions(mActivity, packages, null /* suggestionV2 */);
|
||||
|
||||
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
|
||||
mSuggestionHolder.itemView.performClick();
|
||||
|
||||
assertThat(ShadowApplication.getInstance().getNextStartedActivity()).isNull();
|
||||
verify(mActivity, never()).startSuggestion(any(Intent.class));
|
||||
|
||||
primary.performClick();
|
||||
|
||||
verify(mActivity).startSuggestion(any(Intent.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onBindViewHolder_v2_itemViewShouldHandleClick()
|
||||
public void onBindViewHolder_itemViewShouldHandleClick()
|
||||
throws PendingIntent.CanceledException {
|
||||
final List<Suggestion> suggestions = makeSuggestionsV2("pkg1");
|
||||
setupSuggestions(mActivity, null /* suggestionV1 */, suggestions);
|
||||
setupSuggestions(mActivity, suggestions);
|
||||
|
||||
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
|
||||
mSuggestionHolder.itemView.performClick();
|
||||
@@ -249,64 +163,21 @@ public class SuggestionAdapterTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onBindViewHolder_viewsShouldClearOnRebind() {
|
||||
Context context =
|
||||
new ContextThemeWrapper(RuntimeEnvironment.application, R.style.Theme_Settings);
|
||||
|
||||
List<Tile> packages = makeSuggestions("pkg1");
|
||||
RemoteViews remoteViews = mock(RemoteViews.class);
|
||||
FrameLayout layout = new FrameLayout(context);
|
||||
Button primary = new Button(context);
|
||||
primary.setId(android.R.id.primary);
|
||||
layout.addView(primary);
|
||||
doReturn(layout).when(remoteViews).apply(any(Context.class), any(ViewGroup.class));
|
||||
packages.get(0).remoteViews = remoteViews;
|
||||
setupSuggestions(mActivity, packages, null /* suggestionV2 */);
|
||||
|
||||
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
|
||||
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
|
||||
|
||||
ViewGroup itemView = (ViewGroup) mSuggestionHolder.itemView;
|
||||
assertThat(itemView.getChildCount()).isEqualTo(1);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSuggestionsV2_shouldReturnSuggestionWhenMatch() {
|
||||
public void getSuggestions_shouldReturnSuggestionWhenMatch() {
|
||||
final List<Suggestion> suggestionsV2 = makeSuggestionsV2("pkg1");
|
||||
setupSuggestions(mActivity, null /* suggestionV1 */, suggestionsV2);
|
||||
setupSuggestions(mActivity, suggestionsV2);
|
||||
|
||||
assertThat(mSuggestionAdapter.getSuggestion(0)).isNull();
|
||||
assertThat(mSuggestionAdapter.getSuggestionsV2(0)).isNotNull();
|
||||
|
||||
List<Tile> suggestionsV1 = makeSuggestions("pkg1");
|
||||
setupSuggestions(mActivity, suggestionsV1, null /* suggestionV2 */);
|
||||
|
||||
assertThat(mSuggestionAdapter.getSuggestionsV2(0)).isNull();
|
||||
assertThat(mSuggestionAdapter.getSuggestion(0)).isNotNull();
|
||||
|
||||
}
|
||||
|
||||
private void setupSuggestions(Context context, List<Tile> suggestions,
|
||||
List<Suggestion> suggestionsV2) {
|
||||
private void setupSuggestions(Context context, List<Suggestion> suggestionsV2) {
|
||||
mSuggestionAdapter = new SuggestionAdapter(context, mSuggestionControllerMixin,
|
||||
suggestions, suggestionsV2, new ArrayList<>());
|
||||
suggestionsV2, new ArrayList<>());
|
||||
mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
|
||||
new FrameLayout(RuntimeEnvironment.application),
|
||||
mSuggestionAdapter.getItemViewType(0));
|
||||
}
|
||||
|
||||
private List<Tile> makeSuggestions(String... pkgNames) {
|
||||
final List<Tile> suggestions = new ArrayList<>();
|
||||
for (String pkgName : pkgNames) {
|
||||
Tile suggestion = new Tile();
|
||||
suggestion.intent = new Intent("action");
|
||||
suggestion.intent.setComponent(new ComponentName(pkgName, "cls"));
|
||||
suggestions.add(suggestion);
|
||||
suggestion.icon = mock(Icon.class);
|
||||
}
|
||||
return suggestions;
|
||||
}
|
||||
|
||||
private List<Suggestion> makeSuggestionsV2(String... pkgNames) {
|
||||
final List<Suggestion> suggestions = new ArrayList<>();
|
||||
for (String pkgName : pkgNames) {
|
||||
|
||||
@@ -33,8 +33,6 @@ import com.android.settings.R;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settingslib.drawer.Tile;
|
||||
import com.android.settingslib.suggestions.SuggestionParser;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -53,8 +51,6 @@ public class SuggestionDismissControllerTest {
|
||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||
private RecyclerView mRecyclerView;
|
||||
@Mock
|
||||
private SuggestionParser mSuggestionParser;
|
||||
@Mock
|
||||
private SuggestionControllerMixin mSuggestionControllerMixin;
|
||||
@Mock
|
||||
private SuggestionDismissController.Callback mCallback;
|
||||
@@ -70,7 +66,7 @@ public class SuggestionDismissControllerTest {
|
||||
when(mRecyclerView.getResources().getDimension(anyInt())).thenReturn(50F);
|
||||
|
||||
mController = new SuggestionDismissController(mContext, mRecyclerView,
|
||||
mSuggestionControllerMixin, mSuggestionParser, mCallback);
|
||||
mSuggestionControllerMixin, mCallback);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -108,17 +104,6 @@ public class SuggestionDismissControllerTest {
|
||||
@Test
|
||||
public void onSwiped_shouldTriggerDismissSuggestion() {
|
||||
final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
|
||||
|
||||
mController.onSwiped(vh, ItemTouchHelper.START);
|
||||
|
||||
verify(mFactory.suggestionsFeatureProvider).dismissSuggestion(
|
||||
eq(mContext), eq(mSuggestionParser), nullable(Tile.class));
|
||||
verify(mCallback).onSuggestionDismissed(nullable(Tile.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onSwiped_v2_shouldTriggerDismissSuggestion() {
|
||||
final RecyclerView.ViewHolder vh = mock(RecyclerView.ViewHolder.class);
|
||||
when(mCallback.getSuggestionAt(anyInt())).thenReturn(
|
||||
new Suggestion.Builder("id").build());
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Matchers.anyString;
|
||||
import static org.mockito.Matchers.eq;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.verifyZeroInteractions;
|
||||
@@ -30,34 +29,27 @@ import static org.mockito.Mockito.when;
|
||||
import android.app.ActivityManager;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.hardware.fingerprint.FingerprintManager;
|
||||
import android.provider.Settings.Secure;
|
||||
import android.service.settings.suggestions.Suggestion;
|
||||
import android.util.FeatureFlagUtils;
|
||||
import android.util.Pair;
|
||||
|
||||
import com.android.internal.logging.nano.MetricsProto;
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settings.Settings.NightDisplaySuggestionActivity;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settings.core.FeatureFlags;
|
||||
import com.android.settings.testutils.FakeFeatureFactory;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.testutils.shadow.SettingsShadowResources;
|
||||
import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
|
||||
import com.android.settings.testutils.shadow.ShadowSecureSettings;
|
||||
import com.android.settingslib.drawer.Tile;
|
||||
import com.android.settingslib.suggestions.SuggestionParser;
|
||||
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Answers;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.mockito.Captor;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
@@ -71,26 +63,21 @@ import java.util.List;
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, shadows = {
|
||||
ShadowSecureSettings.class,
|
||||
SettingsShadowResources.class,
|
||||
SettingsShadowSystemProperties.class
|
||||
})
|
||||
public class SuggestionFeatureProviderImplTest {
|
||||
|
||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||
private Context mContext;
|
||||
@Mock
|
||||
private SuggestionParser mSuggestionParser;
|
||||
@Mock
|
||||
private SuggestionControllerMixin mSuggestionControllerMixin;
|
||||
@Mock
|
||||
private Tile mSuggestion;
|
||||
private Suggestion mSuggestion;
|
||||
@Mock
|
||||
private ActivityManager mActivityManager;
|
||||
@Mock
|
||||
private PackageManager mPackageManager;
|
||||
@Mock
|
||||
private FingerprintManager mFingerprintManager;
|
||||
@Captor
|
||||
private ArgumentCaptor<Pair> mTaggedDataCaptor = ArgumentCaptor.forClass(Pair.class);
|
||||
|
||||
private FakeFeatureFactory mFactory;
|
||||
private SuggestionFeatureProviderImpl mProvider;
|
||||
@@ -103,20 +90,17 @@ public class SuggestionFeatureProviderImplTest {
|
||||
// Explicit casting to object due to MockitoCast bug
|
||||
when((Object) mContext.getSystemService(FingerprintManager.class))
|
||||
.thenReturn(mFingerprintManager);
|
||||
when(mSuggestion.getId()).thenReturn("test_id");
|
||||
when(mContext.getApplicationContext()).thenReturn(RuntimeEnvironment.application);
|
||||
when(mContext.getSystemService(Context.ACTIVITY_SERVICE)).thenReturn(mActivityManager);
|
||||
when(mActivityManager.isLowRamDevice()).thenReturn(false);
|
||||
|
||||
mSuggestion.intent = new Intent().setClassName("pkg", "cls");
|
||||
mSuggestion.category = "category";
|
||||
|
||||
mProvider = new SuggestionFeatureProviderImpl(mContext);
|
||||
}
|
||||
|
||||
@After
|
||||
public void tearDown() {
|
||||
SettingsShadowResources.reset();
|
||||
SettingsShadowSystemProperties.clear();
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -129,29 +113,18 @@ public class SuggestionFeatureProviderImplTest {
|
||||
public void isSuggestionEnabled_isLowMemoryDevice_shouldReturnFalse() {
|
||||
when(mActivityManager.isLowRamDevice()).thenReturn(true);
|
||||
|
||||
assertThat(mProvider.isSuggestionEnabled(mContext)).isFalse();
|
||||
assertThat(mProvider.isSuggestionV2Enabled(mContext)).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isSuggestionV2Enabled_isNotLowMemoryDevice_sysPropOn_shouldReturnTrue() {
|
||||
public void isSuggestionV2Enabled_isNotLowMemoryDevice_shouldReturnTrue() {
|
||||
when(mActivityManager.isLowRamDevice()).thenReturn(false);
|
||||
SettingsShadowSystemProperties.set(
|
||||
FeatureFlagUtils.FFLAG_PREFIX + FeatureFlags.SUGGESTIONS_V2, "true");
|
||||
assertThat(mProvider.isSuggestionV2Enabled(mContext)).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void dismissSuggestion_noParserOrSuggestion_noop() {
|
||||
mProvider.dismissSuggestion(mContext, null, (Tile) null);
|
||||
mProvider.dismissSuggestion(mContext, mSuggestionParser, null);
|
||||
mProvider.dismissSuggestion(mContext, null, mSuggestion);
|
||||
|
||||
verifyZeroInteractions(mFactory.metricsFeatureProvider);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void dismissSuggestion_noControllerOrSuggestion_noop() {
|
||||
mProvider.dismissSuggestion(mContext, null, (Suggestion) null);
|
||||
mProvider.dismissSuggestion(mContext, null, null);
|
||||
mProvider.dismissSuggestion(mContext, mSuggestionControllerMixin, null);
|
||||
mProvider.dismissSuggestion(mContext, null, new Suggestion.Builder("id").build());
|
||||
|
||||
@@ -159,82 +132,22 @@ public class SuggestionFeatureProviderImplTest {
|
||||
verifyZeroInteractions(mSuggestionControllerMixin);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSuggestionIdentifier_samePackage_returnClassName() {
|
||||
final Tile suggestion = new Tile();
|
||||
suggestion.intent = new Intent()
|
||||
.setClassName(RuntimeEnvironment.application.getPackageName(), "123");
|
||||
assertThat(mProvider.getSuggestionIdentifier(RuntimeEnvironment.application, suggestion))
|
||||
.isEqualTo("123");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSuggestionIdentifier_differentPackage_returnPackageName() {
|
||||
final Tile suggestion = new Tile();
|
||||
suggestion.intent = new Intent()
|
||||
.setClassName(RuntimeEnvironment.application.getPackageName(), "123");
|
||||
assertThat(mProvider.getSuggestionIdentifier(mContext, suggestion))
|
||||
.isEqualTo(RuntimeEnvironment.application.getPackageName());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSuggestionIdentifier_nullComponent_shouldNotCrash() {
|
||||
final Tile suggestion = new Tile();
|
||||
suggestion.intent = new Intent();
|
||||
assertThat(mProvider.getSuggestionIdentifier(mContext, suggestion))
|
||||
.isNotEmpty();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSuggestionIdentifier_nullContext_shouldNotCrash() {
|
||||
final Tile suggestion = new Tile();
|
||||
suggestion.intent = new Intent()
|
||||
.setClassName(RuntimeEnvironment.application.getPackageName(), "123");
|
||||
assertThat(mProvider.getSuggestionIdentifier(null, suggestion))
|
||||
.isNotEmpty();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void dismissSuggestion_hasMoreDismissCount_shouldNotDisableComponent() {
|
||||
when(mSuggestionParser.dismissSuggestion(any(Tile.class)))
|
||||
.thenReturn(false);
|
||||
mProvider.dismissSuggestion(mContext, mSuggestionParser, mSuggestion);
|
||||
|
||||
verify(mFactory.metricsFeatureProvider).action(
|
||||
eq(mContext),
|
||||
eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_DISMISS_SUGGESTION),
|
||||
anyString(),
|
||||
mTaggedDataCaptor.capture());
|
||||
assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
|
||||
Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
|
||||
verify(mContext, never()).getPackageManager();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void dismissSuggestion_noContext_shouldDoNothing() {
|
||||
mProvider.dismissSuggestion(null, mSuggestionParser, mSuggestion);
|
||||
mProvider.dismissSuggestion(null, mSuggestionControllerMixin, mSuggestion);
|
||||
|
||||
verifyZeroInteractions(mFactory.metricsFeatureProvider);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void dismissSuggestion_hasNoMoreDismissCount_shouldDisableComponent() {
|
||||
when(mSuggestionParser.dismissSuggestion(any(Tile.class)))
|
||||
.thenReturn(true);
|
||||
|
||||
mProvider.dismissSuggestion(mContext, mSuggestionParser, mSuggestion);
|
||||
public void dismissSuggestion_shouldLogAndDismiss() {
|
||||
mProvider.dismissSuggestion(mContext, mSuggestionControllerMixin, mSuggestion);
|
||||
|
||||
verify(mFactory.metricsFeatureProvider).action(
|
||||
eq(mContext),
|
||||
eq(MetricsProto.MetricsEvent.ACTION_SETTINGS_DISMISS_SUGGESTION),
|
||||
anyString(),
|
||||
mTaggedDataCaptor.capture());
|
||||
assertThat(mTaggedDataCaptor.getAllValues()).containsExactly(
|
||||
Pair.create(MetricsEvent.FIELD_SETTINGS_SMART_SUGGESTIONS_ENABLED, 0));
|
||||
verify(mContext.getPackageManager())
|
||||
.setComponentEnabledSetting(mSuggestion.intent.getComponent(),
|
||||
PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
|
||||
PackageManager.DONT_KILL_APP);
|
||||
anyString());
|
||||
verify(mSuggestionControllerMixin).dismissSuggestion(mSuggestion);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
@@ -1,109 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2017 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License
|
||||
*/
|
||||
|
||||
package com.android.settings.dashboard.suggestions;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Map;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class SuggestionFeaturizerTest {
|
||||
|
||||
private EventStore mEventStore;
|
||||
private SuggestionFeaturizer mSuggestionFeaturizer;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mEventStore = new EventStore(RuntimeEnvironment.application);
|
||||
mSuggestionFeaturizer = new SuggestionFeaturizer(mEventStore);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFeaturize_singlePackage() {
|
||||
mEventStore.writeEvent("pkg", EventStore.EVENT_DISMISSED);
|
||||
mEventStore.writeEvent("pkg", EventStore.EVENT_SHOWN);
|
||||
mEventStore.writeEvent("pkg", EventStore.EVENT_SHOWN);
|
||||
Map<String, Double> features = mSuggestionFeaturizer.featurize(Arrays.asList("pkg"))
|
||||
.get("pkg");
|
||||
assertThat(features.get(SuggestionFeaturizer.FEATURE_IS_SHOWN)).isEqualTo(1.0);
|
||||
assertThat(features.get(SuggestionFeaturizer.FEATURE_IS_DISMISSED)).isEqualTo(1.0);
|
||||
assertThat(features.get(SuggestionFeaturizer.FEATURE_IS_CLICKED)).isEqualTo(0.0);
|
||||
|
||||
assertThat(features.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_SHOWN)).isLessThan(1.0);
|
||||
assertThat(features.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_DISMISSED))
|
||||
.isLessThan(1.0);
|
||||
assertThat(features.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_CLICKED))
|
||||
.isEqualTo(1.0);
|
||||
assertThat(features.get(SuggestionFeaturizer.FEATURE_SHOWN_COUNT))
|
||||
.isEqualTo(2.0 / SuggestionFeaturizer.COUNT_NORMALIZATION_FACTOR);
|
||||
assertThat(features.get(SuggestionFeaturizer.FEATURE_DISMISSED_COUNT))
|
||||
.isEqualTo(1.0 / SuggestionFeaturizer.COUNT_NORMALIZATION_FACTOR);
|
||||
assertThat(features.get(SuggestionFeaturizer.FEATURE_CLICKED_COUNT)).isEqualTo(0.0);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFeaturize_multiplePackages() {
|
||||
mEventStore.writeEvent("pkg1", EventStore.EVENT_DISMISSED);
|
||||
mEventStore.writeEvent("pkg2", EventStore.EVENT_SHOWN);
|
||||
mEventStore.writeEvent("pkg1", EventStore.EVENT_SHOWN);
|
||||
Map<String, Map<String, Double>> features = mSuggestionFeaturizer
|
||||
.featurize(Arrays.asList("pkg1", "pkg2"));
|
||||
Map<String, Double> features1 = features.get("pkg1");
|
||||
Map<String, Double> features2 = features.get("pkg2");
|
||||
|
||||
assertThat(features1.get(SuggestionFeaturizer.FEATURE_IS_SHOWN)).isEqualTo(1.0);
|
||||
assertThat(features1.get(SuggestionFeaturizer.FEATURE_IS_DISMISSED)).isEqualTo(1.0);
|
||||
assertThat(features1.get(SuggestionFeaturizer.FEATURE_IS_CLICKED)).isEqualTo(0.0);
|
||||
assertThat(features1.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_SHOWN))
|
||||
.isLessThan(1.0);
|
||||
assertThat(features1.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_DISMISSED))
|
||||
.isLessThan(1.0);
|
||||
assertThat(features1.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_CLICKED))
|
||||
.isEqualTo(1.0);
|
||||
assertThat(features1.get(SuggestionFeaturizer.FEATURE_SHOWN_COUNT))
|
||||
.isEqualTo(1.0 / SuggestionFeaturizer.COUNT_NORMALIZATION_FACTOR);
|
||||
assertThat(features1.get(SuggestionFeaturizer.FEATURE_DISMISSED_COUNT))
|
||||
.isEqualTo(1.0 / SuggestionFeaturizer.COUNT_NORMALIZATION_FACTOR);
|
||||
assertThat(features1.get(SuggestionFeaturizer.FEATURE_CLICKED_COUNT)).isEqualTo(0.0);
|
||||
|
||||
assertThat(features2.get(SuggestionFeaturizer.FEATURE_IS_SHOWN)).isEqualTo(1.0);
|
||||
assertThat(features2.get(SuggestionFeaturizer.FEATURE_IS_DISMISSED)).isEqualTo(0.0);
|
||||
assertThat(features2.get(SuggestionFeaturizer.FEATURE_IS_CLICKED)).isEqualTo(0.0);
|
||||
assertThat(features2.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_SHOWN))
|
||||
.isLessThan(1.0);
|
||||
assertThat(features2.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_DISMISSED))
|
||||
.isEqualTo(1.0);
|
||||
assertThat(features2.get(SuggestionFeaturizer.FEATURE_TIME_FROM_LAST_CLICKED))
|
||||
.isEqualTo(1.0);
|
||||
assertThat(features2.get(SuggestionFeaturizer.FEATURE_SHOWN_COUNT))
|
||||
.isEqualTo(1.0 / SuggestionFeaturizer.COUNT_NORMALIZATION_FACTOR);
|
||||
assertThat(features2.get(SuggestionFeaturizer.FEATURE_DISMISSED_COUNT)).isEqualTo(0.0);
|
||||
assertThat(features2.get(SuggestionFeaturizer.FEATURE_CLICKED_COUNT)).isEqualTo(0.0);
|
||||
}
|
||||
}
|
||||
@@ -1,92 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2017 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License
|
||||
*/
|
||||
|
||||
package com.android.settings.dashboard.suggestions;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settingslib.drawer.Tile;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
import static org.mockito.Mockito.same;
|
||||
import static org.mockito.Mockito.spy;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
public class SuggestionRankerTest {
|
||||
|
||||
@Mock
|
||||
private SuggestionRanker mSuggestionRanker;
|
||||
@Mock
|
||||
private SuggestionFeaturizer mSuggestionFeaturizer;
|
||||
private Map<String, Map<String, Double>> mFeatures;
|
||||
private List<String> mPkgNames;
|
||||
private List<Tile> mSuggestions;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mPkgNames = Arrays.asList("pkg1", "pkg2", "pkg3");
|
||||
mFeatures = new HashMap<String, Map<String, Double>>();
|
||||
mFeatures.put("pkg1", new HashMap<String, Double>());
|
||||
mFeatures.put("pkg2", new HashMap<String, Double>());
|
||||
mFeatures.put("pkg3", new HashMap<String, Double>());
|
||||
mSuggestions = new ArrayList<Tile>() {
|
||||
{
|
||||
add(new Tile());
|
||||
add(new Tile());
|
||||
add(new Tile());
|
||||
}
|
||||
};
|
||||
mSuggestionFeaturizer = mock(SuggestionFeaturizer.class);
|
||||
mSuggestionRanker = new SuggestionRanker(mSuggestionFeaturizer);
|
||||
when(mSuggestionFeaturizer.featurize(mPkgNames)).thenReturn(mFeatures);
|
||||
mSuggestionRanker = spy(mSuggestionRanker);
|
||||
when(mSuggestionRanker.getRelevanceMetric(same(mFeatures.get("pkg1")))).thenReturn(0.9);
|
||||
when(mSuggestionRanker.getRelevanceMetric(same(mFeatures.get("pkg2")))).thenReturn(0.1);
|
||||
when(mSuggestionRanker.getRelevanceMetric(same(mFeatures.get("pkg3")))).thenReturn(0.5);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRank() {
|
||||
List<Tile> expectedOrderdList = new ArrayList<Tile>() {
|
||||
{
|
||||
add(mSuggestions.get(0)); // relevance = 0.9
|
||||
add(mSuggestions.get(2)); // relevance = 0.5
|
||||
add(mSuggestions.get(1)); // relevance = 0.1
|
||||
}
|
||||
};
|
||||
mSuggestionRanker.rankSuggestions(mSuggestions, mPkgNames);
|
||||
assertThat(mSuggestions).isEqualTo(expectedOrderdList);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user