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

Commit bc0df8d6 authored by Satish Sampath's avatar Satish Sampath Committed by The Android Open Source Project
Browse files

am 174ad503: In SearchablesTest, use the always available globalsearch. 

Merge commit '174ad503'

* commit '174ad503':
  In SearchablesTest, use the always available globalsearch.
parents af08ee3e 174ad503

tests/AndroidTests/src/com/android/unit_tests/SearchablesTest.java

+6 −6
Original line number Diff line number Diff line
@@ -72,19 +72,19 @@ public class SearchablesTest extends AndroidTestCase { 
     * TODO:  The metadata source needs to be mocked out because adding

     * searchability metadata via this test is causing it to leak into the

     * real system.  So for now I'm just going to test for existence of the

     * GoogleSearch app (which is searchable).

     * GlobalSearch app (which is searchable).

     */

    public void testSearchableGoogleSearch() {

    public void testSearchableGlobalSearch() {

        // test basic array & hashmap

        Searchables searchables = new Searchables(mContext);

        searchables.buildSearchableList();



        // test linkage from another activity

        // TODO inject this via mocking into the package manager.

        // TODO for now, just check for searchable GoogleSearch app (this isn't really a unit test)

        // TODO for now, just check for searchable GlobalSearch app (this isn't really a unit test)

        ComponentName thisActivity = new ComponentName(

                "com.android.googlesearch", 

                "com.android.googlesearch.GoogleSearch");

                "com.android.globalsearch",

                "com.android.globalsearch.GlobalSearch");



        SearchableInfo si = searchables.getSearchableInfo(thisActivity);

        assertNotNull(si);
@@ -93,7 +93,7 @@ public class SearchablesTest extends AndroidTestCase { 
        Context appContext = si.getActivityContext(mContext);

        assertNotNull(appContext);

        MoreAsserts.assertNotEqual(appContext, mContext);

        assertEquals("Google Search", appContext.getString(si.getHintId()));

        assertEquals("Android Search", appContext.getString(si.getHintId()));

        assertEquals("Google", appContext.getString(si.getLabelId()));

    }