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

Merge "Search results page polish" into oc-dr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-27 16:53:52 +00:00
committed by Android (Google) Code Review
parent 63e36128e6 ab0c049bc2
commit 692a4b5514
7 changed files with 75 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
tests/robotests/src/com/android/settings/search/HeaderDecoratorTest.java
View File

@@ -1,80 +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.search;
import android.graphics.Rect;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import com.android.settings.R;
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.mockito.Answers;
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.Matchers.any;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class HeaderDecoratorTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private View mView;
@Mock
private RecyclerView mRecyclerView;
@Mock
private RecyclerView.LayoutParams mLayoutParams;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mView.getLayoutParams()).thenReturn(mLayoutParams);
}
@Test
public void testgetItemOffsets_positionZero_headerAdded() {
HeaderDecorator decorator = new HeaderDecorator();
Rect outRect = new Rect();
when(mRecyclerView.getChildAdapterPosition(any(View.class))).thenReturn(0);
when(mView.getContext().obtainStyledAttributes(any(int[].class))
.getDimensionPixelSize(0, 0)).thenReturn(20);
when(mView.getContext().getResources().getDimensionPixelSize(R.dimen.search_bar_margin))
.thenReturn(5);
decorator.getItemOffsets(outRect, mView, mRecyclerView, null);
assertThat(outRect).isEqualTo(new Rect(0, 30, 0, 0));
}
@Test
public void testgetItemOffsets_positionGreaterThanZero_noDecoration() {
HeaderDecorator decorator = new HeaderDecorator();
Rect outRect = new Rect();
when(mRecyclerView.getChildAdapterPosition(any(View.class))).thenReturn(1);
decorator.getItemOffsets(outRect, mView, mRecyclerView, null);
assertThat(outRect).isEqualTo(new Rect(0, 0, 0, 0));
}
}

8
tests/robotests/src/com/android/settings/search/SearchFragmentTest.java
View File

@@ -32,6 +32,7 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.testutils.DatabaseTestUtils;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import org.junit.After;
import org.junit.Before;
@@ -66,7 +67,12 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@Config(manifest = TestConfig.MANIFEST_PATH,
sdk = TestConfig.SDK_VERSION,
shadows = {
SettingsShadowResources.class,
SettingsShadowResources.SettingsShadowTheme.class,
})
public class SearchFragmentTest {
@Mock(answer = Answers.RETURNS_DEEP_STUBS)

10
tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
View File

@@ -7,6 +7,7 @@ import static org.robolectric.Shadows.shadowOf;
import static org.robolectric.internal.Shadow.directlyOn;
import android.annotation.DimenRes;
import android.content.res.ColorStateList;
import android.content.res.Resources;
import android.content.res.Resources.NotFoundException;
import android.content.res.Resources.Theme;
@@ -87,6 +88,15 @@ public class SettingsShadowResources extends ShadowResources {
return directlyOn(realResources, Resources.class).getColor(id, theme);
}
@Implementation
public ColorStateList getColorStateList(@ColorRes int id, @Nullable Theme theme)
throws NotFoundException {
if (id == com.android.internal.R.color.text_color_primary) {
return ColorStateList.valueOf(Color.WHITE);
}
return directlyOn(realResources, Resources.class).getColorStateList(id, theme);
}
@Implementation
public Drawable loadDrawable(TypedValue value, int id, Theme theme)
throws NotFoundException {