From 22e31e5b609136d5bf7d77b1dccd6b042b83ebdf Mon Sep 17 00:00:00 2001 From: Neal Nguyen Date: Thu, 7 Jan 2010 10:14:05 -0800 Subject: [PATCH] Moving framework core tests closer to their source files. Phase 2 of test case cleanup; distributing CoreTests files closer to their respective sources under frameworks. --- core/tests/coretests/Android.mk | 14 + core/tests/coretests/AndroidManifest.xml | 56 ++++ .../src/android/bluetooth}/AtParserTest.java | 2 +- .../android/content/ObserverNodeTest.java | 0 .../content/SyncStorageEngineTest.java | 0 .../android/database/MatrixCursorTest.java | 0 .../sqlite}/AbstractJDBCDriverTest.java | 0 .../sqlite}/SQLiteJDBCDriverTest.java | 0 .../src/android/pim}/RecurrenceSetTest.java | 2 +- .../android/util/DayOfMonthCursorTest.java | 0 .../src}/android/util/FloatMathTest.java | 0 .../android/util/MonthDisplayHelperTest.java | 0 .../src}/android/util/StateSetTest.java | 0 .../src}/android/view/FocusFinderTest.java | 0 .../android/view/ViewGroupAttributesTest.java | 0 .../webkit/UrlInterceptRegistryTest.java | 0 .../android/internal/util/PredicatesTest.java | 0 location/tests/locationtests/Android.mk | 14 + .../tests/locationtests/AndroidManifest.xml | 35 +++ .../src}/android/location/LocationTest.java | 0 .../TelephonyUnitTestRunner.java | 48 --- .../Android.mk | 2 +- .../AndroidManifest.xml | 8 +- .../telephony/PhoneNumberUtilsTest.java | 0 .../telephony/PhoneNumberWatcherTest.java | 0 .../telephony/ATResponseParserTest.java | 0 .../internal/telephony/AdnRecordTest.java | 0 .../internal/telephony/GsmAlphabetTest.java | 0 .../internal/telephony/SMSDispatcherTest.java | 0 .../internal/telephony/SimPhoneBookTest.java | 0 .../internal/telephony/SimSmsTest.java | 0 .../internal/telephony/SimUtilsTest.java | 0 .../telephony/TelephonyUtilsTest.java | 0 .../internal/telephony/TestPhoneNotifier.java | 0 .../internal/telephony/gsm/GSMPhoneTest.java | 0 .../telephony/gsm/GSMTestHandler.java | 0 .../unit/CallerInfoUnitTest.java | 0 .../unit/PhoneNumberUtilsUnitTest.java | 0 tests/CoreTests/android/core/CoreTests.java | 65 ---- tests/CoreTests/android/core/JavaTests.java | 86 ------ .../LocationManagerProximityTest.java | 282 ------------------ .../internal/telephony/TelephonyTests.java | 54 ---- 42 files changed, 126 insertions(+), 542 deletions(-) create mode 100644 core/tests/coretests/Android.mk create mode 100644 core/tests/coretests/AndroidManifest.xml rename {tests/CoreTests/android/core => core/tests/coretests/src/android/bluetooth}/AtParserTest.java (99%) rename {tests/CoreTests => core/tests/coretests/src}/android/content/ObserverNodeTest.java (100%) rename {tests/CoreTests => core/tests/coretests/src}/android/content/SyncStorageEngineTest.java (100%) rename {tests/CoreTests => core/tests/coretests/src}/android/database/MatrixCursorTest.java (100%) rename {tests/CoreTests/android/core => core/tests/coretests/src/android/database/sqlite}/AbstractJDBCDriverTest.java (100%) rename {tests/CoreTests/android/core => core/tests/coretests/src/android/database/sqlite}/SQLiteJDBCDriverTest.java (100%) rename {tests/CoreTests/android/core => core/tests/coretests/src/android/pim}/RecurrenceSetTest.java (99%) rename {tests/CoreTests => core/tests/coretests/src}/android/util/DayOfMonthCursorTest.java (100%) rename {tests/CoreTests => core/tests/coretests/src}/android/util/FloatMathTest.java (100%) rename {tests/CoreTests => core/tests/coretests/src}/android/util/MonthDisplayHelperTest.java (100%) rename {tests/CoreTests => core/tests/coretests/src}/android/util/StateSetTest.java (100%) rename {tests/CoreTests => core/tests/coretests/src}/android/view/FocusFinderTest.java (100%) rename {tests/CoreTests => core/tests/coretests/src}/android/view/ViewGroupAttributesTest.java (100%) rename {tests/CoreTests => core/tests/coretests/src}/android/webkit/UrlInterceptRegistryTest.java (100%) rename {tests/CoreTests => core/tests/coretests/src}/com/android/internal/util/PredicatesTest.java (100%) create mode 100644 location/tests/locationtests/Android.mk create mode 100644 location/tests/locationtests/AndroidManifest.xml rename {tests/CoreTests => location/tests/locationtests/src}/android/location/LocationTest.java (100%) delete mode 100644 telephony/tests/TelephonyTest/src/com/android/telephonytest/TelephonyUnitTestRunner.java rename telephony/tests/{TelephonyTest => telephonytests}/Android.mk (80%) rename telephony/tests/{TelephonyTest => telephonytests}/AndroidManifest.xml (83%) rename {tests/CoreTests/com/android/internal => telephony/tests/telephonytests/src/android}/telephony/PhoneNumberUtilsTest.java (100%) rename {tests/CoreTests/com/android/internal => telephony/tests/telephonytests/src/android}/telephony/PhoneNumberWatcherTest.java (100%) rename {tests/CoreTests => telephony/tests/telephonytests/src}/com/android/internal/telephony/ATResponseParserTest.java (100%) rename {tests/CoreTests => telephony/tests/telephonytests/src}/com/android/internal/telephony/AdnRecordTest.java (100%) rename {tests/CoreTests => telephony/tests/telephonytests/src}/com/android/internal/telephony/GsmAlphabetTest.java (100%) rename {tests/CoreTests => telephony/tests/telephonytests/src}/com/android/internal/telephony/SMSDispatcherTest.java (100%) rename {tests/CoreTests => telephony/tests/telephonytests/src}/com/android/internal/telephony/SimPhoneBookTest.java (100%) rename {tests/CoreTests => telephony/tests/telephonytests/src}/com/android/internal/telephony/SimSmsTest.java (100%) rename {tests/CoreTests => telephony/tests/telephonytests/src}/com/android/internal/telephony/SimUtilsTest.java (100%) rename {tests/CoreTests => telephony/tests/telephonytests/src}/com/android/internal/telephony/TelephonyUtilsTest.java (100%) rename {tests/CoreTests => telephony/tests/telephonytests/src}/com/android/internal/telephony/TestPhoneNotifier.java (100%) rename {tests/CoreTests => telephony/tests/telephonytests/src}/com/android/internal/telephony/gsm/GSMPhoneTest.java (100%) rename {tests/CoreTests => telephony/tests/telephonytests/src}/com/android/internal/telephony/gsm/GSMTestHandler.java (100%) rename telephony/tests/{TelephonyTest => telephonytests}/src/com/android/telephonytest/unit/CallerInfoUnitTest.java (100%) rename telephony/tests/{TelephonyTest => telephonytests}/src/com/android/telephonytest/unit/PhoneNumberUtilsUnitTest.java (100%) delete mode 100644 tests/CoreTests/android/core/CoreTests.java delete mode 100644 tests/CoreTests/android/core/JavaTests.java delete mode 100644 tests/CoreTests/android/location/LocationManagerProximityTest.java delete mode 100644 tests/CoreTests/com/android/internal/telephony/TelephonyTests.java diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk new file mode 100644 index 0000000000000..77c176f622cfb --- /dev/null +++ b/core/tests/coretests/Android.mk @@ -0,0 +1,14 @@ +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_JAVA_LIBRARIES := android.test.runner +LOCAL_PACKAGE_NAME := FrameworksCoreTests + +include $(BUILD_PACKAGE) + diff --git a/core/tests/coretests/AndroidManifest.xml b/core/tests/coretests/AndroidManifest.xml new file mode 100644 index 0000000000000..674bda795275b --- /dev/null +++ b/core/tests/coretests/AndroidManifest.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/CoreTests/android/core/AtParserTest.java b/core/tests/coretests/src/android/bluetooth/AtParserTest.java similarity index 99% rename from tests/CoreTests/android/core/AtParserTest.java rename to core/tests/coretests/src/android/bluetooth/AtParserTest.java index 09cb6e97d24ef..c5aa52b07059a 100644 --- a/tests/CoreTests/android/core/AtParserTest.java +++ b/core/tests/coretests/src/android/bluetooth/AtParserTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.core; +package android.bluetooth; import android.bluetooth.AtCommandHandler; import android.bluetooth.AtCommandResult; diff --git a/tests/CoreTests/android/content/ObserverNodeTest.java b/core/tests/coretests/src/android/content/ObserverNodeTest.java similarity index 100% rename from tests/CoreTests/android/content/ObserverNodeTest.java rename to core/tests/coretests/src/android/content/ObserverNodeTest.java diff --git a/tests/CoreTests/android/content/SyncStorageEngineTest.java b/core/tests/coretests/src/android/content/SyncStorageEngineTest.java similarity index 100% rename from tests/CoreTests/android/content/SyncStorageEngineTest.java rename to core/tests/coretests/src/android/content/SyncStorageEngineTest.java diff --git a/tests/CoreTests/android/database/MatrixCursorTest.java b/core/tests/coretests/src/android/database/MatrixCursorTest.java similarity index 100% rename from tests/CoreTests/android/database/MatrixCursorTest.java rename to core/tests/coretests/src/android/database/MatrixCursorTest.java diff --git a/tests/CoreTests/android/core/AbstractJDBCDriverTest.java b/core/tests/coretests/src/android/database/sqlite/AbstractJDBCDriverTest.java similarity index 100% rename from tests/CoreTests/android/core/AbstractJDBCDriverTest.java rename to core/tests/coretests/src/android/database/sqlite/AbstractJDBCDriverTest.java diff --git a/tests/CoreTests/android/core/SQLiteJDBCDriverTest.java b/core/tests/coretests/src/android/database/sqlite/SQLiteJDBCDriverTest.java similarity index 100% rename from tests/CoreTests/android/core/SQLiteJDBCDriverTest.java rename to core/tests/coretests/src/android/database/sqlite/SQLiteJDBCDriverTest.java diff --git a/tests/CoreTests/android/core/RecurrenceSetTest.java b/core/tests/coretests/src/android/pim/RecurrenceSetTest.java similarity index 99% rename from tests/CoreTests/android/core/RecurrenceSetTest.java rename to core/tests/coretests/src/android/pim/RecurrenceSetTest.java index cee324c5235d9..64cd6c426dce3 100644 --- a/tests/CoreTests/android/core/RecurrenceSetTest.java +++ b/core/tests/coretests/src/android/pim/RecurrenceSetTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.core; +package android.pim; import android.content.ContentValues; import android.pim.ICalendar; diff --git a/tests/CoreTests/android/util/DayOfMonthCursorTest.java b/core/tests/coretests/src/android/util/DayOfMonthCursorTest.java similarity index 100% rename from tests/CoreTests/android/util/DayOfMonthCursorTest.java rename to core/tests/coretests/src/android/util/DayOfMonthCursorTest.java diff --git a/tests/CoreTests/android/util/FloatMathTest.java b/core/tests/coretests/src/android/util/FloatMathTest.java similarity index 100% rename from tests/CoreTests/android/util/FloatMathTest.java rename to core/tests/coretests/src/android/util/FloatMathTest.java diff --git a/tests/CoreTests/android/util/MonthDisplayHelperTest.java b/core/tests/coretests/src/android/util/MonthDisplayHelperTest.java similarity index 100% rename from tests/CoreTests/android/util/MonthDisplayHelperTest.java rename to core/tests/coretests/src/android/util/MonthDisplayHelperTest.java diff --git a/tests/CoreTests/android/util/StateSetTest.java b/core/tests/coretests/src/android/util/StateSetTest.java similarity index 100% rename from tests/CoreTests/android/util/StateSetTest.java rename to core/tests/coretests/src/android/util/StateSetTest.java diff --git a/tests/CoreTests/android/view/FocusFinderTest.java b/core/tests/coretests/src/android/view/FocusFinderTest.java similarity index 100% rename from tests/CoreTests/android/view/FocusFinderTest.java rename to core/tests/coretests/src/android/view/FocusFinderTest.java diff --git a/tests/CoreTests/android/view/ViewGroupAttributesTest.java b/core/tests/coretests/src/android/view/ViewGroupAttributesTest.java similarity index 100% rename from tests/CoreTests/android/view/ViewGroupAttributesTest.java rename to core/tests/coretests/src/android/view/ViewGroupAttributesTest.java diff --git a/tests/CoreTests/android/webkit/UrlInterceptRegistryTest.java b/core/tests/coretests/src/android/webkit/UrlInterceptRegistryTest.java similarity index 100% rename from tests/CoreTests/android/webkit/UrlInterceptRegistryTest.java rename to core/tests/coretests/src/android/webkit/UrlInterceptRegistryTest.java diff --git a/tests/CoreTests/com/android/internal/util/PredicatesTest.java b/core/tests/coretests/src/com/android/internal/util/PredicatesTest.java similarity index 100% rename from tests/CoreTests/com/android/internal/util/PredicatesTest.java rename to core/tests/coretests/src/com/android/internal/util/PredicatesTest.java diff --git a/location/tests/locationtests/Android.mk b/location/tests/locationtests/Android.mk new file mode 100644 index 0000000000000..902cd96067e96 --- /dev/null +++ b/location/tests/locationtests/Android.mk @@ -0,0 +1,14 @@ +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_JAVA_LIBRARIES := android.test.runner +LOCAL_PACKAGE_NAME := FrameworksLocationTests + +include $(BUILD_PACKAGE) + diff --git a/location/tests/locationtests/AndroidManifest.xml b/location/tests/locationtests/AndroidManifest.xml new file mode 100644 index 0000000000000..1d9df0f93a055 --- /dev/null +++ b/location/tests/locationtests/AndroidManifest.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + diff --git a/tests/CoreTests/android/location/LocationTest.java b/location/tests/locationtests/src/android/location/LocationTest.java similarity index 100% rename from tests/CoreTests/android/location/LocationTest.java rename to location/tests/locationtests/src/android/location/LocationTest.java diff --git a/telephony/tests/TelephonyTest/src/com/android/telephonytest/TelephonyUnitTestRunner.java b/telephony/tests/TelephonyTest/src/com/android/telephonytest/TelephonyUnitTestRunner.java deleted file mode 100644 index 9e1af31343430..0000000000000 --- a/telephony/tests/TelephonyTest/src/com/android/telephonytest/TelephonyUnitTestRunner.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2009 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.telephonytest; - -import junit.framework.TestSuite; - -import android.test.InstrumentationTestRunner; -import android.test.InstrumentationTestSuite; - -/** - * Instrumentation Test Runner for all Telephony unit tests. - * - * Running all tests: - * - * runtest telephony-unit - * or - * adb shell am instrument -w com.android.telephonytest/.TelephonyUnitTestRunner - */ - -public class TelephonyUnitTestRunner extends InstrumentationTestRunner { - - @Override - public TestSuite getAllTests() { - TestSuite suite = new InstrumentationTestSuite(this); - suite.addTestSuite(com.android.telephonytest.unit.CallerInfoUnitTest.class); - suite.addTestSuite(com.android.telephonytest.unit.PhoneNumberUtilsUnitTest.class); - return suite; - } - - @Override - public ClassLoader getLoader() { - return TelephonyUnitTestRunner.class.getClassLoader(); - } -} diff --git a/telephony/tests/TelephonyTest/Android.mk b/telephony/tests/telephonytests/Android.mk similarity index 80% rename from telephony/tests/TelephonyTest/Android.mk rename to telephony/tests/telephonytests/Android.mk index 1ef8448d390cc..45e265a01e501 100644 --- a/telephony/tests/TelephonyTest/Android.mk +++ b/telephony/tests/telephonytests/Android.mk @@ -7,6 +7,6 @@ LOCAL_SRC_FILES := $(call all-subdir-java-files) LOCAL_JAVA_LIBRARIES := android.test.runner -LOCAL_PACKAGE_NAME := telephonytest +LOCAL_PACKAGE_NAME := FrameworksTelephonyTests include $(BUILD_PACKAGE) diff --git a/telephony/tests/TelephonyTest/AndroidManifest.xml b/telephony/tests/telephonytests/AndroidManifest.xml similarity index 83% rename from telephony/tests/TelephonyTest/AndroidManifest.xml rename to telephony/tests/telephonytests/AndroidManifest.xml index b2a481bee5d3f..70aeebc59d15c 100644 --- a/telephony/tests/TelephonyTest/AndroidManifest.xml +++ b/telephony/tests/telephonytests/AndroidManifest.xml @@ -16,7 +16,7 @@ --> + package="com.android.frameworks.telephonytests"> @@ -28,9 +28,9 @@ - + diff --git a/tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java b/telephony/tests/telephonytests/src/android/telephony/PhoneNumberUtilsTest.java similarity index 100% rename from tests/CoreTests/com/android/internal/telephony/PhoneNumberUtilsTest.java rename to telephony/tests/telephonytests/src/android/telephony/PhoneNumberUtilsTest.java diff --git a/tests/CoreTests/com/android/internal/telephony/PhoneNumberWatcherTest.java b/telephony/tests/telephonytests/src/android/telephony/PhoneNumberWatcherTest.java similarity index 100% rename from tests/CoreTests/com/android/internal/telephony/PhoneNumberWatcherTest.java rename to telephony/tests/telephonytests/src/android/telephony/PhoneNumberWatcherTest.java diff --git a/tests/CoreTests/com/android/internal/telephony/ATResponseParserTest.java b/telephony/tests/telephonytests/src/com/android/internal/telephony/ATResponseParserTest.java similarity index 100% rename from tests/CoreTests/com/android/internal/telephony/ATResponseParserTest.java rename to telephony/tests/telephonytests/src/com/android/internal/telephony/ATResponseParserTest.java diff --git a/tests/CoreTests/com/android/internal/telephony/AdnRecordTest.java b/telephony/tests/telephonytests/src/com/android/internal/telephony/AdnRecordTest.java similarity index 100% rename from tests/CoreTests/com/android/internal/telephony/AdnRecordTest.java rename to telephony/tests/telephonytests/src/com/android/internal/telephony/AdnRecordTest.java diff --git a/tests/CoreTests/com/android/internal/telephony/GsmAlphabetTest.java b/telephony/tests/telephonytests/src/com/android/internal/telephony/GsmAlphabetTest.java similarity index 100% rename from tests/CoreTests/com/android/internal/telephony/GsmAlphabetTest.java rename to telephony/tests/telephonytests/src/com/android/internal/telephony/GsmAlphabetTest.java diff --git a/tests/CoreTests/com/android/internal/telephony/SMSDispatcherTest.java b/telephony/tests/telephonytests/src/com/android/internal/telephony/SMSDispatcherTest.java similarity index 100% rename from tests/CoreTests/com/android/internal/telephony/SMSDispatcherTest.java rename to telephony/tests/telephonytests/src/com/android/internal/telephony/SMSDispatcherTest.java diff --git a/tests/CoreTests/com/android/internal/telephony/SimPhoneBookTest.java b/telephony/tests/telephonytests/src/com/android/internal/telephony/SimPhoneBookTest.java similarity index 100% rename from tests/CoreTests/com/android/internal/telephony/SimPhoneBookTest.java rename to telephony/tests/telephonytests/src/com/android/internal/telephony/SimPhoneBookTest.java diff --git a/tests/CoreTests/com/android/internal/telephony/SimSmsTest.java b/telephony/tests/telephonytests/src/com/android/internal/telephony/SimSmsTest.java similarity index 100% rename from tests/CoreTests/com/android/internal/telephony/SimSmsTest.java rename to telephony/tests/telephonytests/src/com/android/internal/telephony/SimSmsTest.java diff --git a/tests/CoreTests/com/android/internal/telephony/SimUtilsTest.java b/telephony/tests/telephonytests/src/com/android/internal/telephony/SimUtilsTest.java similarity index 100% rename from tests/CoreTests/com/android/internal/telephony/SimUtilsTest.java rename to telephony/tests/telephonytests/src/com/android/internal/telephony/SimUtilsTest.java diff --git a/tests/CoreTests/com/android/internal/telephony/TelephonyUtilsTest.java b/telephony/tests/telephonytests/src/com/android/internal/telephony/TelephonyUtilsTest.java similarity index 100% rename from tests/CoreTests/com/android/internal/telephony/TelephonyUtilsTest.java rename to telephony/tests/telephonytests/src/com/android/internal/telephony/TelephonyUtilsTest.java diff --git a/tests/CoreTests/com/android/internal/telephony/TestPhoneNotifier.java b/telephony/tests/telephonytests/src/com/android/internal/telephony/TestPhoneNotifier.java similarity index 100% rename from tests/CoreTests/com/android/internal/telephony/TestPhoneNotifier.java rename to telephony/tests/telephonytests/src/com/android/internal/telephony/TestPhoneNotifier.java diff --git a/tests/CoreTests/com/android/internal/telephony/gsm/GSMPhoneTest.java b/telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/GSMPhoneTest.java similarity index 100% rename from tests/CoreTests/com/android/internal/telephony/gsm/GSMPhoneTest.java rename to telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/GSMPhoneTest.java diff --git a/tests/CoreTests/com/android/internal/telephony/gsm/GSMTestHandler.java b/telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/GSMTestHandler.java similarity index 100% rename from tests/CoreTests/com/android/internal/telephony/gsm/GSMTestHandler.java rename to telephony/tests/telephonytests/src/com/android/internal/telephony/gsm/GSMTestHandler.java diff --git a/telephony/tests/TelephonyTest/src/com/android/telephonytest/unit/CallerInfoUnitTest.java b/telephony/tests/telephonytests/src/com/android/telephonytest/unit/CallerInfoUnitTest.java similarity index 100% rename from telephony/tests/TelephonyTest/src/com/android/telephonytest/unit/CallerInfoUnitTest.java rename to telephony/tests/telephonytests/src/com/android/telephonytest/unit/CallerInfoUnitTest.java diff --git a/telephony/tests/TelephonyTest/src/com/android/telephonytest/unit/PhoneNumberUtilsUnitTest.java b/telephony/tests/telephonytests/src/com/android/telephonytest/unit/PhoneNumberUtilsUnitTest.java similarity index 100% rename from telephony/tests/TelephonyTest/src/com/android/telephonytest/unit/PhoneNumberUtilsUnitTest.java rename to telephony/tests/telephonytests/src/com/android/telephonytest/unit/PhoneNumberUtilsUnitTest.java diff --git a/tests/CoreTests/android/core/CoreTests.java b/tests/CoreTests/android/core/CoreTests.java deleted file mode 100644 index 442fe0f943adc..0000000000000 --- a/tests/CoreTests/android/core/CoreTests.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.core; - -import com.android.internal.telephony.TelephonyTests; - -import junit.framework.TestSuite; - -import android.graphics.ColorStateListTest; -import android.location.LocationManagerProximityTest; -import android.location.LocationTest; -import android.test.AndroidTestRunnerTest; -import android.test.InstrumentationTestRunnerTest; -import android.util.*; -import android.view.FocusFinderTest; -import android.view.ViewGroupAttributesTest; -import android.webkit.*; - -public class CoreTests extends TestSuite { - - /** - * To run these tests: - * $ mmm java/tests && adb sync - * $ adb shell am instrument -w \ - * -e class android.core.CoreTests \ - * android.core/android.test.InstrumentationTestRunner - */ - public static TestSuite suite() { - TestSuite suite = new TestSuite(CoreTests.class.getName()); - - // Re-enable StateListDrawableTest when we are running in the - // framework-test directory which allows access to package private - // access for MockView - // suite.addTestSuite(StateListDrawableTest.class); - suite.addTestSuite(DayOfMonthCursorTest.class); - suite.addTestSuite(MonthDisplayHelperTest.class); - suite.addTestSuite(StateSetTest.class); - suite.addTestSuite(ColorStateListTest.class); - suite.addTestSuite(FocusFinderTest.class); - suite.addTestSuite(ViewGroupAttributesTest.class); - suite.addTest(TelephonyTests.suite()); - suite.addTestSuite(FloatMathTest.class); - suite.addTest(JavaTests.suite()); - suite.addTestSuite(LocationTest.class); - suite.addTestSuite(LocationManagerProximityTest.class); - suite.addTestSuite(AndroidTestRunnerTest.class); - suite.addTestSuite(InstrumentationTestRunnerTest.class); - - return suite; - } -} diff --git a/tests/CoreTests/android/core/JavaTests.java b/tests/CoreTests/android/core/JavaTests.java deleted file mode 100644 index bd8cbf0934a3f..0000000000000 --- a/tests/CoreTests/android/core/JavaTests.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package android.core; - -import junit.framework.TestSuite; - -public class JavaTests { - public static TestSuite suite() { - TestSuite suite = new TestSuite(JavaTests.class.getName()); - - //Disabling until bug http://b/issue?id=1200337 is resolved - //suite.addTestSuite(RequestAPITest.class); - suite.addTestSuite(MathTest.class); - suite.addTestSuite(StrictMathTest.class); - suite.addTestSuite(HashMapPerfTest.class); - suite.addTestSuite(TreeMapTest.class); - suite.addTestSuite(FloatDoubleTest.class); - suite.addTestSuite(Sha1Test.class); - suite.addTestSuite(NIOTest.class); - suite.addTestSuite(ReflectArrayTest.class); - //Commenting out until we find a better way to exclude from continuous testing. - //suite.addTestSuite(URLTest.class); - suite.addTestSuite(URITest.class); - suite.addTestSuite(RegexTest.class); - suite.addTestSuite(HashMapTest.class); - suite.addTestSuite(ArrayListTest.class); - suite.addTestSuite(BooleanTest.class); - suite.addTestSuite(StringTest.class); - suite.addTestSuite(BufferedReaderTest.class); - suite.addTestSuite(CharArrayReaderTest.class); - suite.addTestSuite(PushbackReaderTest.class); - suite.addTestSuite(StringReaderTest.class); - suite.addTestSuite(StreamTokenizerTest.class); - suite.addTestSuite(ByteArrayInputStreamTest.class); - suite.addTestSuite(DataInputStreamTest.class); - suite.addTestSuite(BufferedInputStreamTest.class); - suite.addTestSuite(PushbackInputStreamTest.class); - suite.addTestSuite(ByteArrayOutputStreamTest.class); - suite.addTestSuite(DataOutputStreamTest.class); - suite.addTestSuite(BufferedOutputStreamTest.class); - suite.addTestSuite(CharArrayWriterTest.class); - suite.addTestSuite(StringWriterTest.class); - suite.addTestSuite(PrintWriterTest.class); - suite.addTestSuite(BufferedWriterTest.class); - suite.addTestSuite(ClassTest.class); - //To be unccommented when Bug #799327 is fixed. - //suite.addTestSuite(ClassLoaderTest.class); - suite.addTestSuite(LineNumberReaderTest.class); - suite.addTestSuite(InputStreamReaderTest.class); - suite.addTestSuite(OutputStreamWriterTest.class); - suite.addTestSuite(EnumTest.class); - suite.addTestSuite(ParseIntTest.class); - suite.addTestSuite(PipedStreamTest.class); - suite.addTestSuite(LocaleTest.class); - //Commenting out until we find a better way to exclude from continuous testing. - //suite.addTestSuite(InetAddrTest.class); - suite.addTestSuite(SocketTest.class); - suite.addTestSuite(ChecksumTest.class); - suite.addTestSuite(DeflateTest.class); - suite.addTestSuite(ZipStreamTest.class); - suite.addTestSuite(GZIPStreamTest.class); - suite.addTestSuite(ZipFileTest.class); - suite.addTestSuite(FileTest.class); - suite.addTestSuite(SQLiteJDBCDriverTest.class); - suite.addTestSuite(AtParserTest.class); - suite.addTestSuite(DatagramTest.class); - suite.addTestSuite(CryptoTest.class); - suite.addTestSuite(MiscRegressionTest.class); - - return suite; - } -} diff --git a/tests/CoreTests/android/location/LocationManagerProximityTest.java b/tests/CoreTests/android/location/LocationManagerProximityTest.java deleted file mode 100644 index e82d8780ddefb..0000000000000 --- a/tests/CoreTests/android/location/LocationManagerProximityTest.java +++ /dev/null @@ -1,282 +0,0 @@ -/* - * Copyright (C) 2008 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package android.location; - -import android.app.PendingIntent; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.location.Criteria; -import android.location.Location; -import android.location.LocationManager; -import android.provider.Settings; -import android.test.AndroidTestCase; -import android.test.suitebuilder.annotation.MediumTest; -import android.test.suitebuilder.annotation.Suppress; -import android.util.Log; - -/** - * Tests for LocationManager.addProximityAlert - * - * TODO: add tests for more scenarios - * - * To run: - * adb shell am instrument -e class android.location.LocationManagerProximityTest \ - * -w android.core/android.test.InstrumentationTestRunner - * - * This test requires that the "Allow mock locations" setting be enabled. - * To ensure reliable results, all location providers should be disabled. - * - */ -@Suppress -@MediumTest -public class LocationManagerProximityTest extends AndroidTestCase { - - private static final int UPDATE_LOCATION_WAIT_TIME = 1000; - private static final int PROXIMITY_WAIT_TIME = 2000; - - private LocationManager mLocationManager; - private PendingIntent mPendingIntent; - private TestIntentReceiver mIntentReceiver; - - private static final String LOG_TAG = "LocationProximityTest"; - - private static final String PROVIDER_NAME = "test"; - - @Override - protected void setUp() throws Exception { - super.setUp(); - - // test that mock locations are allowed so a more descriptive error message can be logged - if (Settings.Secure.getInt(getContext().getContentResolver(), - Settings.Secure.ALLOW_MOCK_LOCATION, 0) == 0) { - fail("Mock locations are currently disabled in Settings - this test requires " + - "mock locations"); - } - - mLocationManager = (LocationManager) getContext(). - getSystemService(Context.LOCATION_SERVICE); - if (mLocationManager.getProvider(PROVIDER_NAME) != null) { - mLocationManager.removeTestProvider(PROVIDER_NAME); - } - - mLocationManager.addTestProvider(PROVIDER_NAME, true, //requiresNetwork, - false, // requiresSatellite, - true, // requiresCell, - false, // hasMonetaryCost, - false, // supportsAltitude, - false, // supportsSpeed, s - false, // upportsBearing, - Criteria.POWER_MEDIUM, // powerRequirement - Criteria.ACCURACY_FINE); // accuracy - mLocationManager.setTestProviderEnabled(PROVIDER_NAME, true); - } - - @Override - protected void tearDown() throws Exception { - mLocationManager.removeTestProvider(PROVIDER_NAME); - - if (mPendingIntent != null) { - mLocationManager.removeProximityAlert(mPendingIntent); - } - if (mIntentReceiver != null) { - getContext().unregisterReceiver(mIntentReceiver); - } - } - - /** - * Tests basic proximity alert when entering proximity - */ - public void testEnterProximity() throws Exception { - doTestEnterProximity(10000); - } - - /** - * Tests proximity alert when entering proximity, with no expiration - */ - public void testEnterProximity_noexpire() throws Exception { - doTestEnterProximity(-1); - } - - /** - * Helper variant for testing enter proximity scenario - * TODO: add additional parameters as more scenarios are added - * - * @param expiration - expiry of proximity alert - */ - private void doTestEnterProximity(long expiration) throws Exception { - // update location to outside proximity range - synchronousSendLocation(30, 30); - registerProximityListener(0, 0, 1000, expiration); - sendLocation(0, 0); - waitForAlert(); - assertProximityType(true); - } - - /** - * Tests basic proximity alert when exiting proximity - */ - public void testExitProximity() throws Exception { - // first do enter proximity scenario - doTestEnterProximity(-1); - - // now update to trigger exit proximity proximity - mIntentReceiver.clearReceivedIntents(); - sendLocation(20, 20); - waitForAlert(); - assertProximityType(false); - } - - /** - * Registers the proximity intent receiver - */ - private void registerProximityListener(double latitude, double longitude, - float radius, long expiration) { - String intentKey = "testProximity"; - Intent proximityIntent = new Intent(intentKey); - mPendingIntent = PendingIntent.getBroadcast(getContext(), 0, - proximityIntent, PendingIntent.FLAG_CANCEL_CURRENT); - mIntentReceiver = new TestIntentReceiver(intentKey); - - mLocationManager.addProximityAlert(latitude, longitude, radius, - expiration, mPendingIntent); - - getContext().registerReceiver(mIntentReceiver, - mIntentReceiver.getFilter()); - - } - - /** - * Blocks until proximity intent notification is received - * @throws InterruptedException - */ - private void waitForAlert() throws InterruptedException { - Log.d(LOG_TAG, "Waiting for proximity update"); - synchronized (mIntentReceiver) { - mIntentReceiver.wait(PROXIMITY_WAIT_TIME); - } - - assertNotNull("Did not receive proximity alert", - mIntentReceiver.getLastReceivedIntent()); - } - - /** - * Asserts that the received intent had the enter proximity property set as - * expected - * @param expectedEnterProximity - true if enter proximity expected, false if - * exit expected - */ - private void assertProximityType(boolean expectedEnterProximity) - throws Exception { - boolean proximityTest = mIntentReceiver.getLastReceivedIntent(). - getBooleanExtra(LocationManager.KEY_PROXIMITY_ENTERING, - !expectedEnterProximity); - assertEquals("proximity alert not set to expected enter proximity value", - expectedEnterProximity, proximityTest); - } - - /** - * Synchronous variant of sendLocation - */ - private void synchronousSendLocation(final double latitude, - final double longitude) - throws InterruptedException { - sendLocation(latitude, longitude, this); - // wait for location to be set - synchronized (this) { - wait(UPDATE_LOCATION_WAIT_TIME); - } - } - - /** - * Asynchronously update the mock location provider without notification - */ - private void sendLocation(final double latitude, final double longitude) { - sendLocation(latitude, longitude, null); - } - - /** - * Asynchronously update the mock location provider with given latitude and - * longitude - * - * @param latitude - update location - * @param longitude - update location - * @param observer - optionally, object to notify when update is sent.If - * null, no update will be sent - */ - private void sendLocation(final double latitude, final double longitude, - final Object observer) { - Thread locationUpdater = new Thread() { - @Override - public void run() { - Location loc = new Location(PROVIDER_NAME); - loc.setLatitude(latitude); - loc.setLongitude(longitude); - - loc.setTime(java.lang.System.currentTimeMillis()); - Log.d(LOG_TAG, "Sending update for " + PROVIDER_NAME); - mLocationManager.setTestProviderLocation(PROVIDER_NAME, loc); - if (observer != null) { - synchronized (observer) { - observer.notify(); - } - } - } - }; - locationUpdater.start(); - - } - - /** - * Helper class that receives a proximity intent and notifies the main class - * when received - */ - private static class TestIntentReceiver extends BroadcastReceiver { - - private String mExpectedAction; - private Intent mLastReceivedIntent; - - public TestIntentReceiver(String expectedAction) { - mExpectedAction = expectedAction; - mLastReceivedIntent = null; - } - - public IntentFilter getFilter() { - IntentFilter filter = new IntentFilter(mExpectedAction); - return filter; - } - - @Override - public void onReceive(Context context, Intent intent) { - if (intent != null && mExpectedAction.equals(intent.getAction())) { - Log.d(LOG_TAG, "Intent Received: " + intent.toString()); - mLastReceivedIntent = intent; - synchronized (this) { - notify(); - } - } - } - - public Intent getLastReceivedIntent() { - return mLastReceivedIntent; - } - - public void clearReceivedIntents() { - mLastReceivedIntent = null; - } - } -} diff --git a/tests/CoreTests/com/android/internal/telephony/TelephonyTests.java b/tests/CoreTests/com/android/internal/telephony/TelephonyTests.java deleted file mode 100644 index fdfafe1030080..0000000000000 --- a/tests/CoreTests/com/android/internal/telephony/TelephonyTests.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (C) 2006 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.internal.telephony; - -import com.android.internal.telephony.AdnRecordTest; -import com.android.internal.telephony.gsm.GSMPhoneTest; -import com.android.internal.telephony.GsmAlphabetTest; -import com.android.internal.telephony.SMSDispatcherTest; -import com.android.internal.telephony.SimPhoneBookTest; -import com.android.internal.telephony.SimSmsTest; -import com.android.internal.telephony.SimUtilsTest; - -import junit.framework.TestSuite; - -/** - * To run these tests: - * $ mmm java/tests && adb sync - * $ adb shell am instrument -w \ - * -e class com.android.internal.telephony.TelephonyTests \ - * android.core/android.test.InstrumentationTestRunner - */ -public class TelephonyTests { - public static TestSuite suite() { - TestSuite suite = new TestSuite(TelephonyTests.class.getName()); - - suite.addTestSuite(PhoneNumberWatcherTest.class); - suite.addTestSuite(ATResponseParserTest.class); - suite.addTestSuite(PhoneNumberUtilsTest.class); - suite.addTestSuite(SMSDispatcherTest.class); - //suite.addTestSuite(GSMPhoneTest.class); - suite.addTestSuite(AdnRecordTest.class); - suite.addTestSuite(GsmAlphabetTest.class); - suite.addTestSuite(SimUtilsTest.class); - suite.addTestSuite(SimPhoneBookTest.class); - suite.addTestSuite(SimSmsTest.class); - suite.addTestSuite(TelephonyUtilsTest.class); - - return suite; - } -}