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

Merge "Use framework support to customize dividers between prefs."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-02-27 22:42:10 +00:00
committed by Android (Google) Code Review
parent bee2554f13 bfb006aa32
commit eb876ea23a
6 changed files with 29 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java
View File

@@ -19,10 +19,6 @@ package com.android.settings;
import android.content.Context;
import android.os.UserManager;
import android.support.v7.preference.PreferenceScreen;
import android.test.AndroidTestCase;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settingslib.DeviceInfoUtils;
import org.junit.Before;
import org.junit.Test;
@@ -33,14 +29,13 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class DeviceInfoSettingsTest extends AndroidTestCase {
public class DeviceInfoSettingsTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@@ -49,21 +44,18 @@ public class DeviceInfoSettingsTest extends AndroidTestCase {
@Mock
private UserManager mUserManager;
private FakeFeatureFactory mFeatureFactory;
private DeviceInfoSettings mSettings;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest(mContext);
mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
mSettings = spy(new DeviceInfoSettings());
doReturn(mScreen).when(mSettings).getPreferenceScreen();
}
@Test
public void getPrefXml_shoudlReturnDeviceInfoXml() {
public void getPrefXml_shouldReturnDeviceInfoXml() {
assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.device_info_settings);
}
}

113
tests/robotests/src/com/android/settings/widget/PreferenceDividerDecorationTest.java
View File

@@ -1,113 +0,0 @@
/*
* 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.widget;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.support.v7.preference.PreferenceGroupAdapter;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import com.android.settings.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Answers;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.annotation.Config;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class PreferenceDividerDecorationTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private Context mContext;
@Mock
private Drawable mDrawable;
@Mock
private Canvas mCanvas;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private RecyclerView mRecyclerView;
@Mock
private PreferenceGroupAdapter mAdapter;
@Mock
private PreferenceCategory mPrefCategory;
@Mock
private Preference mNormalPref;
@Mock
private FooterPreference mFooterPref;
private PreferenceDividerDecoration mDecoration;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mDecoration = new PreferenceDividerDecoration();
mDecoration.setDivider(mDrawable);
mDecoration.setDividerHeight(3);
}
@Test
public void drawOver_footerPreference_shouldDrawDivider() {
when(mRecyclerView.getAdapter()).thenReturn(mAdapter);
when(mRecyclerView.getChildCount()).thenReturn(1);
when(mAdapter.getItem(anyInt())).thenReturn(mFooterPref);
mDecoration.onDrawOver(mCanvas, mRecyclerView, null /* state */);
verify(mDrawable).draw(mCanvas);
}
@Test
public void drawOver_preferenceCategory_shouldSkipFirst() {
when(mRecyclerView.getAdapter()).thenReturn(mAdapter);
when(mRecyclerView.getChildCount()).thenReturn(3);
when(mAdapter.getItem(anyInt())).thenReturn(mPrefCategory);
when(mRecyclerView.getChildAdapterPosition(any(View.class)))
.thenReturn(0)
.thenReturn(1)
.thenReturn(2);
mDecoration.onDrawOver(mCanvas, mRecyclerView, null /* state */);
// 3 prefCategory, should skip first draw
verify(mDrawable, times(2)).draw(mCanvas);
}
@Test
public void drawOver_preference_doNotDrawDivider() {
when(mRecyclerView.getAdapter()).thenReturn(mAdapter);
when(mRecyclerView.getChildCount()).thenReturn(1);
when(mAdapter.getItem(anyInt())).thenReturn(mNormalPref);
mDecoration.onDrawOver(mCanvas, mRecyclerView, null /* state */);
verify(mDrawable, never()).draw(mCanvas);
}
}