LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Merging emulator smoke test projects" into master-nova

Browse Source
This commit is contained in:
Evan Charlton
2014-03-04 01:30:36 +00:00
committed by Android (Google) Code Review
parent 8f31accd3d b99f97d38e
commit 311e3662bd
10 changed files with 13 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/sdk.atree
View File

@@ -393,7 +393,5 @@ development/samples/Support7Demos
# Tests Component # Tests Component
############################################################################## ##############################################################################
framework/layoutlib-tests.jar tests/libtests/layoutlib-tests.jar framework/layoutlib-tests.jar tests/libtests/layoutlib-tests.jar
system/app/ConnectivityTest.apk tests/emulator-test-apps/ConnectivityTest.apk system/app/EmulatorSmokeTests.apk tests/emulator-test-apps/EmulatorSmokeTests.apk
system/app/GpsLocationTest.apk tests/emulator-test-apps/GpsLocationTest.apk
system/app/SmsTest.apk tests/emulator-test-apps/SmsTest.apk

32
tools/emulator/test-apps/ConnectivityTest/Android.mk
View File

@@ -1,32 +0,0 @@
# Copyright (C) 2011 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)
LOCAL_MODULE_TAGS := optional
# Only compile source java files in this apk.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := ConnectivityTest
LOCAL_SDK_VERSION := 4
LOCAL_PROGUARD_ENABLED := disabled
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
include $(call all-makefiles-under,$(LOCAL_PATH))

27
tools/emulator/test-apps/ConnectivityTest/AndroidManifest.xml
View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2011 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.emulator.connectivity.test"
android:versionCode="1"
android:versionName="1.0">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-sdk android:minSdkVersion="4" />
<instrumentation android:targetPackage="com.android.emulator.connectivity.test" android:name="android.test.InstrumentationTestRunner" />
<application android:label="Connectivity Test">
<uses-library android:name="android.test.runner" />
</application>
</manifest>

32
tools/emulator/test-apps/GpsLocationTest/Android.mk
View File

@@ -1,32 +0,0 @@
# Copyright (C) 2011 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)
LOCAL_MODULE_TAGS := optional
# Only compile source java files in this apk.
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := GpsLocationTest
LOCAL_SDK_VERSION := 4
LOCAL_PROGUARD_ENABLED := disabled
include $(BUILD_PACKAGE)
# Use the following include to make our test apk.
include $(call all-makefiles-under,$(LOCAL_PATH))

27
tools/emulator/test-apps/GpsLocationTest/AndroidManifest.xml
View File

@@ -1,27 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2011 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.emulator.gps.test"
android:versionCode="1"
android:versionName="1.0">
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-sdk android:minSdkVersion="4" />
<instrumentation android:targetPackage="com.android.emulator.gps.test"
android:name="android.test.InstrumentationTestRunner" />
<application android:label="GPS Location Test">
<uses-library android:name="android.test.runner" />
</application>
</manifest>

2
tools/emulator/test-apps/SmsTest/Android.mk → tools/emulator/test-apps/SmokeTests/Android.mk
View File

@@ -22,7 +22,7 @@ LOCAL_MODULE_TAGS := optional
# Only compile source java files in this apk. # Only compile source java files in this apk.
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := SmsTest LOCAL_PACKAGE_NAME := EmulatorSmokeTests
LOCAL_SDK_VERSION := 4 LOCAL_SDK_VERSION := 4

9
tools/emulator/test-apps/SmsTest/AndroidManifest.xml → tools/emulator/test-apps/SmokeTests/AndroidManifest.xml
View File

@@ -14,11 +14,14 @@
limitations under the License. limitations under the License.
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.emulator.sms.test"> package="com.android.emulator.smoketests">
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_SMS" /> <uses-permission android:name="android.permission.READ_SMS" />
<uses-sdk android:minSdkVersion="4" /> <uses-sdk android:minSdkVersion="4" />
<instrumentation android:targetPackage="com.android.emulator.sms.test" <instrumentation android:targetPackage="com.android.emulator.smoketests"
android:name="android.support.test.runner.AndroidJUnitRunner" /> android:name="android.support.test.runner.AndroidJUnitRunner" />
<application android:label="Sms Test"> <application android:label="Emulator Smoke Tests">
</application> </application>
</manifest> </manifest>

2
tools/emulator/test-apps/ConnectivityTest/src/com/android/emulator/connectivity/test/ConnectivityTest.java → tools/emulator/test-apps/SmokeTests/src/com/android/emulator/smoketests/connectivity/ConnectivityTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package com.android.emulator.connectivity.test; package com.android.emulator.smoketests.connectivity;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;

2
tools/emulator/test-apps/GpsLocationTest/src/com/android/emulator/gps/test/GpsLocationTest.java → tools/emulator/test-apps/SmokeTests/src/com/android/emulator/smoketests/gps/GpsLocationTest.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.android.emulator.gps.test; package com.android.emulator.smoketests.gps;
import android.content.Context; import android.content.Context;
import android.location.Location; import android.location.Location;

4
tools/emulator/test-apps/SmsTest/src/com/android/emulator/sms/test/SmsTest.java → tools/emulator/test-apps/SmokeTests/src/com/android/emulator/smoketests/sms/SmsTest.java
View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.android.emulator.sms.test; package com.android.emulator.smoketests.sms;
import android.content.Context; import android.content.Context;
import android.content.ContentResolver; import android.content.ContentResolver;
@@ -52,8 +52,10 @@ public class SmsTest {
public void testReceivedSms() throws java.lang.InterruptedException { public void testReceivedSms() throws java.lang.InterruptedException {
Cursor c = getSmsCursor(); Cursor c = getSmsCursor();
c.moveToFirst(); c.moveToFirst();
String number = c.getString(c.getColumnIndexOrThrow("address")); String number = c.getString(c.getColumnIndexOrThrow("address"));
String body = c.getString(c.getColumnIndexOrThrow("body")); String body = c.getString(c.getColumnIndexOrThrow("body"));
c.close(); c.close();
assertEquals(NUMBER, number); assertEquals(NUMBER, number);