Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f418b7a9 authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge changes I868d1912,Id483ca41 

* changes:
  Fix search test using location_settings
  Revert "Stop search tests using location_settings"
parents 8bc72db8 94a64d61

tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



@RunWith(RobolectricTestRunner.class)

public class SearchIndexableResourcesTest {
@@ -89,6 +90,7 @@ public class SearchIndexableResourcesTest { 
    }



    @Test

    @Config(qualifiers = "mcc999")

    public void testNonIndexableKeys_GetsKeyFromProvider() {

        mSearchProvider.getSearchIndexableResources().getProviderValues().clear();

        mSearchProvider.getSearchIndexableResources().addIndex(

tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java

+7 −1
Original line number Diff line number Diff line
@@ -29,8 +29,14 @@ public class FakeIndexProvider implements Indexable { 


    public static final String KEY = "TestKey";



    /**

     * The fake SearchIndexProvider. Note that the use of location_settings below implies that tests

     * using this should be using the res/xml-mcc999/location_settings.xml or

     * res/xml-mcc998/location_settings.xml. Annotate tests with

     * {@code @Config(qualifiers = "mcc999")}.

     */

    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

            new BaseSearchIndexProvider(R.xml.sound_settings) {

            new BaseSearchIndexProvider(R.xml.location_settings) {



                @Override

                public List<String> getNonIndexableKeys(Context context) {