From 35f743713dfeb4e9138fee0f7bb6a7ee1da53521 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Wed, 12 Aug 2015 20:14:08 -0700 Subject: [PATCH] Move IME related unit tests under core/tests/coretests/. This CL moves existing (non-CTS) unit tests used for input method under core/tests/coretests/ to reduce the maintenance cost. Although some package names and import lines are updated to be consistent with new file locations, test cases are are kept to be the same. Change-Id: I4efce90b232458212ac48292dc01b812a9e851e5 --- .../inputmethod}/CursorAnchorInfoTest.java | 4 +-- .../InputMethodSubtypeArrayTest.java | 5 ++-- .../inputmethod}/InputMethodSubtypeTest.java | 4 +-- .../inputmethod}/SparseRectFArrayTest.java | 4 +-- ...tMethodSubtypeSwitchingControllerTest.java | 2 +- .../inputmethod/InputMethodUtilsTest.java} | 7 ++--- core/tests/inputmethodtests/Android.mk | 18 ----------- .../inputmethodtests/AndroidManifest.xml | 30 ------------------- .../run_core_inputmethod_test.sh | 24 --------------- 9 files changed, 12 insertions(+), 86 deletions(-) rename core/tests/{inputmethodtests/src/android/os => coretests/src/android/view/inputmethod}/CursorAnchorInfoTest.java (99%) rename core/tests/{inputmethodtests/src/android/os => coretests/src/android/view/inputmethod}/InputMethodSubtypeArrayTest.java (95%) rename core/tests/{inputmethodtests/src/android/os => coretests/src/android/view/inputmethod}/InputMethodSubtypeTest.java (98%) rename core/tests/{inputmethodtests/src/android/os => coretests/src/android/view/inputmethod}/SparseRectFArrayTest.java (99%) rename core/tests/{inputmethodtests/src/android/os => coretests/src/com/android/internal/inputmethod}/InputMethodSubtypeSwitchingControllerTest.java (99%) rename core/tests/{inputmethodtests/src/android/os/InputMethodTest.java => coretests/src/com/android/internal/inputmethod/InputMethodUtilsTest.java} (99%) delete mode 100644 core/tests/inputmethodtests/Android.mk delete mode 100644 core/tests/inputmethodtests/AndroidManifest.xml delete mode 100755 core/tests/inputmethodtests/run_core_inputmethod_test.sh diff --git a/core/tests/inputmethodtests/src/android/os/CursorAnchorInfoTest.java b/core/tests/coretests/src/android/view/inputmethod/CursorAnchorInfoTest.java similarity index 99% rename from core/tests/inputmethodtests/src/android/os/CursorAnchorInfoTest.java rename to core/tests/coretests/src/android/view/inputmethod/CursorAnchorInfoTest.java index d4244baf6b443..e0664d940f4e4 100644 --- a/core/tests/inputmethodtests/src/android/os/CursorAnchorInfoTest.java +++ b/core/tests/coretests/src/android/view/inputmethod/CursorAnchorInfoTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package android.os; +package android.view.inputmethod; import android.graphics.Matrix; import android.graphics.RectF; +import android.os.Parcel; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.SmallTest; import android.text.TextUtils; -import android.view.inputmethod.CursorAnchorInfo; import android.view.inputmethod.CursorAnchorInfo.Builder; import java.util.Objects; diff --git a/core/tests/inputmethodtests/src/android/os/InputMethodSubtypeArrayTest.java b/core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeArrayTest.java similarity index 95% rename from core/tests/inputmethodtests/src/android/os/InputMethodSubtypeArrayTest.java rename to core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeArrayTest.java index 1e0a9190558e7..a339f61fbe4e1 100644 --- a/core/tests/inputmethodtests/src/android/os/InputMethodSubtypeArrayTest.java +++ b/core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeArrayTest.java @@ -14,12 +14,11 @@ * limitations under the License. */ -package android.os; +package android.view.inputmethod; +import android.os.Parcel; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.SmallTest; -import android.view.inputmethod.InputMethodSubtype; -import android.view.inputmethod.InputMethodSubtypeArray; import android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder; import java.util.ArrayList; diff --git a/core/tests/inputmethodtests/src/android/os/InputMethodSubtypeTest.java b/core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeTest.java similarity index 98% rename from core/tests/inputmethodtests/src/android/os/InputMethodSubtypeTest.java rename to core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeTest.java index 8feac9be2180d..0adac4cbe879b 100644 --- a/core/tests/inputmethodtests/src/android/os/InputMethodSubtypeTest.java +++ b/core/tests/coretests/src/android/view/inputmethod/InputMethodSubtypeTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package android.os; +package android.view.inputmethod; +import android.os.Parcel; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.SmallTest; -import android.view.inputmethod.InputMethodSubtype; import android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder; import java.util.Objects; diff --git a/core/tests/inputmethodtests/src/android/os/SparseRectFArrayTest.java b/core/tests/coretests/src/android/view/inputmethod/SparseRectFArrayTest.java similarity index 99% rename from core/tests/inputmethodtests/src/android/os/SparseRectFArrayTest.java rename to core/tests/coretests/src/android/view/inputmethod/SparseRectFArrayTest.java index 47b0d2a26cdfa..f9fa017281b66 100644 --- a/core/tests/inputmethodtests/src/android/os/SparseRectFArrayTest.java +++ b/core/tests/coretests/src/android/view/inputmethod/SparseRectFArrayTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package android.os; +package android.view.inputmethod; import android.graphics.RectF; +import android.os.Parcel; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.SmallTest; -import android.view.inputmethod.SparseRectFArray; import android.view.inputmethod.SparseRectFArray.SparseRectFArrayBuilder; import java.util.Objects; diff --git a/core/tests/inputmethodtests/src/android/os/InputMethodSubtypeSwitchingControllerTest.java b/core/tests/coretests/src/com/android/internal/inputmethod/InputMethodSubtypeSwitchingControllerTest.java similarity index 99% rename from core/tests/inputmethodtests/src/android/os/InputMethodSubtypeSwitchingControllerTest.java rename to core/tests/coretests/src/com/android/internal/inputmethod/InputMethodSubtypeSwitchingControllerTest.java index 3a598f266681f..ec5220f243b1a 100644 --- a/core/tests/inputmethodtests/src/android/os/InputMethodSubtypeSwitchingControllerTest.java +++ b/core/tests/coretests/src/com/android/internal/inputmethod/InputMethodSubtypeSwitchingControllerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.os; +package com.android.internal.inputmethod; import android.content.pm.ApplicationInfo; import android.content.pm.ResolveInfo; diff --git a/core/tests/inputmethodtests/src/android/os/InputMethodTest.java b/core/tests/coretests/src/com/android/internal/inputmethod/InputMethodUtilsTest.java similarity index 99% rename from core/tests/inputmethodtests/src/android/os/InputMethodTest.java rename to core/tests/coretests/src/com/android/internal/inputmethod/InputMethodUtilsTest.java index 31a4703c26626..67f87a3dfc84f 100644 --- a/core/tests/inputmethodtests/src/android/os/InputMethodTest.java +++ b/core/tests/coretests/src/com/android/internal/inputmethod/InputMethodUtilsTest.java @@ -14,26 +14,25 @@ * limitations under the License. */ -package android.os; +package com.android.internal.inputmethod; import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; +import android.os.Parcel; import android.test.InstrumentationTestCase; import android.test.suitebuilder.annotation.SmallTest; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodSubtype; import android.view.inputmethod.InputMethodSubtype.InputMethodSubtypeBuilder; -import com.android.internal.inputmethod.InputMethodUtils; - import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Objects; -public class InputMethodTest extends InstrumentationTestCase { +public class InputMethodUtilsTest extends InstrumentationTestCase { private static final boolean IS_AUX = true; private static final boolean IS_DEFAULT = true; private static final boolean IS_OVERRIDES_IMPLICITLY_ENABLED_SUBTYPE = true; diff --git a/core/tests/inputmethodtests/Android.mk b/core/tests/inputmethodtests/Android.mk deleted file mode 100644 index 4631e65302146..0000000000000 --- a/core/tests/inputmethodtests/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -# We only want this apk build for tests. -LOCAL_MODULE_TAGS := tests - -# Include all test java files. -LOCAL_SRC_FILES := \ - $(call all-java-files-under, src) - -LOCAL_DX_FLAGS := --core-library -LOCAL_STATIC_JAVA_LIBRARIES := core-tests android-common frameworks-core-util-lib -LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_PACKAGE_NAME := FrameworksCoreInputMethodTests - -LOCAL_CERTIFICATE := platform - -include $(BUILD_PACKAGE) diff --git a/core/tests/inputmethodtests/AndroidManifest.xml b/core/tests/inputmethodtests/AndroidManifest.xml deleted file mode 100644 index 7f0b1aa27b1c4..0000000000000 --- a/core/tests/inputmethodtests/AndroidManifest.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - diff --git a/core/tests/inputmethodtests/run_core_inputmethod_test.sh b/core/tests/inputmethodtests/run_core_inputmethod_test.sh deleted file mode 100755 index a11e49b2b3fbc..0000000000000 --- a/core/tests/inputmethodtests/run_core_inputmethod_test.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -while [[ $# -gt 0 ]]; do - case "$1" in - --rebuild ) echo Rebuild && rebuild=true;; - * ) com_opts+=($1);; - esac - shift -done - -if [[ -z $ANDROID_PRODUCT_OUT && $rebuilld == true ]]; then - echo You must lunch before running this test. - exit 0 -fi - -if [[ $rebuild == true ]]; then - make -j4 FrameworksCoreInputMethodTests - TESTAPP=${ANDROID_PRODUCT_OUT}/data/app/FrameworksCoreInputMethodTests/FrameworksCoreInputMethodTests.apk - COMMAND="adb install -r $TESTAPP" - echo $COMMAND - $COMMAND -fi - -adb shell am instrument -w -e class android.os.InputMethodTest,android.os.InputMethodSubtypeTest,android.os.InputMethodSubtypeArrayTest,android.os.InputMethodSubtypeSwitchingControllerTest,android.os.CursorAnchorInfoTest,android.os.SparseRectFArrayTest com.android.frameworks.coretests.inputmethod/android.test.InstrumentationTestRunner