diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-15 18:14:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-15 18:14:12 -0700 |
| commit | 7ee5a4b15aabbee51b9715e1593a88afec7f00b8 (patch) | |
| tree | f1501b546fd8291e2d622f60ff6037effe9b7e65 /tests/AndroidTests | |
| parent | c538c79ea4b56f211233b39b7957fd8fe3d37990 (diff) | |
| parent | 5a76ae46854ac449f94e1f75ef13ce035e4c65cd (diff) | |
| download | frameworks_base-7ee5a4b15aabbee51b9715e1593a88afec7f00b8.zip frameworks_base-7ee5a4b15aabbee51b9715e1593a88afec7f00b8.tar.gz frameworks_base-7ee5a4b15aabbee51b9715e1593a88afec7f00b8.tar.bz2 | |
am 5a76ae46: Merge change 7406 into donut
Merge commit '5a76ae46854ac449f94e1f75ef13ce035e4c65cd'
* commit '5a76ae46854ac449f94e1f75ef13ce035e4c65cd':
Update Searchables test with new GlobalSearch name
Diffstat (limited to 'tests/AndroidTests')
| -rw-r--r-- | tests/AndroidTests/src/com/android/unit_tests/SearchablesTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/AndroidTests/src/com/android/unit_tests/SearchablesTest.java b/tests/AndroidTests/src/com/android/unit_tests/SearchablesTest.java index ecc8dfe..4e5f7a9 100644 --- a/tests/AndroidTests/src/com/android/unit_tests/SearchablesTest.java +++ b/tests/AndroidTests/src/com/android/unit_tests/SearchablesTest.java @@ -93,8 +93,8 @@ public class SearchablesTest extends AndroidTestCase { Context appContext = si.getActivityContext(mContext); assertNotNull(appContext); MoreAsserts.assertNotEqual(appContext, mContext); - assertEquals("Android Search", appContext.getString(si.getHintId())); - assertEquals("Google", appContext.getString(si.getLabelId())); + assertEquals("Quick Search Box", appContext.getString(si.getHintId())); + assertEquals("Quick Search Box", appContext.getString(si.getLabelId())); } /** |