Move android.app Activities into com.android.cts.app.stub
bug: 17614217
Change-Id: Ie893389c4f00c66313fc26447b0f569250c64c3f
diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk
index a3ca867..c9cdb15 100644
--- a/CtsTestCaseList.mk
+++ b/CtsTestCaseList.mk
@@ -31,6 +31,7 @@
cts_support_packages := \
CtsAccelerationTestStubs \
+ CtsAppTestStubs \
CtsDeviceAdmin \
CtsDeviceOpenGl \
CtsDeviceTaskswitchingAppA \
diff --git a/tests/app/Android.mk b/tests/app/Android.mk
new file mode 100644
index 0000000..69bf590
--- /dev/null
+++ b/tests/app/Android.mk
@@ -0,0 +1,35 @@
+# 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# don't include this package in any target
+LOCAL_MODULE_TAGS := optional
+# and when built explicitly put it in the data partition
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common voip-common
+
+LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner ctstestserver
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src) \
+ src/android/app/cts/ISecondary.aidl
+
+LOCAL_PACKAGE_NAME := CtsAppTestStubs
+
+include $(BUILD_PACKAGE)
diff --git a/tests/app/AndroidManifest.xml b/tests/app/AndroidManifest.xml
new file mode 100644
index 0000000..b628a0c
--- /dev/null
+++ b/tests/app/AndroidManifest.xml
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2007 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.cts.app.stub">
+
+ <permission android:name="android.app.cts.permission.TEST_GRANTED"
+ android:protectionLevel="normal"
+ android:label="@string/permlab_testGranted"
+ android:description="@string/permdesc_testGranted">
+ <meta-data android:name="android.app.cts.string" android:value="foo" />
+ <meta-data android:name="android.app.cts.boolean" android:value="true" />
+ <meta-data android:name="android.app.cts.integer" android:value="100" />
+ <meta-data android:name="android.app.cts.color" android:value="#ff000000" />
+ <meta-data android:name="android.app.cts.float" android:value="100.1" />
+ <meta-data android:name="android.app.cts.reference" android:resource="@xml/metadata" />
+ </permission>
+
+ <uses-permission android:name="android.app.cts.permission.TEST_GRANTED" />
+ <uses-permission android:name="android.permission.READ_CONTACTS" />
+ <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+ <uses-permission android:name="android.permission.INTERNET" />
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+ <uses-permission android:name="android.permission.CAMERA" />
+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+ <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+ <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+ <application android:label="Android TestCase"
+ android:icon="@drawable/size_48x48"
+ android:maxRecents="1"
+ android:multiArch="true"
+ android:name="android.app.cts.MockApplication"
+ android:supportsRtl="true">
+ <uses-library android:name="android.test.runner" />
+
+ <activity android:name="android.app.cts.ActionBarActivity" />
+
+ <activity android:name="android.app.cts.DialogStubActivity"
+ android:label="DialogStubActivity"
+ android:configChanges="keyboardHidden|orientation|screenSize">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ </intent-filter>
+ </activity>
+
+ <activity android:name="android.app.cts.MockActivity" android:label="MockActivity">
+ <meta-data android:name="android.app.alias"
+ android:resource="@xml/alias" />
+ <meta-data android:name="android.app.intent.filter"
+ android:resource="@xml/intentfilter" />
+ </activity>
+
+ <activity android:name="android.app.cts.MockApplicationActivity"
+ android:label="MockApplicationActivity">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ </intent-filter>
+ </activity>
+
+ <activity android:name="android.app.cts.InstrumentationTestActivity"
+ android:theme="@style/Theme_NoSwipeDismiss"
+ android:label="InstrumentationTestActivity">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <data android:mimeType="vnd.android.cursor.dir/person" />
+ </intent-filter>
+ </activity>
+
+ <activity android:name="android.app.cts.AliasActivityStub">
+ <meta-data android:name="android.app.alias"
+ android:resource="@xml/alias" />
+ </activity>
+
+ <activity android:name="android.app.cts.ChildActivity"
+ android:label="ChildActivity" />
+
+ <receiver android:name="android.app.cts.MockReceiver">
+ <intent-filter>
+ <action android:name="android.app.cts.PendingIntentTest.TEST_RECEIVER" />
+ </intent-filter>
+ </receiver>
+
+ <service android:name="android.app.cts.MockService" />
+
+ <activity android:name="android.app.cts.SearchManagerStubActivity"
+ android:label="SearchManagerStubActivity">
+ <intent-filter>
+ <action android:name="android.intent.action.SEARCH" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ <meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
+ </activity>
+
+ <service android:name="android.app.cts.LocalService">
+ <intent-filter>
+ <action android:name="android.app.cts.activity.SERVICE_LOCAL" />
+ </intent-filter>
+ <meta-data android:name="android.app.cts.string" android:value="foo" />
+ <meta-data android:name="android.app.cts.boolean" android:value="true" />
+ <meta-data android:name="android.app.cts.integer" android:value="100" />
+ <meta-data android:name="android.app.cts.color" android:value="#ff000000" />
+ <meta-data android:name="android.app.cts.float" android:value="100.1" />
+ <meta-data android:name="android.app.cts.reference" android:resource="@xml/metadata" />
+ </service>
+
+ <service android:name="android.app.cts.LocalGrantedService"
+ android:permission="android.app.cts.permission.TEST_GRANTED">
+ <intent-filter>
+ <action android:name="android.app.cts.activity.SERVICE_LOCAL_GRANTED" />
+ </intent-filter>
+ </service>
+
+ <service android:name="android.app.cts.LocalDeniedService"
+ android:permission="android.app.cts.permission.TEST_DENIED">
+ <intent-filter>
+ <action android:name="android.app.cts.activity.SERVICE_LOCAL_DENIED" />
+ </intent-filter>
+ </service>
+
+ <activity android:name="android.app.cts.TestedScreen"
+ android:process=":remoteScreen">
+ </activity>
+ <activity android:name="android.app.cts.LocalScreen" android:multiprocess="true">
+ </activity>
+ <activity android:name="android.app.cts.ClearTop" android:multiprocess="true"
+ android:launchMode="singleTop">
+ </activity>
+ <activity android:name="android.app.cts.LocalDialog" android:multiprocess="true"
+ android:theme="@android:style/Theme.Dialog">
+ </activity>
+
+ <activity android:name="android.app.cts.PendingIntentStubActivity"
+ android:label="PendingIntentStubActivity"/>
+
+ <activity android:name="android.app.cts.LocalActivityManagerStubActivity"
+ android:label="LocalActivityManagerStubActivity" />
+
+ <activity android:name="android.app.cts.LocalActivityManagerTestHelper"
+ android:label="LocalActivityManagerTestHelper" />
+
+ <activity android:name="android.app.cts.LaunchpadTabActivity" android:multiprocess="true">
+ </activity>
+
+ <activity android:name="android.app.cts.LocalActivity" android:multiprocess="true">
+ <meta-data android:name="android.app.cts.string" android:value="foo" />
+ <meta-data android:name="android.app.cts.boolean" android:value="true" />
+ <meta-data android:name="android.app.cts.integer" android:value="100" />
+ <meta-data android:name="android.app.cts.color" android:value="#ff000000" />
+ <meta-data android:name="android.app.cts.float" android:value="100.1" />
+ <meta-data android:name="android.app.cts.reference" android:resource="@xml/metadata" />
+ </activity>
+
+ <activity android:name="android.app.cts.TestedActivity"
+ android:process=":remoteActivity">
+ </activity>
+
+ <activity android:name="android.app.cts.ExpandableListTestActivity"
+ android:label="ExpandableListTestActivity">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ </intent-filter>
+ </activity>
+
+ <activity android:name="android.app.cts.ChildTabActivity" android:label="ChildTabActivity" />
+
+ <activity android:name="android.app.cts.LauncherActivityStub"
+ android:label="LauncherActivityStub" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ </intent-filter>
+ </activity>
+
+ <activity android:name="android.app.cts.MockTabActivity" android:label="MockTabActivity" />
+
+ <activity android:name="android.app.cts.AppStubActivity" android:label="AppStubActivity">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ </intent-filter>
+ </activity>
+
+ <activity android:name="android.app.cts.DialogStubActivity"
+ android:theme="@style/Theme_NoSwipeDismiss"
+ android:label="DialogStubActivity">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ </intent-filter>
+ </activity>
+
+ <activity android:name="android.app.cts.ActivityManagerStubFooActivity"
+ android:label="ActivityManagerStubFooActivity">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ </intent-filter>
+ </activity>
+
+ <activity android:name="android.app.cts.ActivityManagerRecentOneActivity"
+ android:label="ActivityManagerRecentOneActivity"
+ android:allowTaskReparenting="true"
+ android:taskAffinity="android.app.cts.recentOne">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ </intent-filter>
+ </activity>
+
+ <activity android:name="android.app.cts.ActivityManagerRecentTwoActivity"
+ android:label="ActivityManagerRecentTwoActivity"
+ android:allowTaskReparenting="true"
+ android:taskAffinity="android.app.cts.recentTwo">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ </intent-filter>
+ </activity>
+
+ <activity android:name="android.app.cts.ActivityManagerStubCrashActivity"
+ android:label="ActivityManagerStubCrashActivity"
+ android:multiprocess="true"
+ android:process=":ActivityManagerStubCrashActivity">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ </intent-filter>
+ </activity>
+
+ <service android:name="android.app.cts.StubRemoteService"
+ android:process=":remote">
+ <intent-filter>
+ <action
+ android:name="android.app.cts.ISecondary" />
+ <action
+ android:name="android.app.REMOTESERVICE" />
+ </intent-filter>
+ </service>
+
+ <activity android:name="android.app.ActivityGroup"
+ android:label="ActivityGroup" />
+
+ <activity android:name="android.app.cts.KeyguardManagerActivity"
+ android:label="KeyguardManagerActivity">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
+ </intent-filter>
+ </activity>
+
+ <service android:name="android.app.cts.IntentServiceStub"/>
+
+ <activity android:name="android.app.cts.LaunchpadActivity"
+ android:configChanges="keyboardHidden|orientation|screenSize"
+ android:multiprocess="true">
+ </activity>
+
+ <activity android:name="android.app.cts.ActivityManagerMemoryClassLaunchActivity" />
+
+ <activity android:name="android.app.cts.ActivityManagerMemoryClassTestActivity"
+ android:process=":memoryclass" />
+
+ </application>
+
+</manifest>
+
diff --git a/tests/tests/app/assets/noiseandchirps b/tests/app/assets/noiseandchirps
similarity index 100%
rename from tests/tests/app/assets/noiseandchirps
rename to tests/app/assets/noiseandchirps
Binary files differ
diff --git a/tests/tests/app/assets/noiseandchirps.mp3 b/tests/app/assets/noiseandchirps.mp3
similarity index 100%
rename from tests/tests/app/assets/noiseandchirps.mp3
rename to tests/app/assets/noiseandchirps.mp3
Binary files differ
diff --git a/tests/tests/app/assets/noiseandchirps.ogg b/tests/app/assets/noiseandchirps.ogg
similarity index 100%
rename from tests/tests/app/assets/noiseandchirps.ogg
rename to tests/app/assets/noiseandchirps.ogg
Binary files differ
diff --git a/tests/tests/app/assets/noiseandchirps.wrong b/tests/app/assets/noiseandchirps.wrong
similarity index 100%
rename from tests/tests/app/assets/noiseandchirps.wrong
rename to tests/app/assets/noiseandchirps.wrong
Binary files differ
diff --git a/tests/tests/app/res/drawable/icon_black.jpg b/tests/app/res/drawable/icon_black.jpg
similarity index 100%
rename from tests/tests/app/res/drawable/icon_black.jpg
rename to tests/app/res/drawable/icon_black.jpg
Binary files differ
diff --git a/tests/tests/app/res/drawable/icon_blue.jpg b/tests/app/res/drawable/icon_blue.jpg
similarity index 100%
rename from tests/tests/app/res/drawable/icon_blue.jpg
rename to tests/app/res/drawable/icon_blue.jpg
Binary files differ
diff --git a/tests/tests/app/res/drawable/icon_green.jpg b/tests/app/res/drawable/icon_green.jpg
similarity index 100%
rename from tests/tests/app/res/drawable/icon_green.jpg
rename to tests/app/res/drawable/icon_green.jpg
Binary files differ
diff --git a/tests/tests/app/res/drawable/icon_red.jpg b/tests/app/res/drawable/icon_red.jpg
similarity index 100%
rename from tests/tests/app/res/drawable/icon_red.jpg
rename to tests/app/res/drawable/icon_red.jpg
Binary files differ
diff --git a/tests/tests/app/res/drawable/icon_yellow.jpg b/tests/app/res/drawable/icon_yellow.jpg
similarity index 100%
rename from tests/tests/app/res/drawable/icon_yellow.jpg
rename to tests/app/res/drawable/icon_yellow.jpg
Binary files differ
diff --git a/tests/tests/app/res/drawable/ninepatch_0.9.png b/tests/app/res/drawable/ninepatch_0.9.png
similarity index 100%
rename from tests/tests/app/res/drawable/ninepatch_0.9.png
rename to tests/app/res/drawable/ninepatch_0.9.png
Binary files differ
diff --git a/tests/tests/app/res/drawable/ninepatch_1.9.png b/tests/app/res/drawable/ninepatch_1.9.png
similarity index 100%
rename from tests/tests/app/res/drawable/ninepatch_1.9.png
rename to tests/app/res/drawable/ninepatch_1.9.png
Binary files differ
diff --git a/tests/tests/app/res/drawable/pass.jpg b/tests/app/res/drawable/pass.jpg
similarity index 100%
rename from tests/tests/app/res/drawable/pass.jpg
rename to tests/app/res/drawable/pass.jpg
Binary files differ
diff --git a/tests/tests/app/res/drawable/robot.png b/tests/app/res/drawable/robot.png
similarity index 100%
rename from tests/tests/app/res/drawable/robot.png
rename to tests/app/res/drawable/robot.png
Binary files differ
diff --git a/tests/tests/app/res/drawable/size_48x48.jpg b/tests/app/res/drawable/size_48x48.jpg
similarity index 100%
rename from tests/tests/app/res/drawable/size_48x48.jpg
rename to tests/app/res/drawable/size_48x48.jpg
Binary files differ
diff --git a/tests/tests/app/res/layout/alert_dialog_text_entry.xml b/tests/app/res/layout/alert_dialog_text_entry.xml
similarity index 100%
rename from tests/tests/app/res/layout/alert_dialog_text_entry.xml
rename to tests/app/res/layout/alert_dialog_text_entry.xml
diff --git a/tests/tests/app/res/layout/alert_dialog_text_entry_2.xml b/tests/app/res/layout/alert_dialog_text_entry_2.xml
similarity index 100%
rename from tests/tests/app/res/layout/alert_dialog_text_entry_2.xml
rename to tests/app/res/layout/alert_dialog_text_entry_2.xml
diff --git a/tests/tests/app/res/layout/alertdialog_custom_title.xml b/tests/app/res/layout/alertdialog_custom_title.xml
similarity index 100%
rename from tests/tests/app/res/layout/alertdialog_custom_title.xml
rename to tests/app/res/layout/alertdialog_custom_title.xml
diff --git a/tests/tests/app/res/layout/app_activity.xml b/tests/app/res/layout/app_activity.xml
similarity index 100%
rename from tests/tests/app/res/layout/app_activity.xml
rename to tests/app/res/layout/app_activity.xml
diff --git a/tests/tests/app/res/layout/checkbox_layout.xml b/tests/app/res/layout/checkbox_layout.xml
similarity index 100%
rename from tests/tests/app/res/layout/checkbox_layout.xml
rename to tests/app/res/layout/checkbox_layout.xml
diff --git a/tests/tests/app/res/layout/dialog_stub_layout.xml b/tests/app/res/layout/dialog_stub_layout.xml
similarity index 100%
rename from tests/tests/app/res/layout/dialog_stub_layout.xml
rename to tests/app/res/layout/dialog_stub_layout.xml
diff --git a/tests/tests/app/res/menu/browser.xml b/tests/app/res/menu/browser.xml
similarity index 100%
rename from tests/tests/app/res/menu/browser.xml
rename to tests/app/res/menu/browser.xml
diff --git a/tests/tests/app/res/values/arrays.xml b/tests/app/res/values/arrays.xml
similarity index 100%
rename from tests/tests/app/res/values/arrays.xml
rename to tests/app/res/values/arrays.xml
diff --git a/tests/tests/app/res/values/attrs.xml b/tests/app/res/values/attrs.xml
similarity index 100%
rename from tests/tests/app/res/values/attrs.xml
rename to tests/app/res/values/attrs.xml
diff --git a/tests/tests/app/res/values/colors.xml b/tests/app/res/values/colors.xml
similarity index 100%
rename from tests/tests/app/res/values/colors.xml
rename to tests/app/res/values/colors.xml
diff --git a/tests/tests/app/res/values/strings.xml b/tests/app/res/values/strings.xml
similarity index 100%
rename from tests/tests/app/res/values/strings.xml
rename to tests/app/res/values/strings.xml
diff --git a/tests/tests/app/res/values/styles.xml b/tests/app/res/values/styles.xml
similarity index 100%
rename from tests/tests/app/res/values/styles.xml
rename to tests/app/res/values/styles.xml
diff --git a/tests/tests/app/res/xml/alias.xml b/tests/app/res/xml/alias.xml
similarity index 93%
rename from tests/tests/app/res/xml/alias.xml
rename to tests/app/res/xml/alias.xml
index a03104f..321e536 100644
--- a/tests/tests/app/res/xml/alias.xml
+++ b/tests/app/res/xml/alias.xml
@@ -19,7 +19,7 @@
<alias xmlns:android="http://schemas.android.com/apk/res/android">
<intent android:action="android.intent.action.MAIN"
- android:targetPackage="com.android.cts.app"
+ android:targetPackage="com.android.cts.app.stub"
android:targetClass="android.app.cts.ChildActivity"
android:data="http://www.google.com/">
</intent>
diff --git a/tests/tests/app/res/xml/intentfilter.xml b/tests/app/res/xml/intentfilter.xml
similarity index 100%
rename from tests/tests/app/res/xml/intentfilter.xml
rename to tests/app/res/xml/intentfilter.xml
diff --git a/tests/tests/app/res/xml/metadata.xml b/tests/app/res/xml/metadata.xml
similarity index 100%
rename from tests/tests/app/res/xml/metadata.xml
rename to tests/app/res/xml/metadata.xml
diff --git a/tests/tests/app/res/xml/searchable.xml b/tests/app/res/xml/searchable.xml
similarity index 100%
rename from tests/tests/app/res/xml/searchable.xml
rename to tests/app/res/xml/searchable.xml
diff --git a/tests/tests/app/src/android/app/cts/ActionBarActivity.java b/tests/app/src/android/app/cts/ActionBarActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/ActionBarActivity.java
rename to tests/app/src/android/app/cts/ActionBarActivity.java
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassLaunchActivity.java b/tests/app/src/android/app/cts/ActivityManagerMemoryClassLaunchActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassLaunchActivity.java
rename to tests/app/src/android/app/cts/ActivityManagerMemoryClassLaunchActivity.java
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTestActivity.java b/tests/app/src/android/app/cts/ActivityManagerMemoryClassTestActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/ActivityManagerMemoryClassTestActivity.java
rename to tests/app/src/android/app/cts/ActivityManagerMemoryClassTestActivity.java
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerRecentOneActivity.java b/tests/app/src/android/app/cts/ActivityManagerRecentOneActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/ActivityManagerRecentOneActivity.java
rename to tests/app/src/android/app/cts/ActivityManagerRecentOneActivity.java
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerRecentTwoActivity.java b/tests/app/src/android/app/cts/ActivityManagerRecentTwoActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/ActivityManagerRecentTwoActivity.java
rename to tests/app/src/android/app/cts/ActivityManagerRecentTwoActivity.java
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerStubCrashActivity.java b/tests/app/src/android/app/cts/ActivityManagerStubCrashActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/ActivityManagerStubCrashActivity.java
rename to tests/app/src/android/app/cts/ActivityManagerStubCrashActivity.java
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerStubFooActivity.java b/tests/app/src/android/app/cts/ActivityManagerStubFooActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/ActivityManagerStubFooActivity.java
rename to tests/app/src/android/app/cts/ActivityManagerStubFooActivity.java
diff --git a/tests/tests/app/src/android/app/cts/ActivityTestsBase.java b/tests/app/src/android/app/cts/ActivityTestsBase.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/ActivityTestsBase.java
rename to tests/app/src/android/app/cts/ActivityTestsBase.java
diff --git a/tests/tests/app/src/android/app/cts/AliasActivityStub.java b/tests/app/src/android/app/cts/AliasActivityStub.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/AliasActivityStub.java
rename to tests/app/src/android/app/cts/AliasActivityStub.java
diff --git a/tests/tests/app/src/android/app/cts/AppCtsActivity.java b/tests/app/src/android/app/cts/AppStubActivity.java
similarity index 97%
rename from tests/tests/app/src/android/app/cts/AppCtsActivity.java
rename to tests/app/src/android/app/cts/AppStubActivity.java
index a1722bb..da5e55a 100644
--- a/tests/tests/app/src/android/app/cts/AppCtsActivity.java
+++ b/tests/app/src/android/app/cts/AppStubActivity.java
@@ -26,12 +26,12 @@
import android.view.View;
import android.view.ContextMenu.ContextMenuInfo;
-import com.android.cts.app.R;
+import com.android.cts.app.stub.R;
/**
* A minimal "Hello, World!" application.
*/
-public class AppCtsActivity extends Activity {
+public class AppStubActivity extends Activity {
private Dialog mDialog;
public boolean mOnPrepareDialog;
public boolean mOnOptionsMenuClosedCalled;
@@ -47,7 +47,7 @@
public boolean mCreateContextMenuCalled;
public boolean mRequestWinFeatureRet = false;
- public AppCtsActivity() {
+ public AppStubActivity() {
}
diff --git a/tests/tests/app/src/android/app/cts/CTSActivityTestCaseBase.java b/tests/app/src/android/app/cts/CTSActivityTestCaseBase.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/CTSActivityTestCaseBase.java
rename to tests/app/src/android/app/cts/CTSActivityTestCaseBase.java
diff --git a/tests/tests/app/src/android/app/cts/ChildActivity.java b/tests/app/src/android/app/cts/ChildActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/ChildActivity.java
rename to tests/app/src/android/app/cts/ChildActivity.java
diff --git a/tests/tests/app/src/android/app/cts/ChildTabActivity.java b/tests/app/src/android/app/cts/ChildTabActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/ChildTabActivity.java
rename to tests/app/src/android/app/cts/ChildTabActivity.java
diff --git a/tests/tests/app/src/android/app/cts/ClearTop.java b/tests/app/src/android/app/cts/ClearTop.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/ClearTop.java
rename to tests/app/src/android/app/cts/ClearTop.java
diff --git a/tests/tests/app/src/android/app/cts/DialogCtsActivity.java b/tests/app/src/android/app/cts/DialogStubActivity.java
similarity index 97%
rename from tests/tests/app/src/android/app/cts/DialogCtsActivity.java
rename to tests/app/src/android/app/cts/DialogStubActivity.java
index 2fb293e..a773ae2 100644
--- a/tests/tests/app/src/android/app/cts/DialogCtsActivity.java
+++ b/tests/app/src/android/app/cts/DialogStubActivity.java
@@ -16,7 +16,7 @@
package android.app.cts;
-import com.android.cts.app.R;
+import com.android.cts.app.stub.R;
import android.app.Activity;
import android.app.AlertDialog;
@@ -43,7 +43,7 @@
/*
* Stub class for Dialog, AlertDialog, DatePickerDialog, TimePickerDialog etc.
*/
-public class DialogCtsActivity extends Activity {
+public class DialogStubActivity extends Activity {
public static final int TEST_DIALOG_WITHOUT_THEME = 0;
public static final int TEST_DIALOG_WITH_THEME = 1;
public static final int TEST_ALERTDIALOG = 2;
@@ -71,7 +71,7 @@
public static final String DEFAULT_ALERTDIALOG_TITLE = "AlertDialog";
public static final String DEFAULT_ALERTDIALOG_MESSAGE = "AlertDialog message";
- private static final String LOG_TAG = "DialogCtsActivity";
+ private static final String LOG_TAG = "DialogStubActivity";
public boolean isPositiveButtonClicked = false;
public boolean isNegativeButtonClicked = false;
@@ -235,8 +235,8 @@
@SuppressWarnings("deprecation")
private AlertDialog getAlertDialogInstance(boolean deprecated) {
- mAlertDialog = new AlertDialog.Builder(DialogCtsActivity.this).create();
- mAlertDialog.setIcon(com.android.cts.app.R.drawable.pass);
+ mAlertDialog = new AlertDialog.Builder(DialogStubActivity.this).create();
+ mAlertDialog.setIcon(com.android.cts.app.stub.R.drawable.pass);
mAlertDialog.setTitle(DEFAULT_ALERTDIALOG_TITLE);
mAlertDialog.setMessage(DEFAULT_ALERTDIALOG_MESSAGE);
mAlertDialog.setInverseBackgroundForced(true);
@@ -267,7 +267,7 @@
final LayoutInflater inflate = getLayoutInflater();
final View customTitleViewCustom = inflate.inflate(R.layout.alertdialog_custom_title, null);
final View textEntryView = inflate.inflate(R.layout.alert_dialog_text_entry_2, null);
- mAlertDialog = new AlertDialog.Builder(DialogCtsActivity.this).create();
+ mAlertDialog = new AlertDialog.Builder(DialogStubActivity.this).create();
mAlertDialog.setCustomTitle(customTitleViewCustom);
mAlertDialog.setMessage(DEFAULT_ALERTDIALOG_MESSAGE);
if (withSpacing) {
diff --git a/tests/tests/app/src/android/app/cts/ExpandableListTestActivity.java b/tests/app/src/android/app/cts/ExpandableListTestActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/ExpandableListTestActivity.java
rename to tests/app/src/android/app/cts/ExpandableListTestActivity.java
diff --git a/tests/tests/app/src/android/app/cts/IBinderParcelable.java b/tests/app/src/android/app/cts/IBinderParcelable.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/IBinderParcelable.java
rename to tests/app/src/android/app/cts/IBinderParcelable.java
diff --git a/tests/tests/app/src/android/app/cts/ISecondary.aidl b/tests/app/src/android/app/cts/ISecondary.aidl
similarity index 100%
rename from tests/tests/app/src/android/app/cts/ISecondary.aidl
rename to tests/app/src/android/app/cts/ISecondary.aidl
diff --git a/tests/tests/app/src/android/app/cts/InstrumentationTestActivity.java b/tests/app/src/android/app/cts/InstrumentationTestActivity.java
similarity index 99%
rename from tests/tests/app/src/android/app/cts/InstrumentationTestActivity.java
rename to tests/app/src/android/app/cts/InstrumentationTestActivity.java
index ac1039b..bec721e 100644
--- a/tests/tests/app/src/android/app/cts/InstrumentationTestActivity.java
+++ b/tests/app/src/android/app/cts/InstrumentationTestActivity.java
@@ -29,7 +29,7 @@
import android.view.MotionEvent;
import android.view.View;
import android.widget.TextView;
-import com.android.cts.app.R;
+import com.android.cts.app.stub.R;
public class InstrumentationTestActivity extends Activity {
diff --git a/tests/tests/app/src/android/app/cts/IntentServiceStub.java b/tests/app/src/android/app/cts/IntentServiceStub.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/IntentServiceStub.java
rename to tests/app/src/android/app/cts/IntentServiceStub.java
diff --git a/tests/tests/app/src/android/app/cts/KeyguardManagerActivity.java b/tests/app/src/android/app/cts/KeyguardManagerActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/KeyguardManagerActivity.java
rename to tests/app/src/android/app/cts/KeyguardManagerActivity.java
diff --git a/tests/tests/app/src/android/app/cts/LauncherActivityStub.java b/tests/app/src/android/app/cts/LauncherActivityStub.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/LauncherActivityStub.java
rename to tests/app/src/android/app/cts/LauncherActivityStub.java
diff --git a/tests/tests/app/src/android/app/cts/LaunchpadActivity.java b/tests/app/src/android/app/cts/LaunchpadActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/LaunchpadActivity.java
rename to tests/app/src/android/app/cts/LaunchpadActivity.java
diff --git a/tests/tests/app/src/android/app/cts/LaunchpadTabActivity.java b/tests/app/src/android/app/cts/LaunchpadTabActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/LaunchpadTabActivity.java
rename to tests/app/src/android/app/cts/LaunchpadTabActivity.java
diff --git a/tests/tests/app/src/android/app/cts/LocalActivity.java b/tests/app/src/android/app/cts/LocalActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/LocalActivity.java
rename to tests/app/src/android/app/cts/LocalActivity.java
diff --git a/tests/tests/app/src/android/app/cts/LocalActivityManagerCtsActivity.java b/tests/app/src/android/app/cts/LocalActivityManagerStubActivity.java
similarity index 95%
rename from tests/tests/app/src/android/app/cts/LocalActivityManagerCtsActivity.java
rename to tests/app/src/android/app/cts/LocalActivityManagerStubActivity.java
index 93da3e4..e64c75a 100644
--- a/tests/tests/app/src/android/app/cts/LocalActivityManagerCtsActivity.java
+++ b/tests/app/src/android/app/cts/LocalActivityManagerStubActivity.java
@@ -19,7 +19,7 @@
import android.app.Activity;
import android.os.Bundle;
-public class LocalActivityManagerCtsActivity extends Activity{
+public class LocalActivityManagerStubActivity extends Activity{
public static boolean sIsOnResumeCalled;
public static boolean sIsOnStopCalled;
diff --git a/tests/tests/app/src/android/app/cts/LocalActivityManagerTestHelper.java b/tests/app/src/android/app/cts/LocalActivityManagerTestHelper.java
similarity index 90%
rename from tests/tests/app/src/android/app/cts/LocalActivityManagerTestHelper.java
rename to tests/app/src/android/app/cts/LocalActivityManagerTestHelper.java
index 5c0aca0..76af648 100644
--- a/tests/tests/app/src/android/app/cts/LocalActivityManagerTestHelper.java
+++ b/tests/app/src/android/app/cts/LocalActivityManagerTestHelper.java
@@ -87,7 +87,7 @@
private void testRemoveAllActivity() {
final String id = "id_remove_activity";
- final Intent intent = new Intent(this, LocalActivityManagerCtsActivity.class);
+ final Intent intent = new Intent(this, LocalActivityManagerStubActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mLocalActivityManager.startActivity(id, intent);
@@ -98,7 +98,7 @@
}
if (!activity.getClass().getName().equals("android.app.cts."
- + "LocalActivityManagerCtsActivity")) {
+ + "LocalActivityManagerStubActivity")) {
fail();
return;
}
@@ -115,27 +115,27 @@
private void testDispatchDestroy() {
final String id1 = "id_dispatch_destroy1";
final String id2 = "id_dispatch_destroy2";
- final Intent intent = new Intent(this, LocalActivityManagerCtsActivity.class);
+ final Intent intent = new Intent(this, LocalActivityManagerStubActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mLocalActivityManager.startActivity(id1, intent);
- LocalActivityManagerCtsActivity.sIsOnDestroyCalled = false;
+ LocalActivityManagerStubActivity.sIsOnDestroyCalled = false;
mLocalActivityManager.dispatchDestroy(false);
if (mLocalActivityManager.getCurrentActivity().isFinishing()){
fail();
return;
}
- if (!LocalActivityManagerCtsActivity.sIsOnDestroyCalled) {
+ if (!LocalActivityManagerStubActivity.sIsOnDestroyCalled) {
fail();
return;
}
mLocalActivityManager.startActivity(id2, intent);
- LocalActivityManagerCtsActivity.sIsOnDestroyCalled = false;
+ LocalActivityManagerStubActivity.sIsOnDestroyCalled = false;
mLocalActivityManager.dispatchDestroy(true);
- if (!LocalActivityManagerCtsActivity.sIsOnDestroyCalled) {
+ if (!LocalActivityManagerStubActivity.sIsOnDestroyCalled) {
fail();
return;
}
@@ -157,7 +157,7 @@
}
final String id = "id_dispatch_pause";
- final Intent intent = new Intent(this, LocalActivityManagerCtsActivity.class);
+ final Intent intent = new Intent(this, LocalActivityManagerStubActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mLocalActivityManager.startActivity(id, intent);
@@ -176,12 +176,12 @@
private void testDispatchPauseFalse() {
final String id = "id_dispatch_pause";
- final Intent intent = new Intent(this, LocalActivityManagerCtsActivity.class);
+ final Intent intent = new Intent(this, LocalActivityManagerStubActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mLocalActivityManager.startActivity(id, intent);
- LocalActivityManagerCtsActivity.sIsOnPauseCalled = false;
+ LocalActivityManagerStubActivity.sIsOnPauseCalled = false;
mLocalActivityManager.dispatchPause(false);
- if (!LocalActivityManagerCtsActivity.sIsOnPauseCalled) {
+ if (!LocalActivityManagerStubActivity.sIsOnPauseCalled) {
fail();
return;
}
@@ -190,12 +190,12 @@
private void testDispatchPauseTrue() {
final String id = "id_dispatch_pause";
- final Intent intent = new Intent(this, LocalActivityManagerCtsActivity.class);
+ final Intent intent = new Intent(this, LocalActivityManagerStubActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mLocalActivityManager.startActivity(id, intent);
- LocalActivityManagerCtsActivity.sIsOnPauseCalled = false;
+ LocalActivityManagerStubActivity.sIsOnPauseCalled = false;
mLocalActivityManager.dispatchPause(true);
- if (!LocalActivityManagerCtsActivity.sIsOnPauseCalled) {
+ if (!LocalActivityManagerStubActivity.sIsOnPauseCalled) {
fail();
return;
}
@@ -204,7 +204,7 @@
private void testDispatchStop() {
final String id = "id_dispatch_stop";
- final Intent intent = new Intent(this, LocalActivityManagerCtsActivity.class);
+ final Intent intent = new Intent(this, LocalActivityManagerStubActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mLocalActivityManager.startActivity(id, intent);
if (mLocalActivityManager.getCurrentActivity() == null) {
@@ -212,10 +212,10 @@
return;
}
- LocalActivityManagerCtsActivity.sIsOnStopCalled = false;
+ LocalActivityManagerStubActivity.sIsOnStopCalled = false;
mLocalActivityManager.dispatchStop();
- if (!LocalActivityManagerCtsActivity.sIsOnStopCalled) {
+ if (!LocalActivityManagerStubActivity.sIsOnStopCalled) {
fail();
return;
}
@@ -226,7 +226,7 @@
final Bundle EXPECTED = new Bundle();
final String id = "id";
- final Intent intent = new Intent(this, LocalActivityManagerCtsActivity.class);
+ final Intent intent = new Intent(this, LocalActivityManagerStubActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mLocalActivityManager.startActivity("_id" + System.currentTimeMillis(), intent);
final Bundle bundle = mLocalActivityManager.saveInstanceState();
@@ -261,7 +261,7 @@
}
private void testStartActivity() {
- final Intent intent = new Intent(this, LocalActivityManagerCtsActivity.class);
+ final Intent intent = new Intent(this, LocalActivityManagerStubActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
final String id = "_id_resume_test";
final Window w = mLocalActivityManager.startActivity(id, intent);
@@ -315,13 +315,13 @@
}
private void testDispatchResume() {
- final Intent intent = new Intent(this, LocalActivityManagerCtsActivity.class);
+ final Intent intent = new Intent(this, LocalActivityManagerStubActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mLocalActivityManager.startActivity("_id_resume_test", intent);
mLocalActivityManager.dispatchStop();
- LocalActivityManagerCtsActivity.sIsOnResumeCalled = false;
+ LocalActivityManagerStubActivity.sIsOnResumeCalled = false;
mLocalActivityManager.dispatchResume();
- if (LocalActivityManagerCtsActivity.sIsOnResumeCalled) {
+ if (LocalActivityManagerStubActivity.sIsOnResumeCalled) {
pass();
} else {
fail();
diff --git a/tests/tests/app/src/android/app/cts/LocalDeniedService.java b/tests/app/src/android/app/cts/LocalDeniedService.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/LocalDeniedService.java
rename to tests/app/src/android/app/cts/LocalDeniedService.java
diff --git a/tests/tests/app/src/android/app/cts/LocalDialog.java b/tests/app/src/android/app/cts/LocalDialog.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/LocalDialog.java
rename to tests/app/src/android/app/cts/LocalDialog.java
diff --git a/tests/tests/app/src/android/app/cts/LocalGrantedService.java b/tests/app/src/android/app/cts/LocalGrantedService.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/LocalGrantedService.java
rename to tests/app/src/android/app/cts/LocalGrantedService.java
diff --git a/tests/tests/app/src/android/app/cts/LocalScreen.java b/tests/app/src/android/app/cts/LocalScreen.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/LocalScreen.java
rename to tests/app/src/android/app/cts/LocalScreen.java
diff --git a/tests/tests/app/src/android/app/cts/LocalService.java b/tests/app/src/android/app/cts/LocalService.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/LocalService.java
rename to tests/app/src/android/app/cts/LocalService.java
diff --git a/tests/tests/app/src/android/app/cts/MockActivity.java b/tests/app/src/android/app/cts/MockActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/MockActivity.java
rename to tests/app/src/android/app/cts/MockActivity.java
diff --git a/tests/tests/app/src/android/app/cts/MockAlarmReceiver.java b/tests/app/src/android/app/cts/MockAlarmReceiver.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/MockAlarmReceiver.java
rename to tests/app/src/android/app/cts/MockAlarmReceiver.java
diff --git a/tests/tests/app/src/android/app/cts/MockApplication.java b/tests/app/src/android/app/cts/MockApplication.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/MockApplication.java
rename to tests/app/src/android/app/cts/MockApplication.java
diff --git a/tests/tests/app/src/android/app/cts/MockApplicationActivity.java b/tests/app/src/android/app/cts/MockApplicationActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/MockApplicationActivity.java
rename to tests/app/src/android/app/cts/MockApplicationActivity.java
diff --git a/tests/tests/app/src/android/app/cts/MockReceiver.java b/tests/app/src/android/app/cts/MockReceiver.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/MockReceiver.java
rename to tests/app/src/android/app/cts/MockReceiver.java
diff --git a/tests/tests/app/src/android/app/cts/MockService.java b/tests/app/src/android/app/cts/MockService.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/MockService.java
rename to tests/app/src/android/app/cts/MockService.java
diff --git a/tests/tests/app/src/android/app/cts/MockTabActivity.java b/tests/app/src/android/app/cts/MockTabActivity.java
similarity index 96%
rename from tests/tests/app/src/android/app/cts/MockTabActivity.java
rename to tests/app/src/android/app/cts/MockTabActivity.java
index ebbeb7b..aca19f5 100644
--- a/tests/tests/app/src/android/app/cts/MockTabActivity.java
+++ b/tests/app/src/android/app/cts/MockTabActivity.java
@@ -46,7 +46,7 @@
.setContent(new Intent(this, MockActivity.class)));
tabHost.addTab(tabHost.newTabSpec(TAB3).setIndicator(TAB3).setContent(
- new Intent(this, AppCtsActivity.class).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)));
+ new Intent(this, AppStubActivity.class).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)));
}
diff --git a/tests/tests/app/src/android/app/cts/OrientationTestUtils.java b/tests/app/src/android/app/cts/OrientationTestUtils.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/OrientationTestUtils.java
rename to tests/app/src/android/app/cts/OrientationTestUtils.java
diff --git a/tests/tests/app/src/android/app/cts/PendingIntentCtsActivity.java b/tests/app/src/android/app/cts/PendingIntentStubActivity.java
similarity index 93%
rename from tests/tests/app/src/android/app/cts/PendingIntentCtsActivity.java
rename to tests/app/src/android/app/cts/PendingIntentStubActivity.java
index f11fe10..a2a3bd8 100644
--- a/tests/tests/app/src/android/app/cts/PendingIntentCtsActivity.java
+++ b/tests/app/src/android/app/cts/PendingIntentStubActivity.java
@@ -19,7 +19,7 @@
import android.app.Activity;
import android.os.Bundle;
-public class PendingIntentCtsActivity extends Activity {
+public class PendingIntentStubActivity extends Activity {
public static final int INVALIDATE = -1;
public static final int ON_CREATE = 0;
diff --git a/tests/tests/app/src/android/app/cts/SearchManagerCtsActivity.java b/tests/app/src/android/app/cts/SearchManagerStubActivity.java
similarity index 97%
rename from tests/tests/app/src/android/app/cts/SearchManagerCtsActivity.java
rename to tests/app/src/android/app/cts/SearchManagerStubActivity.java
index 7198e8d..6385fef 100644
--- a/tests/tests/app/src/android/app/cts/SearchManagerCtsActivity.java
+++ b/tests/app/src/android/app/cts/SearchManagerStubActivity.java
@@ -25,9 +25,9 @@
import android.os.Message;
import android.util.Log;
-public class SearchManagerCtsActivity extends Activity {
+public class SearchManagerStubActivity extends Activity {
- private static final String TAG = "SearchManagerCtsActivity";
+ private static final String TAG = "SearchManagerStubActivity";
public static final String TEST_STOP_SEARCH = "stopSearch";
public static final String TEST_ON_DISMISSLISTENER = "setOnDismissListener";
diff --git a/tests/tests/app/src/android/app/cts/StubRemoteService.java b/tests/app/src/android/app/cts/StubRemoteService.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/StubRemoteService.java
rename to tests/app/src/android/app/cts/StubRemoteService.java
diff --git a/tests/tests/app/src/android/app/cts/TestDialog.java b/tests/app/src/android/app/cts/TestDialog.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/TestDialog.java
rename to tests/app/src/android/app/cts/TestDialog.java
diff --git a/tests/tests/app/src/android/app/cts/TestedActivity.java b/tests/app/src/android/app/cts/TestedActivity.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/TestedActivity.java
rename to tests/app/src/android/app/cts/TestedActivity.java
diff --git a/tests/tests/app/src/android/app/cts/TestedScreen.java b/tests/app/src/android/app/cts/TestedScreen.java
similarity index 100%
rename from tests/tests/app/src/android/app/cts/TestedScreen.java
rename to tests/app/src/android/app/cts/TestedScreen.java
diff --git a/tests/expectations/knownfailures.txt b/tests/expectations/knownfailures.txt
index 3916531..b8f7946 100644
--- a/tests/expectations/knownfailures.txt
+++ b/tests/expectations/knownfailures.txt
@@ -82,13 +82,6 @@
bug: 17496766
},
{
- description: "instrumentation target context and test context are the same after move test target inside the test itself",
- names: [
- "android.app.cts.InstrumentationTest#testContext"
- ],
- bug: 17614217
-},
-{
description: "Current implementation of uninstallAllUserCaCerts does not throw expected security exception, wait for fix from framework",
names: [
"android.admin.cts.DevicePolicyManagerTest#testUninstallAllUserCaCerts_failIfNotProfileOwner"
diff --git a/tests/tests/app/Android.mk b/tests/tests/app/Android.mk
index 136f072..39be0dc 100644
--- a/tests/tests/app/Android.mk
+++ b/tests/tests/app/Android.mk
@@ -26,8 +26,9 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner ctstestserver
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
- src/android/app/cts/ISecondary.aidl
LOCAL_PACKAGE_NAME := CtsAppTestCases
+LOCAL_INSTRUMENTATION_FOR := CtsAppTestStubs
+
include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/app/AndroidManifest.xml b/tests/tests/app/AndroidManifest.xml
index 6cafe80..08b0dda 100644
--- a/tests/tests/app/AndroidManifest.xml
+++ b/tests/tests/app/AndroidManifest.xml
@@ -20,269 +20,12 @@
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <permission android:name="android.app.cts.permission.TEST_GRANTED"
- android:protectionLevel="normal"
- android:label="@string/permlab_testGranted"
- android:description="@string/permdesc_testGranted">
- <meta-data android:name="android.app.cts.string" android:value="foo" />
- <meta-data android:name="android.app.cts.boolean" android:value="true" />
- <meta-data android:name="android.app.cts.integer" android:value="100" />
- <meta-data android:name="android.app.cts.color" android:value="#ff000000" />
- <meta-data android:name="android.app.cts.float" android:value="100.1" />
- <meta-data android:name="android.app.cts.reference" android:resource="@xml/metadata" />
- </permission>
-
- <uses-permission android:name="android.app.cts.permission.TEST_GRANTED" />
- <uses-permission android:name="android.permission.READ_CONTACTS" />
- <uses-permission android:name="android.permission.WRITE_CONTACTS" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
- <uses-permission android:name="android.permission.CAMERA" />
- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
- <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
- <application android:label="Android TestCase"
- android:icon="@drawable/size_48x48"
- android:maxRecents="1"
- android:multiArch="true"
- android:name="android.app.cts.MockApplication"
- android:supportsRtl="true">
+ <application>
<uses-library android:name="android.test.runner" />
-
- <activity android:name="android.app.cts.ActionBarActivity" />
-
- <activity android:name="android.app.cts.DialogCtsActivity"
- android:label="DialogCtsActivity"
- android:configChanges="keyboardHidden|orientation|screenSize">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
- </intent-filter>
- </activity>
-
- <activity android:name="android.app.cts.MockActivity" android:label="MockActivity">
- <meta-data android:name="android.app.alias"
- android:resource="@xml/alias" />
- <meta-data android:name="android.app.intent.filter"
- android:resource="@xml/intentfilter" />
- </activity>
-
- <activity android:name="android.app.cts.MockApplicationActivity"
- android:label="MockApplicationActivity">
- <intent-filter>
- <action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
- </intent-filter>
- </activity>
-
- <activity android:name="android.app.cts.InstrumentationTestActivity"
- android:theme="@style/Theme_NoSwipeDismiss"
- android:label="InstrumentationTestActivity">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.DEFAULT" />
- <data android:mimeType="vnd.android.cursor.dir/person" />
- </intent-filter>
- </activity>
-
- <activity android:name="android.app.cts.AliasActivityStub">
- <meta-data android:name="android.app.alias"
- android:resource="@xml/alias" />
- </activity>
-
- <activity android:name="android.app.cts.ChildActivity"
- android:label="ChildActivity" />
-
- <receiver android:name="android.app.cts.MockReceiver">
- <intent-filter>
- <action android:name="android.app.cts.PendingIntentTest.TEST_RECEIVER" />
- </intent-filter>
- </receiver>
-
- <service android:name="android.app.cts.MockService" />
-
- <activity android:name="android.app.cts.SearchManagerCtsActivity"
- android:label="SearchManagerCtsActivity">
- <intent-filter>
- <action android:name="android.intent.action.SEARCH" />
- <category android:name="android.intent.category.DEFAULT" />
- </intent-filter>
- <meta-data android:name="android.app.searchable" android:resource="@xml/searchable" />
- </activity>
-
- <service android:name="android.app.cts.LocalService">
- <intent-filter>
- <action android:name="android.app.cts.activity.SERVICE_LOCAL" />
- </intent-filter>
- <meta-data android:name="android.app.cts.string" android:value="foo" />
- <meta-data android:name="android.app.cts.boolean" android:value="true" />
- <meta-data android:name="android.app.cts.integer" android:value="100" />
- <meta-data android:name="android.app.cts.color" android:value="#ff000000" />
- <meta-data android:name="android.app.cts.float" android:value="100.1" />
- <meta-data android:name="android.app.cts.reference" android:resource="@xml/metadata" />
- </service>
-
- <service android:name="android.app.cts.LocalGrantedService"
- android:permission="android.app.cts.permission.TEST_GRANTED">
- <intent-filter>
- <action android:name="android.app.cts.activity.SERVICE_LOCAL_GRANTED" />
- </intent-filter>
- </service>
-
- <service android:name="android.app.cts.LocalDeniedService"
- android:permission="android.app.cts.permission.TEST_DENIED">
- <intent-filter>
- <action android:name="android.app.cts.activity.SERVICE_LOCAL_DENIED" />
- </intent-filter>
- </service>
-
- <activity android:name="android.app.cts.TestedScreen"
- android:process=":remoteScreen">
- </activity>
- <activity android:name="android.app.cts.LocalScreen" android:multiprocess="true">
- </activity>
- <activity android:name="android.app.cts.ClearTop" android:multiprocess="true"
- android:launchMode="singleTop">
- </activity>
- <activity android:name="android.app.cts.LocalDialog" android:multiprocess="true"
- android:theme="@android:style/Theme.Dialog">
- </activity>
-
- <activity android:name="android.app.cts.PendingIntentCtsActivity"
- android:label="PendingIntentCtsActivity"/>
-
- <activity android:name="android.app.cts.LocalActivityManagerCtsActivity"
- android:label="LocalActivityManagerCtsActivity" />
-
- <activity android:name="android.app.cts.LocalActivityManagerTestHelper"
- android:label="LocalActivityManagerTestHelper" />
-
- <activity android:name="android.app.cts.LaunchpadTabActivity" android:multiprocess="true">
- </activity>
-
- <activity android:name="android.app.cts.LocalActivity" android:multiprocess="true">
- <meta-data android:name="android.app.cts.string" android:value="foo" />
- <meta-data android:name="android.app.cts.boolean" android:value="true" />
- <meta-data android:name="android.app.cts.integer" android:value="100" />
- <meta-data android:name="android.app.cts.color" android:value="#ff000000" />
- <meta-data android:name="android.app.cts.float" android:value="100.1" />
- <meta-data android:name="android.app.cts.reference" android:resource="@xml/metadata" />
- </activity>
-
- <activity android:name="android.app.cts.TestedActivity"
- android:process=":remoteActivity">
- </activity>
-
- <activity android:name="android.app.cts.ExpandableListTestActivity"
- android:label="ExpandableListTestActivity">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
- </intent-filter>
- </activity>
-
- <activity android:name="android.app.cts.ChildTabActivity" android:label="ChildTabActivity" />
-
- <activity android:name="android.app.cts.LauncherActivityStub"
- android:label="LauncherActivityStub" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN"/>
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
- </intent-filter>
- </activity>
-
- <activity android:name="android.app.cts.MockTabActivity" android:label="MockTabActivity" />
-
- <activity android:name="android.app.cts.AppCtsActivity" android:label="AppCtsActivity">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
- </intent-filter>
- </activity>
-
- <activity android:name="android.app.cts.DialogCtsActivity"
- android:theme="@style/Theme_NoSwipeDismiss"
- android:label="DialogCtsActivity">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
- </intent-filter>
- </activity>
-
- <activity android:name="android.app.cts.ActivityManagerStubFooActivity"
- android:label="ActivityManagerStubFooActivity">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
- </intent-filter>
- </activity>
-
- <activity android:name="android.app.cts.ActivityManagerRecentOneActivity"
- android:label="ActivityManagerRecentOneActivity"
- android:allowTaskReparenting="true"
- android:taskAffinity="android.app.cts.recentOne">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- </intent-filter>
- </activity>
-
- <activity android:name="android.app.cts.ActivityManagerRecentTwoActivity"
- android:label="ActivityManagerRecentTwoActivity"
- android:allowTaskReparenting="true"
- android:taskAffinity="android.app.cts.recentTwo">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- </intent-filter>
- </activity>
-
- <activity android:name="android.app.cts.ActivityManagerStubCrashActivity"
- android:label="ActivityManagerStubCrashActivity"
- android:multiprocess="true"
- android:process=":ActivityManagerStubCrashActivity">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- </intent-filter>
- </activity>
-
- <service android:name="android.app.cts.StubRemoteService"
- android:process=":remote">
- <intent-filter>
- <action
- android:name="android.app.cts.ISecondary" />
- <action
- android:name="android.app.REMOTESERVICE" />
- </intent-filter>
- </service>
-
- <activity android:name="android.app.ActivityGroup"
- android:label="ActivityGroup" />
-
- <activity android:name="android.app.cts.KeyguardManagerActivity"
- android:label="KeyguardManagerActivity">
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST" />
- </intent-filter>
- </activity>
-
- <service android:name="android.app.cts.IntentServiceStub"/>
-
- <activity android:name="android.app.cts.LaunchpadActivity"
- android:configChanges="keyboardHidden|orientation|screenSize"
- android:multiprocess="true">
- </activity>
-
- <activity android:name="android.app.cts.ActivityManagerMemoryClassLaunchActivity" />
-
- <activity android:name="android.app.cts.ActivityManagerMemoryClassTestActivity"
- android:process=":memoryclass" />
-
</application>
<instrumentation android:name="android.support.test.runner.AndroidJUnitRunner"
- android:targetPackage="com.android.cts.app"
+ android:targetPackage="com.android.cts.app.stub"
android:label="CTS tests of android.app">
<meta-data android:name="listener"
android:value="com.android.cts.runner.CtsTestRunListener" />
diff --git a/tests/tests/app/src/android/app/backup/cts/BackupManagerTest.java b/tests/tests/app/src/android/app/backup/cts/BackupManagerTest.java
index 3ee1104..1b0a401 100644
--- a/tests/tests/app/src/android/app/backup/cts/BackupManagerTest.java
+++ b/tests/tests/app/src/android/app/backup/cts/BackupManagerTest.java
@@ -26,7 +26,7 @@
// Check that these don't crash as if they were called in an app...
BackupManager backupManager = new BackupManager(mContext);
backupManager.dataChanged();
- BackupManager.dataChanged("com.android.cts.app");
+ BackupManager.dataChanged("com.android.cts.app.stub");
// Backup isn't expected to work in this test but check for obvious bugs...
int result = backupManager.requestRestore(new RestoreObserver() {});
diff --git a/tests/tests/app/src/android/app/cts/ActivityManagerTest.java b/tests/tests/app/src/android/app/cts/ActivityManagerTest.java
index dfec7db..e633f1f 100644
--- a/tests/tests/app/src/android/app/cts/ActivityManagerTest.java
+++ b/tests/tests/app/src/android/app/cts/ActivityManagerTest.java
@@ -35,7 +35,7 @@
import android.test.InstrumentationTestCase;
public class ActivityManagerTest extends InstrumentationTestCase {
- private static final String STUB_PACKAGE_NAME = "com.android.cts.app";
+ private static final String STUB_PACKAGE_NAME = "com.android.cts.app.stub";
private static final int WAITFOR_MSEC = 5000;
private static final String SERVICE_NAME = "android.app.cts.MockService";
private static final int WAIT_TIME = 2000;
@@ -222,13 +222,13 @@
assertTrue(hasSystemProcess && hasTestProcess);
for (RunningAppProcessInfo ra : list) {
- if (ra.processName.equals("com.android.cts.app:remote")) {
- fail("should be no process named com.android.cts.app:remote");
+ if (ra.processName.equals("com.android.cts.app.stub:remote")) {
+ fail("should be no process named com.android.cts.app.stub:remote");
}
}
// start a new process
mIntent = new Intent("android.app.REMOTESERVICE");
- mIntent.setPackage("com.android.cts.app");
+ mIntent.setPackage("com.android.cts.app.stub");
mInstrumentation.getTargetContext().startService(mIntent);
Thread.sleep(WAITFOR_MSEC);
@@ -236,11 +236,11 @@
assertTrue(list.size() <= listNew.size());
for (RunningAppProcessInfo ra : listNew) {
- if (ra.processName.equals("com.android.cts.app:remote")) {
+ if (ra.processName.equals("com.android.cts.app.stub:remote")) {
return;
}
}
- fail("com.android.cts.app:remote process should be available");
+ fail("com.android.cts.app.stub:remote process should be available");
}
public void testGetProcessInErrorState() throws Exception {
diff --git a/tests/tests/app/src/android/app/cts/AlertDialogTest.java b/tests/tests/app/src/android/app/cts/AlertDialogTest.java
index a35fd9c..3e9f3b2 100644
--- a/tests/tests/app/src/android/app/cts/AlertDialogTest.java
+++ b/tests/tests/app/src/android/app/cts/AlertDialogTest.java
@@ -35,17 +35,17 @@
/*
* Test AlertDialog
*/
-public class AlertDialogTest extends ActivityInstrumentationTestCase2<DialogCtsActivity> {
+public class AlertDialogTest extends ActivityInstrumentationTestCase2<DialogStubActivity> {
private static final String ALERTDIALOG_CUSTOM_TITLE = "Hello, World!";
private Instrumentation mInstrumentation;
- private DialogCtsActivity mActivity;
+ private DialogStubActivity mActivity;
private Button mPositiveButton;
private Button mNegativeButton;
private Button mNeutralButton;
public AlertDialogTest() {
- super("com.android.cts.app", DialogCtsActivity.class);
+ super("com.android.cts.app.stub", DialogStubActivity.class);
}
@Override
@@ -55,7 +55,7 @@
}
protected void startDialogActivity(int dialogNumber) {
- mActivity = DialogCtsActivity.startDialogActivity(this, dialogNumber);
+ mActivity = DialogStubActivity.startDialogActivity(this, dialogNumber);
new PollingCheck() {
@Override
protected boolean check() {
@@ -65,7 +65,7 @@
}
public void testAlertDialog() throws Throwable {
- doTestAlertDialog(DialogCtsActivity.TEST_ALERTDIALOG);
+ doTestAlertDialog(DialogStubActivity.TEST_ALERTDIALOG);
}
private void doTestAlertDialog(int index) throws Throwable {
@@ -75,17 +75,17 @@
mPositiveButton = ((AlertDialog) (mActivity.getDialog())).getButton(
DialogInterface.BUTTON_POSITIVE);
assertNotNull(mPositiveButton);
- assertEquals(mActivity.getString(com.android.cts.app.R.string.alert_dialog_positive),
+ assertEquals(mActivity.getString(com.android.cts.app.stub.R.string.alert_dialog_positive),
mPositiveButton.getText());
mNeutralButton = ((AlertDialog) (mActivity.getDialog())).getButton(
DialogInterface.BUTTON_NEUTRAL);
assertNotNull(mNeutralButton);
- assertEquals(mActivity.getString(com.android.cts.app.R.string.alert_dialog_neutral),
+ assertEquals(mActivity.getString(com.android.cts.app.stub.R.string.alert_dialog_neutral),
mNeutralButton.getText());
mNegativeButton = ((AlertDialog) (mActivity.getDialog())).getButton(
DialogInterface.BUTTON_NEGATIVE);
assertNotNull(mNegativeButton);
- assertEquals(mActivity.getString(com.android.cts.app.R.string.alert_dialog_negative),
+ assertEquals(mActivity.getString(com.android.cts.app.stub.R.string.alert_dialog_negative),
mNegativeButton.getText());
assertFalse(mActivity.isPositiveButtonClicked);
@@ -102,40 +102,40 @@
}
public void testAlertDialogDeprecatedAPI() throws Throwable {
- doTestAlertDialog(DialogCtsActivity.TEST_ALERTDIALOG_DEPRECATED);
+ doTestAlertDialog(DialogStubActivity.TEST_ALERTDIALOG_DEPRECATED);
}
public void testAlertDialogDeprecatedAPIWithMessage() throws Throwable {
- startDialogActivity(DialogCtsActivity.TEST_ALERTDIALOG_DEPRECATED_WITH_MESSAGE);
+ startDialogActivity(DialogStubActivity.TEST_ALERTDIALOG_DEPRECATED_WITH_MESSAGE);
assertTrue(mActivity.getDialog().isShowing());
mPositiveButton = ((AlertDialog) (mActivity.getDialog())).getButton(
DialogInterface.BUTTON_POSITIVE);
assertNotNull(mPositiveButton);
- assertEquals(mActivity.getString(com.android.cts.app.R.string.alert_dialog_positive),
+ assertEquals(mActivity.getString(com.android.cts.app.stub.R.string.alert_dialog_positive),
mPositiveButton.getText());
mNegativeButton = ((AlertDialog) (mActivity.getDialog())).getButton(
DialogInterface.BUTTON_NEGATIVE);
assertNotNull(mNegativeButton);
- assertEquals(mActivity.getString(com.android.cts.app.R.string.alert_dialog_negative),
+ assertEquals(mActivity.getString(com.android.cts.app.stub.R.string.alert_dialog_negative),
mNegativeButton.getText());
mNeutralButton = ((AlertDialog) (mActivity.getDialog())).getButton(
DialogInterface.BUTTON_NEUTRAL);
assertNotNull(mNeutralButton);
- assertEquals(mActivity.getString(com.android.cts.app.R.string.alert_dialog_neutral),
+ assertEquals(mActivity.getString(com.android.cts.app.stub.R.string.alert_dialog_neutral),
mNeutralButton.getText());
- DialogCtsActivity.buttonIndex = 0;
+ DialogStubActivity.buttonIndex = 0;
performClick(mPositiveButton);
- assertEquals(DialogInterface.BUTTON_POSITIVE, DialogCtsActivity.buttonIndex);
+ assertEquals(DialogInterface.BUTTON_POSITIVE, DialogStubActivity.buttonIndex);
- DialogCtsActivity.buttonIndex = 0;
+ DialogStubActivity.buttonIndex = 0;
performClick(mNeutralButton);
- assertEquals(DialogInterface.BUTTON_NEUTRAL, DialogCtsActivity.buttonIndex);
+ assertEquals(DialogInterface.BUTTON_NEUTRAL, DialogStubActivity.buttonIndex);
- DialogCtsActivity.buttonIndex = 0;
+ DialogStubActivity.buttonIndex = 0;
performClick(mNegativeButton);
- assertEquals(DialogInterface.BUTTON_NEGATIVE, DialogCtsActivity.buttonIndex);
+ assertEquals(DialogInterface.BUTTON_NEGATIVE, DialogStubActivity.buttonIndex);
}
private void performClick(final Button button) throws Throwable {
@@ -148,18 +148,18 @@
}
public void testCustomAlertDialog() {
- startDialogActivity(DialogCtsActivity.TEST_CUSTOM_ALERTDIALOG);
+ startDialogActivity(DialogStubActivity.TEST_CUSTOM_ALERTDIALOG);
assertTrue(mActivity.getDialog().isShowing());
}
public void testCustomAlertDialogView() {
- startDialogActivity(DialogCtsActivity.TEST_CUSTOM_ALERTDIALOG_VIEW);
+ startDialogActivity(DialogStubActivity.TEST_CUSTOM_ALERTDIALOG_VIEW);
assertTrue(mActivity.getDialog().isShowing());
}
public void testCallback() {
- startDialogActivity(DialogCtsActivity.TEST_ALERTDIALOG_CALLBACK);
+ startDialogActivity(DialogStubActivity.TEST_ALERTDIALOG_CALLBACK);
assertTrue(mActivity.onCreateCalled);
mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_0);
@@ -169,12 +169,12 @@
}
public void testAlertDialogTheme() throws Exception {
- startDialogActivity(DialogCtsActivity.TEST_ALERTDIALOG_THEME);
+ startDialogActivity(DialogStubActivity.TEST_ALERTDIALOG_THEME);
assertTrue(mActivity.getDialog().isShowing());
}
public void testAlertDialogCancelable() throws Exception {
- startDialogActivity(DialogCtsActivity.TEST_ALERTDIALOG_CANCELABLE);
+ startDialogActivity(DialogStubActivity.TEST_ALERTDIALOG_CANCELABLE);
assertTrue(mActivity.getDialog().isShowing());
assertFalse(mActivity.onCancelCalled);
mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_BACK);
@@ -183,7 +183,7 @@
}
public void testAlertDialogNotCancelable() throws Exception {
- startDialogActivity(DialogCtsActivity.TEST_ALERTDIALOG_NOT_CANCELABLE);
+ startDialogActivity(DialogStubActivity.TEST_ALERTDIALOG_NOT_CANCELABLE);
assertTrue(mActivity.getDialog().isShowing());
assertFalse(mActivity.onCancelCalled);
mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_BACK);
diff --git a/tests/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java b/tests/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
index b07a4d5..9554438 100644
--- a/tests/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
+++ b/tests/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
@@ -47,7 +47,7 @@
import android.widget.AdapterView.OnItemSelectedListener;
-public class AlertDialog_BuilderTest extends ActivityInstrumentationTestCase2<DialogCtsActivity> {
+public class AlertDialog_BuilderTest extends ActivityInstrumentationTestCase2<DialogStubActivity> {
private Builder mBuilder;
private Context mContext;
private Instrumentation mInstrumentation;
@@ -127,7 +127,7 @@
}
public AlertDialog_BuilderTest() {
- super("com.android.cts.app", DialogCtsActivity.class);
+ super("com.android.cts.app.stub", DialogStubActivity.class);
}
public void testConstructor() {
@@ -208,14 +208,14 @@
runTestOnUiThread(new Runnable() {
public void run() {
mBuilder = new AlertDialog.Builder(mContext);
- mBuilder.setNegativeButton(com.android.cts.app.R.string.notify, mOnClickListener);
+ mBuilder.setNegativeButton(com.android.cts.app.stub.R.string.notify, mOnClickListener);
mDialog = mBuilder.show();
mButton = mDialog.getButton(DialogInterface.BUTTON_NEGATIVE);
mButton.performClick();
}
});
mInstrumentation.waitForIdleSync();
- assertEquals(mContext.getText(com.android.cts.app.R.string.notify), mButton.getText());
+ assertEquals(mContext.getText(com.android.cts.app.stub.R.string.notify), mButton.getText());
assertTrue(mResult);
}
@@ -223,14 +223,14 @@
runTestOnUiThread(new Runnable() {
public void run() {
mBuilder = new AlertDialog.Builder(mContext);
- mBuilder.setNeutralButton(com.android.cts.app.R.string.notify, mOnClickListener);
+ mBuilder.setNeutralButton(com.android.cts.app.stub.R.string.notify, mOnClickListener);
mDialog = mBuilder.show();
mButton = mDialog.getButton(DialogInterface.BUTTON_NEUTRAL);
mButton.performClick();
}
});
mInstrumentation.waitForIdleSync();
- assertEquals(mContext.getText(com.android.cts.app.R.string.notify), mButton.getText());
+ assertEquals(mContext.getText(com.android.cts.app.stub.R.string.notify), mButton.getText());
assertTrue(mResult);
}
@@ -321,7 +321,7 @@
runTestOnUiThread(new Runnable() {
public void run() {
mBuilder = new AlertDialog.Builder(mContext);
- mBuilder.setItems(com.android.cts.app.R.array.difficultyLevel, mOnClickListener);
+ mBuilder.setItems(com.android.cts.app.stub.R.array.difficultyLevel, mOnClickListener);
mDialog = mBuilder.show();
mListView = mDialog.getListView();
}
@@ -329,13 +329,13 @@
mInstrumentation.waitForIdleSync();
final CharSequence[] levels = mContext.getResources().getTextArray(
- com.android.cts.app.R.array.difficultyLevel);
+ com.android.cts.app.stub.R.array.difficultyLevel);
assertEquals(levels[0], mListView.getItemAtPosition(0));
}
public void testSetItemsWithParamCharSequence() throws Throwable {
final CharSequence[] expect = mContext.getResources().getTextArray(
- com.android.cts.app.R.array.difficultyLevel);
+ com.android.cts.app.stub.R.array.difficultyLevel);
runTestOnUiThread(new Runnable() {
public void run() {
@@ -386,12 +386,12 @@
public void testSetMultiChoiceItemsWithParamInt() throws Throwable {
final CharSequence[] items = mContext.getResources().getTextArray(
- com.android.cts.app.R.array.difficultyLevel);
+ com.android.cts.app.stub.R.array.difficultyLevel);
runTestOnUiThread(new Runnable() {
public void run() {
mBuilder = new AlertDialog.Builder(mContext);
- mBuilder.setMultiChoiceItems(com.android.cts.app.R.array.difficultyLevel, null,
+ mBuilder.setMultiChoiceItems(com.android.cts.app.stub.R.array.difficultyLevel, null,
mOnMultiChoiceClickListener);
mDialog = mBuilder.show();
mListView = mDialog.getListView();
@@ -409,7 +409,7 @@
public void testSetMultiChoiceItemsWithParamCharSequence() throws Throwable {
final CharSequence[] items = mContext.getResources().getTextArray(
- com.android.cts.app.R.array.difficultyLevel);
+ com.android.cts.app.stub.R.array.difficultyLevel);
runTestOnUiThread(new Runnable() {
public void run() {
@@ -454,12 +454,12 @@
public void testSetSingleChoiceItemsWithParamInt() throws Throwable {
final CharSequence[] items = mContext.getResources().getTextArray(
- com.android.cts.app.R.array.difficultyLevel);
+ com.android.cts.app.stub.R.array.difficultyLevel);
runTestOnUiThread(new Runnable() {
public void run() {
mBuilder = new AlertDialog.Builder(mContext);
- mBuilder.setSingleChoiceItems(com.android.cts.app.R.array.difficultyLevel, 0,
+ mBuilder.setSingleChoiceItems(com.android.cts.app.stub.R.array.difficultyLevel, 0,
mOnClickListener);
mDialog = mBuilder.show();
mListView = mDialog.getListView();
@@ -507,7 +507,7 @@
public void testSetSingleChoiceItemsWithParamCharSequence() throws Throwable {
final CharSequence[] items = mContext.getResources().getTextArray(
- com.android.cts.app.R.array.difficultyLevel);
+ com.android.cts.app.stub.R.array.difficultyLevel);
runTestOnUiThread(new Runnable() {
public void run() {
@@ -527,7 +527,7 @@
public void testSetSingleChoiceItems() throws Throwable {
final CharSequence[] items = mContext.getResources().getTextArray(
- com.android.cts.app.R.array.difficultyLevel);
+ com.android.cts.app.stub.R.array.difficultyLevel);
runTestOnUiThread(new Runnable() {
public void run() {
@@ -552,7 +552,7 @@
public void run() {
mBuilder = new AlertDialog.Builder(mContext);
mBuilder.setOnItemSelectedListener(mOnItemSelectedListener);
- mBuilder.setItems(com.android.cts.app.R.array.difficultyLevel, mOnClickListener);
+ mBuilder.setItems(com.android.cts.app.stub.R.array.difficultyLevel, mOnClickListener);
mDialog = mBuilder.show();
mListView = mDialog.getListView();
mListView.pointToPosition(0, 0);
diff --git a/tests/tests/app/src/android/app/cts/DialogTest.java b/tests/tests/app/src/android/app/cts/DialogTest.java
index 2bbe346..56e731b 100644
--- a/tests/tests/app/src/android/app/cts/DialogTest.java
+++ b/tests/tests/app/src/android/app/cts/DialogTest.java
@@ -15,7 +15,7 @@
*/
package android.app.cts;
-import com.android.cts.app.R;
+import com.android.cts.app.stub.R;
import android.app.Dialog;
import android.app.Instrumentation;
@@ -50,10 +50,10 @@
import java.lang.ref.WeakReference;
-public class DialogTest extends ActivityInstrumentationTestCase2<DialogCtsActivity> {
+public class DialogTest extends ActivityInstrumentationTestCase2<DialogStubActivity> {
protected static final long SLEEP_TIME = 200;
- private static final String STUB_ACTIVITY_PACKAGE = "com.android.cts.app";
+ private static final String STUB_ACTIVITY_PACKAGE = "com.android.cts.app.stub";
private static final long TEST_TIMEOUT = 1000L;
/**
@@ -69,11 +69,11 @@
private Instrumentation mInstrumentation;
private Context mContext;
- private DialogCtsActivity mActivity;
+ private DialogStubActivity mActivity;
public DialogTest() {
- super(STUB_ACTIVITY_PACKAGE, DialogCtsActivity.class);
+ super(STUB_ACTIVITY_PACKAGE, DialogStubActivity.class);
}
@Override
@@ -84,7 +84,7 @@
}
private void startDialogActivity(int dialogNumber) {
- mActivity = DialogCtsActivity.startDialogActivity(this, dialogNumber);
+ mActivity = DialogStubActivity.startDialogActivity(this, dialogNumber);
}
@UiThreadTest
@@ -106,14 +106,14 @@
}
public void testConstructor_protectedCancellable() {
- startDialogActivity(DialogCtsActivity.TEST_PROTECTED_CANCELABLE);
+ startDialogActivity(DialogStubActivity.TEST_PROTECTED_CANCELABLE);
mActivity.onCancelListenerCalled = false;
sendKeys(KeyEvent.KEYCODE_BACK);
assertTrue(mActivity.onCancelListenerCalled);
}
public void testConstructor_protectedNotCancellable() {
- startDialogActivity(DialogCtsActivity.TEST_PROTECTED_NOT_CANCELABLE);
+ startDialogActivity(DialogStubActivity.TEST_PROTECTED_NOT_CANCELABLE);
mActivity.onCancelListenerCalled = false;
sendKeys(KeyEvent.KEYCODE_BACK);
assertFalse(mActivity.onCancelListenerCalled);
@@ -142,7 +142,7 @@
}
public void testOnStartCreateStop(){
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
final TestDialog d = (TestDialog) mActivity.getDialog();
assertTrue(d.isOnStartCalled);
@@ -154,7 +154,7 @@
}
public void testAccessOwnerActivity() throws Throwable {
- startDialogActivity(DialogCtsActivity.TEST_DIALOG_WITHOUT_THEME);
+ startDialogActivity(DialogStubActivity.TEST_DIALOG_WITHOUT_THEME);
Dialog d = mActivity.getDialog();
assertNotNull(d);
assertSame(mActivity, d.getOwnerActivity());
@@ -178,7 +178,7 @@
}
public void testShow() throws Throwable {
- startDialogActivity(DialogCtsActivity.TEST_DIALOG_WITHOUT_THEME);
+ startDialogActivity(DialogStubActivity.TEST_DIALOG_WITHOUT_THEME);
final Dialog d = mActivity.getDialog();
final View decor = d.getWindow().getDecorView();
@@ -206,7 +206,7 @@
}
public void testOnSaveInstanceState() {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
final TestDialog d = (TestDialog) mActivity.getDialog();
assertFalse(d.isOnSaveInstanceStateCalled);
@@ -226,7 +226,7 @@
}
public void testGetCurrentFocus() throws Throwable {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
final TestDialog d = (TestDialog) mActivity.getDialog();
assertNull(d.getCurrentFocus());
runTestOnUiThread(new Runnable() {
@@ -243,7 +243,7 @@
}
public void testSetContentView() throws Throwable {
- startDialogActivity(DialogCtsActivity.TEST_DIALOG_WITHOUT_THEME);
+ startDialogActivity(DialogStubActivity.TEST_DIALOG_WITHOUT_THEME);
final Dialog d = mActivity.getDialog();
assertNotNull(d);
@@ -317,7 +317,7 @@
public void testSetTitle() {
final String expectedTitle = "Test Dialog Without theme";
- startDialogActivity(DialogCtsActivity.TEST_DIALOG_WITHOUT_THEME);
+ startDialogActivity(DialogStubActivity.TEST_DIALOG_WITHOUT_THEME);
assertNotNull(mActivity.getDialog());
mActivity.setUpTitle(expectedTitle);
@@ -333,7 +333,7 @@
}
public void testOnKeyDownKeyUp() {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
final TestDialog d = (TestDialog) mActivity.getDialog();
assertFalse(d.isOnKeyDownCalled);
assertFalse(d.isOnKeyUpCalled);
@@ -352,7 +352,7 @@
}
public void testOnKeyMultiple() {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
final TestDialog d = (TestDialog) mActivity.getDialog();
assertNull(d.keyMultipleEvent);
@@ -364,7 +364,7 @@
}
public void testTouchEvent() {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
final TestDialog d = (TestDialog) mActivity.getDialog();
assertNull(d.onTouchEvent);
@@ -415,7 +415,7 @@
}
public void testTrackballEvent() {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
final TestDialog d = (TestDialog) mActivity.getDialog();
long eventTime = SystemClock.uptimeMillis();
final MotionEvent trackBallEvent = MotionEvent.obtain(eventTime, eventTime,
@@ -444,7 +444,7 @@
}
public void testOnWindowAttributesChanged() throws Throwable {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
final TestDialog d = (TestDialog) mActivity.getDialog();
assertTrue(d.isOnWindowAttributesChangedCalled);
@@ -464,7 +464,7 @@
}
public void testOnContentChanged() throws Throwable {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
final TestDialog d = (TestDialog) mActivity.getDialog();
assertNotNull(d);
@@ -481,7 +481,7 @@
}
public void testOnWindowFocusChanged() throws Throwable {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
final TestDialog d = (TestDialog) mActivity.getDialog();
assertTrue(d.isOnWindowFocusChangedCalled);
d.isOnWindowFocusChangedCalled = false;
@@ -489,7 +489,7 @@
// show a new dialog, the new dialog get focus
runTestOnUiThread(new Runnable() {
public void run() {
- mActivity.showDialog(DialogCtsActivity.TEST_DIALOG_WITHOUT_THEME);
+ mActivity.showDialog(DialogStubActivity.TEST_DIALOG_WITHOUT_THEME);
}
});
mInstrumentation.waitForIdleSync();
@@ -503,7 +503,7 @@
}
public void testDispatchKeyEvent() {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
final TestDialog d = (TestDialog) mActivity.getDialog();
sendKeys(KeyEvent.KEYCODE_0);
@@ -551,7 +551,7 @@
* the user canceling the menu with the back/menu button, or when an item is selected).
*/
public void testContextMenu() throws Throwable {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
final TestDialog d = (TestDialog) mActivity.getDialog();
final LinearLayout parent = new LinearLayout(mContext);
final MockView v = new MockView(mContext);
@@ -627,7 +627,7 @@
}
public void testTakeKeyEvents() throws Throwable {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
final TestDialog d = (TestDialog) mActivity.getDialog();
final View v = d.getWindow().getDecorView();
assertNull(d.getCurrentFocus());
@@ -654,13 +654,13 @@
}
public void testRequestWindowFeature() {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
// called requestWindowFeature at TestDialog onCreate method
assertTrue(((TestDialog) mActivity.getDialog()).isRequestWindowFeature);
}
public void testSetFeatureDrawableResource() throws Throwable {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
runTestOnUiThread(new Runnable() {
public void run() {
mActivity.getDialog().setFeatureDrawableResource(Window.FEATURE_LEFT_ICON,
@@ -671,28 +671,28 @@
}
public void testSetFeatureDrawableUri() {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
mActivity.getDialog().setFeatureDrawableUri(0, Uri.parse("http://www.google.com"));
}
public void testSetFeatureDrawable() {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
mActivity.getDialog().setFeatureDrawable(0, new MockDrawable());
}
public void testSetFeatureDrawableAlpha() {
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
mActivity.getDialog().setFeatureDrawableAlpha(0, 0);
}
public void testGetLayoutInflater() {
- startDialogActivity(DialogCtsActivity.TEST_DIALOG_WITHOUT_THEME);
+ startDialogActivity(DialogStubActivity.TEST_DIALOG_WITHOUT_THEME);
final Dialog d = mActivity.getDialog();
assertEquals(d.getWindow().getLayoutInflater(), d.getLayoutInflater());
}
public void testSetCancelable_true() {
- startDialogActivity(DialogCtsActivity.TEST_DIALOG_WITHOUT_THEME);
+ startDialogActivity(DialogStubActivity.TEST_DIALOG_WITHOUT_THEME);
final Dialog d = mActivity.getDialog();
d.setCancelable(true);
@@ -702,7 +702,7 @@
}
public void testSetCancellable_false() {
- startDialogActivity(DialogCtsActivity.TEST_DIALOG_WITHOUT_THEME);
+ startDialogActivity(DialogStubActivity.TEST_DIALOG_WITHOUT_THEME);
final Dialog d = mActivity.getDialog();
d.setCancelable(false);
@@ -717,7 +717,7 @@
* 2. Set a listener to be invoked when the dialog is canceled.
*/
public void testCancel_listener() throws Throwable {
- startDialogActivity(DialogCtsActivity.TEST_DIALOG_WITHOUT_THEME);
+ startDialogActivity(DialogStubActivity.TEST_DIALOG_WITHOUT_THEME);
final Dialog d = mActivity.getDialog();
assertTrue(d.isShowing());
@@ -734,7 +734,7 @@
}
public void testCancel_noListener() throws Throwable {
- startDialogActivity(DialogCtsActivity.TEST_DIALOG_WITHOUT_THEME);
+ startDialogActivity(DialogStubActivity.TEST_DIALOG_WITHOUT_THEME);
final Dialog d = mActivity.getDialog();
assertTrue(d.isShowing());
@@ -748,7 +748,7 @@
public void testSetCancelMessage() throws Exception {
mCalledCallback = false;
- startDialogActivity(DialogCtsActivity.TEST_ONSTART_AND_ONSTOP);
+ startDialogActivity(DialogStubActivity.TEST_ONSTART_AND_ONSTOP);
final TestDialog d = (TestDialog) mActivity.getDialog();
final HandlerThread ht = new HandlerThread("DialogTest");
ht.start();
@@ -775,7 +775,7 @@
*/
public void testSetOnDismissListener_listener() throws Throwable {
mCalledCallback = false;
- startDialogActivity(DialogCtsActivity.TEST_DIALOG_WITHOUT_THEME);
+ startDialogActivity(DialogStubActivity.TEST_DIALOG_WITHOUT_THEME);
final Dialog d = mActivity.getDialog();
d.setOnDismissListener(new OnDismissListener() {
@@ -792,7 +792,7 @@
}
public void testSetOnDismissListener_noListener() throws Throwable {
- startDialogActivity(DialogCtsActivity.TEST_DIALOG_WITHOUT_THEME);
+ startDialogActivity(DialogStubActivity.TEST_DIALOG_WITHOUT_THEME);
final Dialog d = mActivity.getDialog();
assertTrue(d.isShowing());
mCalledCallback = false;
@@ -804,7 +804,7 @@
public void testSetDismissMessage() throws Throwable {
mCalledCallback = false;
- startDialogActivity(DialogCtsActivity.TEST_DIALOG_WITHOUT_THEME);
+ startDialogActivity(DialogStubActivity.TEST_DIALOG_WITHOUT_THEME);
final Dialog d = mActivity.getDialog();
final HandlerThread ht = new HandlerThread("DialogTest");
diff --git a/tests/tests/app/src/android/app/cts/InstrumentationTest.java b/tests/tests/app/src/android/app/cts/InstrumentationTest.java
index f528789..0c2e9fa 100644
--- a/tests/tests/app/src/android/app/cts/InstrumentationTest.java
+++ b/tests/tests/app/src/android/app/cts/InstrumentationTest.java
@@ -16,7 +16,7 @@
package android.app.cts;
-import com.android.cts.app.R;
+import com.android.cts.app.stub.R;
import android.app.Activity;
import android.app.Application;
diff --git a/tests/tests/app/src/android/app/cts/KeyguardManagerTest.java b/tests/tests/app/src/android/app/cts/KeyguardManagerTest.java
index 3f04340..cb7cd4a 100644
--- a/tests/tests/app/src/android/app/cts/KeyguardManagerTest.java
+++ b/tests/tests/app/src/android/app/cts/KeyguardManagerTest.java
@@ -27,7 +27,7 @@
private static final String TAG = "KeyguardManagerTest";
public KeyguardManagerTest() {
- super("com.android.cts.app", KeyguardManagerActivity.class);
+ super("com.android.cts.app.stub", KeyguardManagerActivity.class);
}
public void testNewKeyguardLock() {
diff --git a/tests/tests/app/src/android/app/cts/LauncherActivityTest.java b/tests/tests/app/src/android/app/cts/LauncherActivityTest.java
index 040ff83..3eea0b7 100644
--- a/tests/tests/app/src/android/app/cts/LauncherActivityTest.java
+++ b/tests/tests/app/src/android/app/cts/LauncherActivityTest.java
@@ -36,7 +36,7 @@
private LauncherActivityStub mActivity;
public LauncherActivityTest() {
- super("com.android.cts.app", LauncherActivityStub.class);
+ super("com.android.cts.app.stub", LauncherActivityStub.class);
}
@Override
diff --git a/tests/tests/app/src/android/app/cts/LauncherActivity_IconResizerTest.java b/tests/tests/app/src/android/app/cts/LauncherActivity_IconResizerTest.java
index e36cf57..2fdc8ec 100644
--- a/tests/tests/app/src/android/app/cts/LauncherActivity_IconResizerTest.java
+++ b/tests/tests/app/src/android/app/cts/LauncherActivity_IconResizerTest.java
@@ -16,7 +16,7 @@
package android.app.cts;
-import com.android.cts.app.R;
+import com.android.cts.app.stub.R;
import android.app.LauncherActivity;
@@ -27,7 +27,7 @@
public class LauncherActivity_IconResizerTest extends
ActivityInstrumentationTestCase2<LauncherActivityStub> {
- private static final String PACKAGE = "com.android.cts.app";
+ private static final String PACKAGE = "com.android.cts.app.stub";
private LauncherActivityStub mActivity;
public LauncherActivity_IconResizerTest() {
diff --git a/tests/tests/app/src/android/app/cts/NotificationManagerTest.java b/tests/tests/app/src/android/app/cts/NotificationManagerTest.java
index 94b410f..9a895ea 100644
--- a/tests/tests/app/src/android/app/cts/NotificationManagerTest.java
+++ b/tests/tests/app/src/android/app/cts/NotificationManagerTest.java
@@ -24,7 +24,7 @@
import android.provider.Telephony.Threads;
import android.test.AndroidTestCase;
-import com.android.cts.app.R;
+import com.android.cts.app.stub.R;
public class NotificationManagerTest extends AndroidTestCase {
diff --git a/tests/tests/app/src/android/app/cts/PendingIntentTest.java b/tests/tests/app/src/android/app/cts/PendingIntentTest.java
index fb32291..d2c1b31 100644
--- a/tests/tests/app/src/android/app/cts/PendingIntentTest.java
+++ b/tests/tests/app/src/android/app/cts/PendingIntentTest.java
@@ -95,11 +95,11 @@
}
public void testGetActivity() throws InterruptedException, CanceledException {
- PendingIntentCtsActivity.status = PendingIntentCtsActivity.INVALIDATE;
+ PendingIntentStubActivity.status = PendingIntentStubActivity.INVALIDATE;
mPendingIntent = null;
mIntent = new Intent();
- mIntent.setClass(mContext, PendingIntentCtsActivity.class);
+ mIntent.setClass(mContext, PendingIntentStubActivity.class);
mIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
mPendingIntent = PendingIntent.getActivity(mContext, 1, mIntent,
PendingIntent.FLAG_CANCEL_CURRENT);
@@ -109,7 +109,7 @@
Thread.sleep(WAIT_TIME);
assertNotNull(mPendingIntent);
- assertEquals(PendingIntentCtsActivity.status, PendingIntentCtsActivity.ON_CREATE);
+ assertEquals(PendingIntentStubActivity.status, PendingIntentStubActivity.ON_CREATE);
// test getActivity return null
mPendingIntent.cancel();
diff --git a/tests/tests/app/src/android/app/cts/ProgressDialogTest.java b/tests/tests/app/src/android/app/cts/ProgressDialogTest.java
index 106b504..038b57b 100644
--- a/tests/tests/app/src/android/app/cts/ProgressDialogTest.java
+++ b/tests/tests/app/src/android/app/cts/ProgressDialogTest.java
@@ -50,7 +50,7 @@
private MockActivity mActivity;
public ProgressDialogTest() {
- super("com.android.cts.app", MockActivity.class);
+ super("com.android.cts.app.stub", MockActivity.class);
}
@Override
@@ -62,7 +62,7 @@
mActivity = getActivity();
mContext = mActivity;
mDrawable = getActivity().getResources().getDrawable(
- com.android.cts.app.R.drawable.yellow);
+ com.android.cts.app.stub.R.drawable.yellow);
}
@UiThreadTest
@@ -72,7 +72,7 @@
@UiThreadTest
public void testProgressDialog2(){
- new ProgressDialog(mContext, com.android.cts.app.R.style.Theme_AlertDialog);
+ new ProgressDialog(mContext, com.android.cts.app.stub.R.style.Theme_AlertDialog);
}
@UiThreadTest
diff --git a/tests/tests/app/src/android/app/cts/SearchManagerTest.java b/tests/tests/app/src/android/app/cts/SearchManagerTest.java
index ef7a0e0..8e465e8 100644
--- a/tests/tests/app/src/android/app/cts/SearchManagerTest.java
+++ b/tests/tests/app/src/android/app/cts/SearchManagerTest.java
@@ -24,25 +24,25 @@
Intent intent = new Intent();
intent.setAction(action);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- intent.setClass(getInstrumentation().getTargetContext(), SearchManagerCtsActivity.class);
+ intent.setClass(getInstrumentation().getTargetContext(), SearchManagerStubActivity.class);
getInstrumentation().getTargetContext().startActivity(intent);
}
public void testStopSearch() throws InterruptedException {
- SearchManagerCtsActivity.setCTSResult(this);
- setupActivity(SearchManagerCtsActivity.TEST_STOP_SEARCH);
+ SearchManagerStubActivity.setCTSResult(this);
+ setupActivity(SearchManagerStubActivity.TEST_STOP_SEARCH);
waitForResult();
}
public void testSetOnDismissListener() throws InterruptedException {
- SearchManagerCtsActivity.setCTSResult(this);
- setupActivity(SearchManagerCtsActivity.TEST_ON_DISMISSLISTENER);
+ SearchManagerStubActivity.setCTSResult(this);
+ setupActivity(SearchManagerStubActivity.TEST_ON_DISMISSLISTENER);
waitForResult();
}
public void testSetOnCancelListener() throws InterruptedException {
- SearchManagerCtsActivity.setCTSResult(this);
- setupActivity(SearchManagerCtsActivity.TEST_ON_CANCELLISTENER);
+ SearchManagerStubActivity.setCTSResult(this);
+ setupActivity(SearchManagerStubActivity.TEST_ON_CANCELLISTENER);
waitForResult();
}
}
diff --git a/tests/tests/app/src/android/app/cts/TabActivityTest.java b/tests/tests/app/src/android/app/cts/TabActivityTest.java
index 403b393..9c028a1 100644
--- a/tests/tests/app/src/android/app/cts/TabActivityTest.java
+++ b/tests/tests/app/src/android/app/cts/TabActivityTest.java
@@ -61,7 +61,7 @@
}
});
mInstrumentation.waitForIdleSync();
- final String packageName = "com.android.cts.app";
+ final String packageName = "com.android.cts.app.stub";
final Intent intent = new Intent(Intent.ACTION_MAIN);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setClassName(packageName, MockTabActivity.class.getName());
diff --git a/tests/tests/app/src/android/app/cts/TimePickerDialogTest.java b/tests/tests/app/src/android/app/cts/TimePickerDialogTest.java
index 2fe2d69..79a91a1 100644
--- a/tests/tests/app/src/android/app/cts/TimePickerDialogTest.java
+++ b/tests/tests/app/src/android/app/cts/TimePickerDialogTest.java
@@ -28,7 +28,7 @@
/**
* Test {@link TimePickerDialog}.
*/
-public class TimePickerDialogTest extends ActivityInstrumentationTestCase2<DialogCtsActivity> {
+public class TimePickerDialogTest extends ActivityInstrumentationTestCase2<DialogStubActivity> {
private static final String HOUR = "hour";
private static final String MINUTE = "minute";
private static final String IS_24_HOUR = "is24hour";
@@ -42,10 +42,10 @@
private OnTimeSetListener mOnTimeSetListener;
private Context mContext;
- private DialogCtsActivity mActivity;
+ private DialogStubActivity mActivity;
public TimePickerDialogTest() {
- super("com.android.cts.app", DialogCtsActivity.class);
+ super("com.android.cts.app.stub", DialogStubActivity.class);
}
@Override
@@ -74,7 +74,7 @@
int minute = 13;
tD = new TimePickerDialog(
- mContext, com.android.cts.app.R.style.Theme_AlertDialog,
+ mContext, com.android.cts.app.stub.R.style.Theme_AlertDialog,
mOnTimeSetListener, TARGET_HOUR, minute, false);
b = tD.onSaveInstanceState();
@@ -95,7 +95,7 @@
public void testOnTimeChanged() throws Throwable {
final int minute = 34;
- startDialogActivity(DialogCtsActivity.TEST_TIMEPICKERDIALOG);
+ startDialogActivity(DialogStubActivity.TEST_TIMEPICKERDIALOG);
final TimePickerDialog d = (TimePickerDialog) mActivity.getDialog();
runTestOnUiThread(new Runnable() {
@@ -140,7 +140,7 @@
}
private void startDialogActivity(int dialogNumber) {
- mActivity = DialogCtsActivity.startDialogActivity(this, dialogNumber);
+ mActivity = DialogStubActivity.startDialogActivity(this, dialogNumber);
}
private TimePickerDialog buildDialog() {
