Misc fixes for User page and my device info page

- Rename UserAndAccountDashboard* to AccountDashboard* - Move emergency info from account to device info page - Move auto sync data toggles (4 of them) from Account page to user page - Move the controllers too. UserSettings is a not a DashboardFragment so I had to manually call each controller method. TODO: refactor UserSettings to a DashboardFragment - Move legal information/regulatory info above advance button within device info page. Fixes: 72523158 Bug: 71871075 Test: robotests Change-Id: I1b8af8af61e49d17926f984978a09a974b6c62e1
2018-01-26 10:15:56 -08:00
parent c24930aaf2
commit 881d579620
26 changed files with 243 additions and 178 deletions
--- a/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AccountDashboardFragmentTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2016 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.accounts;
+
+import android.app.Activity;
+import android.content.pm.UserInfo;
+import android.os.UserManager;
+import android.provider.SearchIndexableResource;
+
+import com.android.settings.R;
+import com.android.settings.TestConfig;
+import com.android.settings.dashboard.SummaryLoader;
+import com.android.settingslib.drawer.CategoryKey;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+
+import java.util.List;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class AccountDashboardFragmentTest {
+
+    private static final String METADATA_CATEGORY = "com.android.settings.category";
+    private static final String METADATA_ACCOUNT_TYPE = "com.android.settings.ia.account";
+
+    @Mock
+    private UserManager mUserManager;
+    private AccountDashboardFragment mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mFragment = new AccountDashboardFragment();
+    }
+
+    @Test
+    public void testCategory_isAccount() {
+        assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_ACCOUNT);
+    }
+
+    @Test
+    public void updateSummary_shouldDisplaySignedInUser() {
+        final Activity activity = mock(Activity.class);
+        final SummaryLoader loader = mock(SummaryLoader.class);
+        final UserInfo userInfo = new UserInfo();
+        userInfo.name = "test_name";
+
+        when(activity.getSystemService(UserManager.class)).thenReturn(mUserManager);
+        when(mUserManager.getUserInfo(anyInt())).thenReturn(userInfo);
+
+        final SummaryLoader.SummaryProvider provider = mFragment.SUMMARY_PROVIDER_FACTORY
+                .createSummaryProvider(activity, loader);
+        provider.setListening(true);
+
+        verify(activity).getString(R.string.users_and_accounts_summary,
+                userInfo.name);
+    }
+
+    @Test
+    public void testSearchIndexProvider_shouldIndexResource() {
+        final List<SearchIndexableResource> indexRes =
+                AccountDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        ShadowApplication.getInstance().getApplicationContext(),
+                        true /* enabled */);
+
+        assertThat(indexRes).isNotNull();
+        assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
+    }
+}