diff --git a/build/sdk.atree b/build/sdk.atree index d0c47ad7a..658709661 100644 --- a/build/sdk.atree +++ b/build/sdk.atree @@ -380,6 +380,5 @@ development/samples/Support7Demos # Tests Component ############################################################################## framework/layoutlib-tests.jar tests/libtests/layoutlib-tests.jar -system/app/ConnectivityTest.apk tests/emulator-test-apps/ConnectivityTest.apk -system/app/GpsLocationTest.apk tests/emulator-test-apps/GpsLocationTest.apk +system/app/EmulatorSmokeTests.apk tests/emulator-test-apps/EmulatorSmokeTests.apk diff --git a/tools/emulator/test-apps/ConnectivityTest/Android.mk b/tools/emulator/test-apps/ConnectivityTest/Android.mk deleted file mode 100644 index ca20d574a..000000000 --- a/tools/emulator/test-apps/ConnectivityTest/Android.mk +++ /dev/null @@ -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)) diff --git a/tools/emulator/test-apps/GpsLocationTest/AndroidManifest.xml b/tools/emulator/test-apps/GpsLocationTest/AndroidManifest.xml deleted file mode 100644 index 901855e8a..000000000 --- a/tools/emulator/test-apps/GpsLocationTest/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/tools/emulator/test-apps/GpsLocationTest/Android.mk b/tools/emulator/test-apps/SmokeTests/Android.mk similarity index 81% rename from tools/emulator/test-apps/GpsLocationTest/Android.mk rename to tools/emulator/test-apps/SmokeTests/Android.mk index 5f90f3a5b..41951ddfd 100644 --- a/tools/emulator/test-apps/GpsLocationTest/Android.mk +++ b/tools/emulator/test-apps/SmokeTests/Android.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2011 The Android Open Source Project +# Copyright (C) 2014 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. @@ -15,18 +15,18 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_STATIC_JAVA_LIBRARIES := android-test-lib + 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_PACKAGE_NAME := EmulatorSmokeTests 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)) +include $(BUILD_PACKAGE) diff --git a/tools/emulator/test-apps/ConnectivityTest/AndroidManifest.xml b/tools/emulator/test-apps/SmokeTests/AndroidManifest.xml similarity index 69% rename from tools/emulator/test-apps/ConnectivityTest/AndroidManifest.xml rename to tools/emulator/test-apps/SmokeTests/AndroidManifest.xml index 80f65cf80..fae7d5954 100644 --- a/tools/emulator/test-apps/ConnectivityTest/AndroidManifest.xml +++ b/tools/emulator/test-apps/SmokeTests/AndroidManifest.xml @@ -1,5 +1,5 @@ - + package="com.android.emulator.smoketests"> + + - - - + + - \ No newline at end of file + + diff --git a/tools/emulator/test-apps/ConnectivityTest/src/com/android/emulator/connectivity/test/ConnectivityTest.java b/tools/emulator/test-apps/SmokeTests/src/com/android/emulator/smoketests/connectivity/ConnectivityTest.java similarity index 97% rename from tools/emulator/test-apps/ConnectivityTest/src/com/android/emulator/connectivity/test/ConnectivityTest.java rename to tools/emulator/test-apps/SmokeTests/src/com/android/emulator/smoketests/connectivity/ConnectivityTest.java index 9931eb849..9fe1ebe77 100644 --- a/tools/emulator/test-apps/ConnectivityTest/src/com/android/emulator/connectivity/test/ConnectivityTest.java +++ b/tools/emulator/test-apps/SmokeTests/src/com/android/emulator/smoketests/connectivity/ConnectivityTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.emulator.connectivity.test; +package com.android.emulator.smoketests.connectivity; import java.io.IOException; import java.net.URL; diff --git a/tools/emulator/test-apps/GpsLocationTest/src/com/android/emulator/gps/test/GpsLocationTest.java b/tools/emulator/test-apps/SmokeTests/src/com/android/emulator/smoketests/gps/GpsLocationTest.java similarity index 98% rename from tools/emulator/test-apps/GpsLocationTest/src/com/android/emulator/gps/test/GpsLocationTest.java rename to tools/emulator/test-apps/SmokeTests/src/com/android/emulator/smoketests/gps/GpsLocationTest.java index 6eb38349a..1e0258c29 100644 --- a/tools/emulator/test-apps/GpsLocationTest/src/com/android/emulator/gps/test/GpsLocationTest.java +++ b/tools/emulator/test-apps/SmokeTests/src/com/android/emulator/smoketests/gps/GpsLocationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.emulator.gps.test; +package com.android.emulator.smoketests.gps; import android.content.Context; import android.location.Location; diff --git a/tools/emulator/test-apps/SmokeTests/src/com/android/emulator/smoketests/sms/SmsTest.java b/tools/emulator/test-apps/SmokeTests/src/com/android/emulator/smoketests/sms/SmsTest.java new file mode 100644 index 000000000..bb1ce2087 --- /dev/null +++ b/tools/emulator/test-apps/SmokeTests/src/com/android/emulator/smoketests/sms/SmsTest.java @@ -0,0 +1,85 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.emulator.smoketests.sms; + +import android.content.Context; +import android.content.ContentResolver; +import android.net.Uri; +import android.database.Cursor; +import android.os.Bundle; +import android.os.HandlerThread; +import com.android.test.InjectContext; + +import org.junit.Assert; +import static junit.framework.Assert.assertEquals; + +import org.junit.Test; +/** + * Sms Test + * + * Test that an SMS message has been received + */ +public class SmsTest { + + /** + * Prior to running this test an sms must be sent + * via DDMS + */ + public final static String NUMBER = "5551212"; + public final static String BODY = "test sms"; + private final static int SMS_POLL_TIME_MS = 10 * 1000; + private final static int SIXY_SECONDS_OF_LOOPS = 6; + @InjectContext + public Context mContext; + + /** + * Verify that an SMS has been received with the correct number and body + */ + @Test + public void testReceivedSms() throws java.lang.InterruptedException { + Cursor c = getSmsCursor(); + c.moveToFirst(); + + String number = c.getString(c.getColumnIndexOrThrow("address")); + String body = c.getString(c.getColumnIndexOrThrow("body")); + + c.close(); + + assertEquals(NUMBER, number); + assertEquals(BODY, body); + } + + private Cursor getSmsCursor() throws java.lang.InterruptedException { + ContentResolver r = mContext.getContentResolver(); + Uri message = Uri.parse("content://sms/"); + Cursor c; + + for(int i = 0; i < SIXY_SECONDS_OF_LOOPS; i++) { + c = r.query(message,null,null,null,null); + + if(c.getCount() != 0) { + return c; + } + + c.close(); + Thread.sleep(SMS_POLL_TIME_MS); + } + Assert.fail("Did not find any SMS messages. Giving up"); + // necessary for compilation + return null; + } + +}