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

Fix tests

Browse Source 
Change-Id: I8b750a87e6852d60ac2f8f61a955b1296cef759b
Fixes: 74234076
Test: robotests
This commit is contained in:
Fan Zhang
2018-03-06 09:08:29 -08:00
parent e8acc0c4bd
commit 59520b028a
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/robotests/res/xml-mcc998/location_settings.xml
View File

@@ -18,14 +18,20 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="fake_title_key" android:key="fake_title_key"
android:title="screen_title" android:title="screen_title">
settings:controller="com.android.settings.slices.FakePreferenceController">
<Preference <Preference
android:key="key" android:key="key1"
android:title="title" android:title="title"
android:icon="@drawable/ic_android" android:icon="@drawable/ic_android"
android:summary="summary" android:summary="summary1"
settings:controller="com.android.settings.core.BadPreferenceController"/> settings:controller="com.android.settings.core.BadPreferenceController"/>
<Preference
android:key="key2"
android:title="title"
android:icon="@drawable/ic_android"
android:summary="summary2"
settings:controller="com.android.settings.slices.FakePreferenceController"/>
</PreferenceScreen> </PreferenceScreen>

3
tests/robotests/res/xml-mcc999/location_settings.xml
View File

@@ -17,8 +17,7 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="fake_title_key" android:key="fake_title_key"
android:title="screen_title" android:title="screen_title">
settings:controller="com.android.settings.slices.FakePreferenceController">
<Preference <Preference
android:key="key" android:key="key"

2
tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
View File

@@ -116,7 +116,7 @@ public class BaseSearchIndexProviderTest {
final List<AbstractPreferenceController> controllers = final List<AbstractPreferenceController> controllers =
provider.getPreferenceControllers(mContext); provider.getPreferenceControllers(mContext);
assertThat(controllers).hasSize(3); assertThat(controllers).hasSize(2);
} }
public static class NotAvailablePreferenceController public static class NotAvailablePreferenceController