From 22f7dfd23490a3de2f21ff96949ba47003aac8f8 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Tue, 20 Jan 2009 14:03:58 -0800 Subject: auto import from //branches/cupcake/...@127101 --- .../android/widget/AutoCompleteTextViewPopup.java | 31 +++++ tests/GadgetHost/Android.mk | 11 ++ tests/GadgetHost/AndroidManifest.xml | 22 ++++ tests/GadgetHost/res/layout/gadget_host.xml | 50 ++++++++ tests/GadgetHost/res/layout/test_gadget.xml | 22 ++++ tests/GadgetHost/res/values/strings.xml | 22 ++++ .../android/gadgethost/GadgetContainerView.java | 32 +++++ .../com/android/gadgethost/GadgetHostActivity.java | 133 +++++++++++++++++++++ .../com/android/gadgethost/GadgetPickActivity.java | 70 +++++++++++ .../com/android/gadgethost/TestGadgetProvider.java | 32 +++++ 10 files changed, 425 insertions(+) create mode 100644 tests/GadgetHost/Android.mk create mode 100644 tests/GadgetHost/AndroidManifest.xml create mode 100644 tests/GadgetHost/res/layout/gadget_host.xml create mode 100644 tests/GadgetHost/res/layout/test_gadget.xml create mode 100644 tests/GadgetHost/res/values/strings.xml create mode 100644 tests/GadgetHost/src/com/android/gadgethost/GadgetContainerView.java create mode 100644 tests/GadgetHost/src/com/android/gadgethost/GadgetHostActivity.java create mode 100644 tests/GadgetHost/src/com/android/gadgethost/GadgetPickActivity.java create mode 100644 tests/GadgetHost/src/com/android/gadgethost/TestGadgetProvider.java (limited to 'tests') diff --git a/tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java b/tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java index 7a4c78f..663b7a4 100644 --- a/tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java +++ b/tests/FrameworkTest/tests/src/android/widget/AutoCompleteTextViewPopup.java @@ -116,4 +116,35 @@ public class AutoCompleteTextViewPopup ListView.INVALID_POSITION, textView.getListSelection()); } + /** Make sure we handle an empty adapter properly */ + @MediumTest + public void testPopupNavigateNoAdapter() throws Throwable { + AutoCompleteTextViewSimple theActivity = getActivity(); + final AutoCompleteTextView textView = theActivity.getTextView(); + final Instrumentation instrumentation = getInstrumentation(); + + // focus and type + textView.requestFocus(); + instrumentation.waitForIdleSync(); + sendKeys("A"); + + // No initial selection + assertEquals("getListSelection(-1)", + ListView.INVALID_POSITION, textView.getListSelection()); + + // check for selection position as expected + sendKeys("DPAD_DOWN"); + assertEquals("getListSelection(0)", 0, textView.getListSelection()); + + // Now get rid of the adapter + runTestOnUiThread(new Runnable() { + public void run() { + textView.setAdapter((ArrayAdapter) null); + } + }); + instrumentation.waitForIdleSync(); + + // now try moving "down" - nothing should happen since there's no longer an adapter + sendKeys("DPAD_DOWN"); + } } diff --git a/tests/GadgetHost/Android.mk b/tests/GadgetHost/Android.mk new file mode 100644 index 0000000..1d88db8 --- /dev/null +++ b/tests/GadgetHost/Android.mk @@ -0,0 +1,11 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE_TAGS := user + +LOCAL_SRC_FILES := $(call all-subdir-java-files) + +LOCAL_PACKAGE_NAME := GadgetHost +LOCAL_CERTIFICATE := platform + +include $(BUILD_PACKAGE) diff --git a/tests/GadgetHost/AndroidManifest.xml b/tests/GadgetHost/AndroidManifest.xml new file mode 100644 index 0000000..8da4485 --- /dev/null +++ b/tests/GadgetHost/AndroidManifest.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/GadgetHost/res/layout/gadget_host.xml b/tests/GadgetHost/res/layout/gadget_host.xml new file mode 100644 index 0000000..824cc44 --- /dev/null +++ b/tests/GadgetHost/res/layout/gadget_host.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + +