am 83a4a1c6: Don\'t Build Test Requiring cpufeatures for sim-eng
Merge commit '83a4a1c6a6afafeddb1b4e38a012dc66b09f3a53' into kraken
* commit '83a4a1c6a6afafeddb1b4e38a012dc66b09f3a53':
Don't Build Test Requiring cpufeatures for sim-eng
diff --git a/tests/appsecurity-tests/src/com/android/cts/appsecurity/AppSecurityTests.java b/tests/appsecurity-tests/src/com/android/cts/appsecurity/AppSecurityTests.java
index c56f345..a4f85a1 100644
--- a/tests/appsecurity-tests/src/com/android/cts/appsecurity/AppSecurityTests.java
+++ b/tests/appsecurity-tests/src/com/android/cts/appsecurity/AppSecurityTests.java
@@ -228,8 +228,9 @@
*
* @param pkgName Android application package for tests
* @return <code>true</code> if all tests passed.
+ * @throws IOException if connection to device was lost
*/
- private boolean runDeviceTests(String pkgName) {
+ private boolean runDeviceTests(String pkgName) throws IOException {
CollectingTestRunListener listener = doRunTests(pkgName);
return listener.didAllTestsPass();
}
@@ -238,8 +239,9 @@
* Helper method to run tests and return the listener that collected the results.
* @param pkgName Android application package for tests
* @return the {@link CollectingTestRunListener}
+ * @throws IOException if connection to device was lost
*/
- private CollectingTestRunListener doRunTests(String pkgName) {
+ private CollectingTestRunListener doRunTests(String pkgName) throws IOException {
RemoteAndroidTestRunner testRunner = new RemoteAndroidTestRunner(pkgName, getDevice());
CollectingTestRunListener listener = new CollectingTestRunListener();
testRunner.run(listener);
@@ -251,8 +253,9 @@
*
* @param pkgName Android application package for tests
* @return the test run error message or <code>null</code> if test run completed.
+ * @throws IOException if connection to device was lost
*/
- private String runDeviceTestsWithRunResult(String pkgName) {
+ private String runDeviceTestsWithRunResult(String pkgName) throws IOException {
CollectingTestRunListener listener = doRunTests(pkgName);
return listener.getTestRunErrorMessage();
}
diff --git a/tests/core/annotation/Android.mk b/tests/core/annotation/Android.mk
index 4778710..94eafea 100644
--- a/tests/core/annotation/Android.mk
+++ b/tests/core/annotation/Android.mk
@@ -23,9 +23,9 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/annotation/src/test/java) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/annotation/src/test/java) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.annotation
diff --git a/tests/core/archive/Android.mk b/tests/core/archive/Android.mk
index 78edd09..08100cf 100644
--- a/tests/core/archive/Android.mk
+++ b/tests/core/archive/Android.mk
@@ -23,10 +23,10 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/archive/src/test/java/org) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/archive/src/test/java/org) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java) \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.archive
diff --git a/tests/core/concurrent/Android.mk b/tests/core/concurrent/Android.mk
index d42c6da..1a66d0a 100644
--- a/tests/core/concurrent/Android.mk
+++ b/tests/core/concurrent/Android.mk
@@ -28,9 +28,9 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/concurrent/src/test/java) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/concurrent/src/test/java) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.concurrent
diff --git a/tests/core/crypto/Android.mk b/tests/core/crypto/Android.mk
index 2450ad1..f566d5a 100644
--- a/tests/core/crypto/Android.mk
+++ b/tests/core/crypto/Android.mk
@@ -23,10 +23,10 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/crypto/src/test/java) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java/) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/crypto/src/test/java) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java/) \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.crypto
diff --git a/tests/core/dom/Android.mk b/tests/core/dom/Android.mk
index 47b3dbb..4dd81f8 100644
--- a/tests/core/dom/Android.mk
+++ b/tests/core/dom/Android.mk
@@ -23,9 +23,9 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/dom/src/test/java) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/dom/src/test/java) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.dom
diff --git a/tests/core/logging/Android.mk b/tests/core/logging/Android.mk
index 89d1ca9..2c741a8 100644
--- a/tests/core/logging/Android.mk
+++ b/tests/core/logging/Android.mk
@@ -23,10 +23,10 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/logging/src/test/java) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/logging/src/test/java) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java) \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.logging
diff --git a/tests/core/luni-io/Android.mk b/tests/core/luni-io/Android.mk
index f2aae36..f6d4bcb 100644
--- a/tests/core/luni-io/Android.mk
+++ b/tests/core/luni-io/Android.mk
@@ -23,13 +23,13 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/tests/api/java/io) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/io) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java/) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/org/apache/harmony/luni/tests/pkg1) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/org/apache/harmony/luni/tests/pkg2) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/luni/AllTestsIo.java \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/luni/src/test/java/tests/api/java/io) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/io) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java/) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/org/apache/harmony/luni/tests/pkg1) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/org/apache/harmony/luni/tests/pkg2) \
+ ../../../../libcore/luni/src/test/java/tests/luni/AllTestsIo.java \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.luni.io
diff --git a/tests/core/luni-lang/Android.mk b/tests/core/luni-lang/Android.mk
index 225bdf9..f84bd81 100644
--- a/tests/core/luni-lang/Android.mk
+++ b/tests/core/luni-lang/Android.mk
@@ -23,11 +23,11 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/tests/api/java/lang) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java/) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/luni/AllTestsLang.java \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/lang) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/tests/api/java/lang) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java/) \
+ ../../../../libcore/luni/src/test/java/tests/luni/AllTestsLang.java \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.luni.lang
diff --git a/tests/core/luni-net/Android.mk b/tests/core/luni-net/Android.mk
index 1092ff1..a9aafb6 100644
--- a/tests/core/luni-net/Android.mk
+++ b/tests/core/luni-net/Android.mk
@@ -23,13 +23,13 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/net) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/tests/api/java/net) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/http) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/https) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java/) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/luni/AllTestsNet.java \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/net) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/tests/api/java/net) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/http) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/https) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java/) \
+ ../../../../libcore/luni/src/test/java/tests/luni/AllTestsNet.java \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.luni.net
diff --git a/tests/core/luni-util/Android.mk b/tests/core/luni-util/Android.mk
index 101cde8..b5f0605 100644
--- a/tests/core/luni-util/Android.mk
+++ b/tests/core/luni-util/Android.mk
@@ -23,11 +23,11 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/util) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/tests/api/java/util) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java/) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/luni/AllTestsUtil.java \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/luni/src/test/java/org/apache/harmony/luni/tests/java/util) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/tests/api/java/util) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java/) \
+ ../../../../libcore/luni/src/test/java/tests/luni/AllTestsUtil.java \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.luni.util
diff --git a/tests/core/math/Android.mk b/tests/core/math/Android.mk
index 4c559cd..9918510 100644
--- a/tests/core/math/Android.mk
+++ b/tests/core/math/Android.mk
@@ -23,10 +23,10 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/math/src/test/java) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/math/src/test/java) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java) \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.math
diff --git a/tests/core/nio/Android.mk b/tests/core/nio/Android.mk
index 6ebd1bc..3b82211 100644
--- a/tests/core/nio/Android.mk
+++ b/tests/core/nio/Android.mk
@@ -23,10 +23,10 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/nio/src/test/java) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/nio/src/test/java) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java) \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.nio
diff --git a/tests/core/nio_char/Android.mk b/tests/core/nio_char/Android.mk
index e3b463a..3132de9 100644
--- a/tests/core/nio_char/Android.mk
+++ b/tests/core/nio_char/Android.mk
@@ -23,10 +23,10 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/nio_char/src/test/java) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/nio_char/src/test/java) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java) \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.nio_char
diff --git a/tests/core/prefs/Android.mk b/tests/core/prefs/Android.mk
index f8f225c..e72154b 100644
--- a/tests/core/prefs/Android.mk
+++ b/tests/core/prefs/Android.mk
@@ -23,10 +23,10 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/prefs/src/test/java) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/prefs/src/test/java) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java) \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.prefs
diff --git a/tests/core/regex/Android.mk b/tests/core/regex/Android.mk
index 70927a0..b877e7a 100644
--- a/tests/core/regex/Android.mk
+++ b/tests/core/regex/Android.mk
@@ -23,10 +23,10 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/regex/src/test/java) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/regex/src/test/java) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java) \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.regex
diff --git a/tests/core/security/Android.mk b/tests/core/security/Android.mk
index 76c0ca5..2c4c83a 100644
--- a/tests/core/security/Android.mk
+++ b/tests/core/security/Android.mk
@@ -23,10 +23,10 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/security/src/test/java) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/security/src/test/java) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java) \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.security
diff --git a/tests/core/sql/Android.mk b/tests/core/sql/Android.mk
index fe9b4cc..cace588 100644
--- a/tests/core/sql/Android.mk
+++ b/tests/core/sql/Android.mk
@@ -23,10 +23,10 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/sql/src/test/java) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/sql/src/test/java) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java) \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.sql
diff --git a/tests/core/text/Android.mk b/tests/core/text/Android.mk
index 8b9fd1f..d08edb5 100644
--- a/tests/core/text/Android.mk
+++ b/tests/core/text/Android.mk
@@ -23,10 +23,10 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/text/src/test/java) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/text/src/test/java) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java) \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.text
diff --git a/tests/core/xml/Android.mk b/tests/core/xml/Android.mk
index ba784b9..f1c63e3 100644
--- a/tests/core/xml/Android.mk
+++ b/tests/core/xml/Android.mk
@@ -23,11 +23,11 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/xml/src/test/java) \
- $(call all-java-files-under,../../../../dalvik/libcore/dom/src/test) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/xml/src/test/java) \
+ $(call all-java-files-under,../../../../libcore/dom/src/test) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java) \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.xml
diff --git a/tests/core/xnet/Android.mk b/tests/core/xnet/Android.mk
index 2415f38..cf255e8 100644
--- a/tests/core/xnet/Android.mk
+++ b/tests/core/xnet/Android.mk
@@ -23,10 +23,10 @@
##########################################################
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,../../../../dalvik/libcore/x-net/src/test/java) \
- $(call all-java-files-under,../../../../dalvik/libcore/luni/src/test/java/junit) \
- $(call all-java-files-under,../../../../dalvik/libcore/support/src/test/java) \
- ../../../../dalvik/libcore/luni/src/test/java/tests/TestSuiteFactory.java
+LOCAL_SRC_FILES := $(call all-java-files-under,../../../../libcore/x-net/src/test/java) \
+ $(call all-java-files-under,../../../../libcore/luni/src/test/java/junit) \
+ $(call all-java-files-under,../../../../libcore/support/src/test/java) \
+ ../../../../libcore/luni/src/test/java/tests/TestSuiteFactory.java
LOCAL_PACKAGE_NAME := android.core.tests.xnet
diff --git a/tests/res/values-large/configVarying.xml b/tests/res/values-large/configVarying.xml
new file mode 100755
index 0000000..7b2df7c
--- /dev/null
+++ b/tests/res/values-large/configVarying.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <item type="configVarying" name="simple">simple large</item>
+ <bag type="configVarying" name="bag">
+ <item name="testString">bag large</item>
+ </bag>
+ <item type="configVarying" name="large">large</item>
+</resources>
diff --git a/tests/res/values-normal/configVarying.xml b/tests/res/values-normal/configVarying.xml
new file mode 100755
index 0000000..b45ee49
--- /dev/null
+++ b/tests/res/values-normal/configVarying.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <item type="configVarying" name="simple">simple normal</item>
+ <bag type="configVarying" name="bag">
+ <item name="testString">bag normal</item>
+ </bag>
+ <item type="configVarying" name="normal">normal</item>
+</resources>
diff --git a/tests/res/values-small/configVarying.xml b/tests/res/values-small/configVarying.xml
new file mode 100755
index 0000000..15a9f8f
--- /dev/null
+++ b/tests/res/values-small/configVarying.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <item type="configVarying" name="simple">simple small</item>
+ <bag type="configVarying" name="bag">
+ <item name="testString">bag small</item>
+ </bag>
+ <item type="configVarying" name="small">small</item>
+</resources>
diff --git a/tests/res/values-xlarge/configVarying.xml b/tests/res/values-xlarge/configVarying.xml
new file mode 100755
index 0000000..fb9cad7
--- /dev/null
+++ b/tests/res/values-xlarge/configVarying.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources>
+ <item type="configVarying" name="simple">simple xlarge</item>
+ <bag type="configVarying" name="bag">
+ <item name="testString">bag xlarge</item>
+ </bag>
+ <item type="configVarying" name="xlarge">xlarge</item>
+</resources>
diff --git a/tests/res/values/configVarying.xml b/tests/res/values/configVarying.xml
index a2d5b97..de1b09e 100755
--- a/tests/res/values/configVarying.xml
+++ b/tests/res/values/configVarying.xml
@@ -19,4 +19,8 @@
<bag type="configVarying" name="bag">
<item name="testString">bag default</item>
</bag>
+ <item type="configVarying" name="small">default</item>
+ <item type="configVarying" name="normal">default</item>
+ <item type="configVarying" name="large">default</item>
+ <item type="configVarying" name="xlarge">default</item>
</resources>
diff --git a/tests/src/android/hardware/cts/CameraStubActivity.java b/tests/src/android/hardware/cts/CameraStubActivity.java
index 50bd13b..8ab7fbd 100644
--- a/tests/src/android/hardware/cts/CameraStubActivity.java
+++ b/tests/src/android/hardware/cts/CameraStubActivity.java
@@ -24,9 +24,7 @@
import com.android.cts.stub.R;
public class CameraStubActivity extends Activity {
-
- public static SurfaceView mSurfaceView;
-
+ private SurfaceView mSurfaceView;
private final int LAYOUT_WIDTH = 480;
private final int LAYOUT_HEIGHT = 320;
@@ -43,4 +41,8 @@
mSurfaceView.getHolder().setFixedSize(LAYOUT_WIDTH, LAYOUT_HEIGHT);
mSurfaceView.getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
}
+
+ public SurfaceView getSurfaceView() {
+ return mSurfaceView;
+ }
}
diff --git a/tests/tests/app/src/android/app/cts/InstrumentationTest.java b/tests/tests/app/src/android/app/cts/InstrumentationTest.java
index a2c8eb8..38c21a8 100644
--- a/tests/tests/app/src/android/app/cts/InstrumentationTest.java
+++ b/tests/tests/app/src/android/app/cts/InstrumentationTest.java
@@ -39,6 +39,7 @@
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.MotionEvent;
+import android.view.SurfaceHolder;
import android.view.View;
import android.view.Window;
import android.view.ViewGroup.LayoutParams;
@@ -955,6 +956,10 @@
@Override
public void togglePanel(int featureId, KeyEvent event) {
}
+
+ @Override
+ public void takeSurface(SurfaceHolder.Callback callback) {
+ }
}
}
diff --git a/tests/tests/content/src/android/content/res/cts/ConfigTest.java b/tests/tests/content/src/android/content/res/cts/ConfigTest.java
index 276cb35..d68fd19 100755
--- a/tests/tests/content/src/android/content/res/cts/ConfigTest.java
+++ b/tests/tests/content/src/android/content/res/cts/ConfigTest.java
@@ -43,7 +43,8 @@
ORIENTATION,
WIDTH,
HEIGHT,
- DENSITY
+ DENSITY,
+ SCREENLAYOUT
}
private static void checkValue(final Resources res, final int resId,
@@ -129,9 +130,11 @@
break;
case DENSITY:
// this is the ratio from the standard
-
mMetrics.density = (((float)value)/((float)DisplayMetrics.DENSITY_DEFAULT));
break;
+ case SCREENLAYOUT:
+ mConfig.screenLayout = value;
+ break;
default:
assert(false);
break;
@@ -303,6 +306,34 @@
checkValue(res, R.configVarying.simple, "simple square");
checkValue(res, R.configVarying.bag,
R.styleable.TestConfig, new String[]{"bag square"});
+
+ config = new TotalConfig();
+ config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_SMALL);
+ res = config.getResources();
+ checkValue(res, R.configVarying.simple, "simple small");
+ checkValue(res, R.configVarying.bag,
+ R.styleable.TestConfig, new String[]{"bag small"});
+
+ config = new TotalConfig();
+ config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_NORMAL);
+ res = config.getResources();
+ checkValue(res, R.configVarying.simple, "simple normal");
+ checkValue(res, R.configVarying.bag,
+ R.styleable.TestConfig, new String[]{"bag normal"});
+
+ config = new TotalConfig();
+ config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
+ res = config.getResources();
+ checkValue(res, R.configVarying.simple, "simple large");
+ checkValue(res, R.configVarying.bag,
+ R.styleable.TestConfig, new String[]{"bag large"});
+
+ config = new TotalConfig();
+ config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_XLARGE);
+ res = config.getResources();
+ checkValue(res, R.configVarying.simple, "simple xlarge");
+ checkValue(res, R.configVarying.bag,
+ R.styleable.TestConfig, new String[]{"bag xlarge"});
}
@MediumTest
@@ -378,6 +409,47 @@
R.styleable.TestConfig, new String[]{"bag 240dpi"});
}
+ @MediumTest
+ public void testScreenSize() throws Exception {
+ // ensure that we fall back to the best available screen size
+ // for a given configuration.
+ TotalConfig config = new TotalConfig();
+ config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_SMALL);
+ Resources res = config.getResources();
+ checkValue(res, R.configVarying.simple, "simple small");
+ checkValue(res, R.configVarying.small, "small");
+ checkValue(res, R.configVarying.normal, "default");
+ checkValue(res, R.configVarying.large, "default");
+ checkValue(res, R.configVarying.xlarge, "default");
+
+ config = new TotalConfig();
+ config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_NORMAL);
+ res = config.getResources();
+ checkValue(res, R.configVarying.simple, "simple normal");
+ checkValue(res, R.configVarying.small, "default");
+ checkValue(res, R.configVarying.normal, "normal");
+ checkValue(res, R.configVarying.large, "default");
+ checkValue(res, R.configVarying.xlarge, "default");
+
+ config = new TotalConfig();
+ config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_LARGE);
+ res = config.getResources();
+ checkValue(res, R.configVarying.simple, "simple large");
+ checkValue(res, R.configVarying.small, "default");
+ checkValue(res, R.configVarying.normal, "normal");
+ checkValue(res, R.configVarying.large, "large");
+ checkValue(res, R.configVarying.xlarge, "default");
+
+ config = new TotalConfig();
+ config.setProperty(Properties.SCREENLAYOUT, Configuration.SCREENLAYOUT_SIZE_XLARGE);
+ res = config.getResources();
+ checkValue(res, R.configVarying.simple, "simple xlarge");
+ checkValue(res, R.configVarying.small, "default");
+ checkValue(res, R.configVarying.normal, "normal");
+ checkValue(res, R.configVarying.large, "large");
+ checkValue(res, R.configVarying.xlarge, "xlarge");
+ }
+
// TODO - add tests for special cases - ie, other key params seem ignored if
// nokeys is set
@@ -421,7 +493,8 @@
*/
/**
- * Precidence order: mcc, mnc, locale, orientation, density,
+ * Precidence order: mcc, mnc, locale, screenlayout-size,
+ * screenlayout-long, orientation, density,
* touchscreen, hidden, keyboard, navigation, width-height
*/
diff --git a/tests/tests/graphics/src/android/graphics/cts/NinePatchTest.java b/tests/tests/graphics/src/android/graphics/cts/NinePatchTest.java
index d69dd4f..041de94 100644
--- a/tests/tests/graphics/src/android/graphics/cts/NinePatchTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/NinePatchTest.java
@@ -34,7 +34,6 @@
import android.graphics.RectF;
import android.graphics.Region;
import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.Suppress;
@TestTargetClass(NinePatch.class)
public class NinePatchTest extends AndroidTestCase {
@@ -174,7 +173,6 @@
method = "hasAlpha",
args = {}
)
- @Suppress // Suppressed for current release
public void testHasAlpha() {
assertFalse(mNinePatch.hasAlpha());
assertEquals(mNinePatch.hasAlpha(), mBitmap.hasAlpha());
diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
index ba298c2..c478ef8 100644
--- a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
@@ -266,10 +266,7 @@
}
private void checkPreviewCallback() throws Exception {
- SurfaceHolder mSurfaceHolder;
-
- mSurfaceHolder = CameraStubActivity.mSurfaceView.getHolder();
- mCamera.setPreviewDisplay(mSurfaceHolder);
+ mCamera.setPreviewDisplay(getActivity().getSurfaceView().getHolder());
if (LOGV) Log.v(TAG, "check preview callback");
mCamera.startPreview();
waitForPreviewDone();
@@ -318,9 +315,7 @@
public void testTakePicture() throws Exception {
initializeMessageLooper();
Size pictureSize = mCamera.getParameters().getPictureSize();
- SurfaceHolder mSurfaceHolder;
- mSurfaceHolder = CameraStubActivity.mSurfaceView.getHolder();
- mCamera.setPreviewDisplay(mSurfaceHolder);
+ mCamera.setPreviewDisplay(getActivity().getSurfaceView().getHolder());
mCamera.startPreview();
mCamera.autoFocus(mAutoFocusCallback);
assertTrue(waitForFocusDone());
@@ -330,10 +325,10 @@
terminateMessageLooper();
assertTrue(mShutterCallbackResult);
assertTrue(mJpegPictureCallbackResult);
- assertTrue(mJpegData != null);
+ assertNotNull(mJpegData);
Bitmap b = BitmapFactory.decodeByteArray(mJpegData, 0, mJpegData.length);
- assertEquals(b.getWidth(), pictureSize.width);
- assertEquals(b.getHeight(), pictureSize.height);
+ assertEquals(pictureSize.width, b.getWidth());
+ assertEquals(pictureSize.height, b.getHeight());
}
/*
@@ -414,14 +409,13 @@
)
@UiThreadTest
public void testSetPreviewDisplay() throws Exception {
- SurfaceHolder mSurfaceHolder;
- mSurfaceHolder = CameraStubActivity.mSurfaceView.getHolder();
+ SurfaceHolder holder = getActivity().getSurfaceView().getHolder();
initializeMessageLooper();
// Check the order: startPreview->setPreviewDisplay.
mCamera.setOneShotPreviewCallback(mRawPreviewCallback);
mCamera.startPreview();
- mCamera.setPreviewDisplay(mSurfaceHolder);
+ mCamera.setPreviewDisplay(holder);
waitForPreviewDone();
terminateMessageLooper();
assertTrue(mRawPreviewCallbackResult);
@@ -430,7 +424,7 @@
initializeMessageLooper();
mRawPreviewCallbackResult = false;
mCamera.setOneShotPreviewCallback(mRawPreviewCallback);
- mCamera.setPreviewDisplay(mSurfaceHolder);
+ mCamera.setPreviewDisplay(holder);
mCamera.startPreview();
waitForPreviewDone();
mCamera.stopPreview();
@@ -442,7 +436,7 @@
mCamera.setOneShotPreviewCallback(mRawPreviewCallback);
mCamera.setPreviewDisplay(null);
mCamera.startPreview();
- mCamera.setPreviewDisplay(mSurfaceHolder);
+ mCamera.setPreviewDisplay(holder);
waitForPreviewDone();
terminateMessageLooper();
assertTrue(mRawPreviewCallbackResult);
@@ -472,9 +466,7 @@
}
// Start preview.
- SurfaceHolder mSurfaceHolder;
- mSurfaceHolder = CameraStubActivity.mSurfaceView.getHolder();
- mCamera.setPreviewDisplay(mSurfaceHolder);
+ mCamera.setPreviewDisplay(getActivity().getSurfaceView().getHolder());
mCamera.startPreview();
// Check setting orientation during preview is not allowed.
@@ -532,10 +524,10 @@
assertTrue(origPreviewFrameRate > 0);
// The default preview format must be yuv420 (NV21).
- assertTrue(origPreviewFormat == ImageFormat.NV21);
+ assertEquals(ImageFormat.NV21, origPreviewFormat);
// The default picture format must be Jpeg.
- assertTrue(origPictureFormat == ImageFormat.JPEG);
+ assertEquals(ImageFormat.JPEG, origPictureFormat);
// If camera supports flash, the default flash mode must be off.
String flashMode = parameters.getFlashMode();
@@ -558,7 +550,7 @@
assertTrue(pictureFormats != null && pictureFormats.size() != 0);
assertTrue(frameRates != null && frameRates.size() != 0);
assertTrue(focusModes != null && focusModes.size() != 0);
- assertTrue(focusMode != null);
+ assertNotNull(focusMode);
assertTrue(focalLength > 0);
assertTrue(horizontalViewAngle > 0 && horizontalViewAngle <= 360);
assertTrue(verticalViewAngle > 0 && verticalViewAngle <= 360);
@@ -568,34 +560,34 @@
// If a parameter is supported, both getXXX and getSupportedXXX have to
// be non null.
if (parameters.getWhiteBalance() != null) {
- assertTrue(parameters.getSupportedWhiteBalance() != null);
+ assertNotNull(parameters.getSupportedWhiteBalance());
}
if (parameters.getSupportedWhiteBalance() != null) {
- assertTrue(parameters.getWhiteBalance() != null);
+ assertNotNull(parameters.getWhiteBalance());
}
if (parameters.getColorEffect() != null) {
- assertTrue(parameters.getSupportedColorEffects() != null);
+ assertNotNull(parameters.getSupportedColorEffects());
}
if (parameters.getSupportedColorEffects() != null) {
- assertTrue(parameters.getColorEffect() != null);
+ assertNotNull(parameters.getColorEffect());
}
if (parameters.getAntibanding() != null) {
- assertTrue(parameters.getSupportedAntibanding() != null);
+ assertNotNull(parameters.getSupportedAntibanding());
}
if (parameters.getSupportedAntibanding() != null) {
- assertTrue(parameters.getAntibanding() != null);
+ assertNotNull(parameters.getAntibanding());
}
if (parameters.getSceneMode() != null) {
- assertTrue(parameters.getSupportedSceneModes() != null);
+ assertNotNull(parameters.getSupportedSceneModes());
}
if (parameters.getSupportedSceneModes() != null) {
- assertTrue(parameters.getSceneMode() != null);
+ assertNotNull(parameters.getSceneMode());
}
if (parameters.getFlashMode() != null) {
- assertTrue(parameters.getSupportedFlashModes() != null);
+ assertNotNull(parameters.getSupportedFlashModes());
}
if (parameters.getSupportedFlashModes() != null) {
- assertTrue(parameters.getFlashMode() != null);
+ assertNotNull(parameters.getFlashMode());
}
// Set the parameters.
@@ -617,11 +609,11 @@
// camera may not accept exact parameters, but values must be in valid range
assertTrue(isValidPixelFormat(paramActual.getPictureFormat()));
- assertEquals(paramActual.getPictureSize().width, pictureSize.width);
- assertEquals(paramActual.getPictureSize().height, pictureSize.height);
+ assertEquals(pictureSize.width, paramActual.getPictureSize().width);
+ assertEquals(pictureSize.height, paramActual.getPictureSize().height);
assertTrue(isValidPixelFormat(paramActual.getPreviewFormat()));
- assertEquals(paramActual.getPreviewSize().width, previewSize.width);
- assertEquals(paramActual.getPreviewSize().height, previewSize.height);
+ assertEquals(previewSize.width, paramActual.getPreviewSize().width);
+ assertEquals(previewSize.height, paramActual.getPreviewSize().height);
assertTrue(paramActual.getPreviewFrameRate() > 0);
checkExposureCompensation(parameters);
@@ -676,9 +668,7 @@
assertTrue(sizes.contains(mCamera.new Size(0, 0)));
// Test if the thumbnail size matches the setting.
- SurfaceHolder mSurfaceHolder;
- mSurfaceHolder = CameraStubActivity.mSurfaceView.getHolder();
- mCamera.setPreviewDisplay(mSurfaceHolder);
+ mCamera.setPreviewDisplay(getActivity().getSurfaceView().getHolder());
mCamera.startPreview();
mCamera.takePicture(mShutterCallback, mRawPictureCallback, mJpegPictureCallback);
waitForSnapshotDone();
@@ -687,8 +677,8 @@
assertTrue(exif.hasThumbnail());
byte[] thumb = exif.getThumbnail();
Bitmap b = BitmapFactory.decodeByteArray(thumb, 0, thumb.length);
- assertEquals(b.getWidth(), size.width);
- assertEquals(b.getHeight(), size.height);
+ assertEquals(size.width, b.getWidth());
+ assertEquals(size.height, b.getHeight());
// Test no thumbnail case.
p.setJpegThumbnailSize(0, 0);
@@ -696,9 +686,9 @@
mCamera.startPreview();
mCamera.takePicture(mShutterCallback, mRawPictureCallback, mJpegPictureCallback);
waitForSnapshotDone();
- assertEquals(mJpegPictureCallbackResult, true);
+ assertTrue(mJpegPictureCallbackResult);
exif = new ExifInterface(JPEG_PATH);
- assertTrue(!exif.hasThumbnail());
+ assertFalse(exif.hasThumbnail());
terminateMessageLooper();
}
@@ -707,26 +697,18 @@
public void testJpegExif() throws Exception {
initializeMessageLooper();
Camera.Parameters parameters = mCamera.getParameters();
- SurfaceHolder mSurfaceHolder;
- mSurfaceHolder = CameraStubActivity.mSurfaceView.getHolder();
- mCamera.setPreviewDisplay(mSurfaceHolder);
+ mCamera.setPreviewDisplay(getActivity().getSurfaceView().getHolder());
mCamera.startPreview();
double focalLength = (double)parameters.getFocalLength();
mCamera.takePicture(mShutterCallback, mRawPictureCallback, mJpegPictureCallback);
waitForSnapshotDone();
ExifInterface exif = new ExifInterface(JPEG_PATH);
- assertTrue(exif.getAttribute(ExifInterface.TAG_MAKE) != null);
- assertTrue(exif.getAttribute(ExifInterface.TAG_MODEL) != null);
- assertTrue(exif.getAttribute(ExifInterface.TAG_DATETIME) != null);
+ assertNotNull(exif.getAttribute(ExifInterface.TAG_MAKE));
+ assertNotNull(exif.getAttribute(ExifInterface.TAG_MODEL));
+ assertNotNull(exif.getAttribute(ExifInterface.TAG_DATETIME));
assertTrue(exif.getAttributeInt(ExifInterface.TAG_IMAGE_WIDTH, 0) != 0);
assertTrue(exif.getAttributeInt(ExifInterface.TAG_IMAGE_LENGTH, 0) != 0);
- assertEquals(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE), null);
- assertEquals(exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE), null);
- assertEquals(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE_REF), null);
- assertEquals(exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE_REF), null);
- assertEquals(exif.getAttribute(ExifInterface.TAG_GPS_TIMESTAMP), null);
- assertEquals(exif.getAttribute(ExifInterface.TAG_GPS_DATESTAMP), null);
- assertEquals(exif.getAttribute(ExifInterface.TAG_GPS_PROCESSING_METHOD), null);
+ checkGpsDataNull(exif);
double exifFocalLength = (double)exif.getAttributeDouble(
ExifInterface.TAG_FOCAL_LENGTH, -1);
assertEquals(focalLength, exifFocalLength, 0.001);
@@ -743,17 +725,36 @@
mCamera.takePicture(mShutterCallback, mRawPictureCallback, mJpegPictureCallback);
waitForSnapshotDone();
exif = new ExifInterface(JPEG_PATH);
- assertTrue(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE) != null);
- assertTrue(exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE) != null);
- assertTrue(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE_REF) != null);
- assertTrue(exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE_REF) != null);
- assertTrue(exif.getAttribute(ExifInterface.TAG_GPS_TIMESTAMP) != null);
- assertTrue(exif.getAttribute(ExifInterface.TAG_GPS_DATESTAMP) != null);
+ assertNotNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE));
+ assertNotNull(exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE));
+ assertNotNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE_REF));
+ assertNotNull(exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE_REF));
+ assertNotNull(exif.getAttribute(ExifInterface.TAG_GPS_TIMESTAMP));
+ assertNotNull(exif.getAttribute(ExifInterface.TAG_GPS_DATESTAMP));
assertEquals(thirtyTwoCharacters,
exif.getAttribute(ExifInterface.TAG_GPS_PROCESSING_METHOD));
+
+ // Test gps tags do not exist after calling removeGpsData.
+ mCamera.startPreview();
+ parameters.removeGpsData();
+ mCamera.setParameters(parameters);
+ mCamera.takePicture(mShutterCallback, mRawPictureCallback, mJpegPictureCallback);
+ waitForSnapshotDone();
+ exif = new ExifInterface(JPEG_PATH);
+ checkGpsDataNull(exif);
terminateMessageLooper();
}
+ private void checkGpsDataNull(ExifInterface exif) {
+ assertNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE));
+ assertNull(exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE));
+ assertNull(exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE_REF));
+ assertNull(exif.getAttribute(ExifInterface.TAG_GPS_LONGITUDE_REF));
+ assertNull(exif.getAttribute(ExifInterface.TAG_GPS_TIMESTAMP));
+ assertNull(exif.getAttribute(ExifInterface.TAG_GPS_DATESTAMP));
+ assertNull(exif.getAttribute(ExifInterface.TAG_GPS_PROCESSING_METHOD));
+ }
+
@TestTargets({
@TestTargetNew(
level = TestLevel.COMPLETE,
@@ -771,7 +772,7 @@
initializeMessageLooper();
Camera.Parameters parameters = mCamera.getParameters();
SurfaceHolder surfaceHolder;
- surfaceHolder = CameraStubActivity.mSurfaceView.getHolder();
+ surfaceHolder = getActivity().getSurfaceView().getHolder();
Size size = parameters.getPreviewSize();
mCamera.setParameters(parameters);
mCamera.setPreviewDisplay(surfaceHolder);
@@ -837,7 +838,7 @@
public void testPreviewCallbackWithBuffer() throws Exception {
initializeMessageLooper();
SurfaceHolder surfaceHolder;
- surfaceHolder = CameraStubActivity.mSurfaceView.getHolder();
+ surfaceHolder = getActivity().getSurfaceView().getHolder();
mCamera.setPreviewDisplay(surfaceHolder);
Size size = mCamera.getParameters().getPreviewSize();
PreviewCallbackWithBuffer callback = new PreviewCallbackWithBuffer();
@@ -869,7 +870,7 @@
public int mNumCbWithBuffer1, mNumCbWithBuffer2, mNumCbWithBuffer3;
public byte[] mBuffer1, mBuffer2, mBuffer3;
public void onPreviewFrame(byte[] data, Camera camera) {
- assert(data != null);
+ assertNotNull(data);
if (data == mBuffer1) {
mNumCbWithBuffer1++;
} else if (data == mBuffer2) {
@@ -917,21 +918,19 @@
if (!parameters.isZoomSupported()) return;
// Test the zoom parameters.
- assertEquals(parameters.getZoom(), 0); // default zoom should be 0.
+ assertEquals(0, parameters.getZoom()); // default zoom should be 0.
int maxZoom = parameters.getMaxZoom();
assertTrue(maxZoom >= 0);
if (maxZoom > 0) {
// Zoom ratios should be sorted from small to large.
List<Integer> ratios = parameters.getZoomRatios();
- assertEquals(ratios.size(), maxZoom + 1);
- assertEquals(ratios.get(0).intValue(), 100);
+ assertEquals(maxZoom + 1, ratios.size());
+ assertEquals(100, ratios.get(0).intValue());
for (int i = 0; i < ratios.size() - 1; i++) {
assertTrue(ratios.get(i) < ratios.get(i + 1));
}
}
- SurfaceHolder mSurfaceHolder;
- mSurfaceHolder = CameraStubActivity.mSurfaceView.getHolder();
- mCamera.setPreviewDisplay(mSurfaceHolder);
+ mCamera.setPreviewDisplay(getActivity().getSurfaceView().getHolder());
mCamera.startPreview();
waitForPreviewDone();
@@ -962,10 +961,8 @@
if (!parameters.isSmoothZoomSupported()) return;
assertTrue(parameters.isZoomSupported());
- SurfaceHolder mSurfaceHolder;
- mSurfaceHolder = CameraStubActivity.mSurfaceView.getHolder();
ZoomListener zoomListener = new ZoomListener();
- mCamera.setPreviewDisplay(mSurfaceHolder);
+ mCamera.setPreviewDisplay(getActivity().getSurfaceView().getHolder());
mCamera.setZoomChangeListener(zoomListener);
mCamera.startPreview();
waitForPreviewDone();
@@ -1001,7 +998,7 @@
Log.e(TAG, "zoomListener.mStopped = " + zoomListener.mStopped);
zoomListener.mZoomDone.close();
mCamera.startSmoothZoom(maxZoom / 2);
- assertEquals(true, zoomListener.mZoomDone.block(5000));
+ assertTrue(zoomListener.mZoomDone.block(5000));
assertEquals(maxZoom - (maxZoom / 2), zoomListener.mValues.size());
int i = maxZoom - 1;
for(Integer value: zoomListener.mValues) {
@@ -1042,11 +1039,143 @@
public void onZoomChange(int value, boolean stopped, Camera camera) {
mValues.add(value);
assertEquals(value, camera.getParameters().getZoom());
- assertEquals(false, mStopped);
+ assertFalse(mStopped);
mStopped = stopped;
if (stopped) {
mZoomDone.open();
}
}
}
+
+ @UiThreadTest
+ public void testFocusDistances() throws Exception {
+ initializeMessageLooper();
+ mCamera.setPreviewDisplay(getActivity().getSurfaceView().getHolder());
+ mCamera.startPreview();
+ waitForPreviewDone();
+ Parameters parameters = mCamera.getParameters();
+
+ // Test every supported focus mode.
+ for (String focusMode: parameters.getSupportedFocusModes()) {
+ parameters.setFocusMode(focusMode);
+ mCamera.setParameters(parameters);
+ parameters = mCamera.getParameters();
+ checkFocusDistances(parameters);
+ if (Parameters.FOCUS_MODE_AUTO.equals(focusMode)
+ || Parameters.FOCUS_MODE_MACRO.equals(focusMode)) {
+ mCamera.autoFocus(mAutoFocusCallback);
+ assertTrue(waitForFocusDone());
+ parameters = mCamera.getParameters();
+ checkFocusDistances(parameters);
+ }
+ }
+
+ // Test if the method throws exception if the argument is invalid.
+ try {
+ parameters.getFocusDistances(null);
+ fail("getFocusDistances should not accept null.");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+
+ try {
+ parameters.getFocusDistances(new float[2]);
+ fail("getFocusDistances should not accept a float array with two elements.");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+
+ try {
+ parameters.getFocusDistances(new float[4]);
+ fail("getFocusDistances should not accept a float array with four elements.");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
+ terminateMessageLooper();
+ }
+
+ private void checkFocusDistances(Parameters parameters) {
+ float[] distances = new float[3];
+ parameters.getFocusDistances(distances);
+
+ // Focus distances should be greater than 0.
+ assertTrue(distances[Parameters.FOCUS_DISTANCE_NEAR_INDEX] > 0);
+ assertTrue(distances[Parameters.FOCUS_DISTANCE_OPTIMAL_INDEX] > 0);
+ assertTrue(distances[Parameters.FOCUS_DISTANCE_FAR_INDEX] > 0);
+
+ // Make sure far focus distance >= optimal focus distance >= near focus distance.
+ assertTrue(distances[Parameters.FOCUS_DISTANCE_FAR_INDEX] >=
+ distances[Parameters.FOCUS_DISTANCE_OPTIMAL_INDEX]);
+ assertTrue(distances[Parameters.FOCUS_DISTANCE_OPTIMAL_INDEX] >=
+ distances[Parameters.FOCUS_DISTANCE_NEAR_INDEX]);
+
+ // Far focus distance should be infinity in infinity focus mode.
+ if (Parameters.FOCUS_MODE_INFINITY.equals(parameters.getFocusMode())) {
+ assertEquals(Float.POSITIVE_INFINITY,
+ distances[Parameters.FOCUS_DISTANCE_FAR_INDEX]);
+ }
+ }
+
+ @TestTargets({
+ @TestTargetNew(
+ level = TestLevel.COMPLETE,
+ method = "cancelAutofocus",
+ args = {}
+ )
+ })
+ @UiThreadTest
+ public void testCancelAutofocus() throws Exception {
+ initializeMessageLooper();
+ mCamera.setPreviewDisplay(getActivity().getSurfaceView().getHolder());
+ mCamera.startPreview();
+
+ // No op if autofocus is not in progress.
+ mCamera.cancelAutoFocus();
+
+ // Try to cancel autofocus immediately.
+ mCamera.autoFocus(mAutoFocusCallback);
+ mCamera.cancelAutoFocus();
+ checkFocusDistanceNotChanging();
+
+ // Try to cancel autofocus after it starts for some time.
+ mCamera.autoFocus(mAutoFocusCallback);
+ Thread.sleep(500);
+ mCamera.cancelAutoFocus();
+ checkFocusDistanceNotChanging();
+
+ // Try to cancel autofocus after it completes. It should be no op.
+ mCamera.autoFocus(mAutoFocusCallback);
+ assertTrue(waitForFocusDone());
+ mCamera.cancelAutoFocus();
+
+ // Test the case calling cancelAutoFocus and release in a row.
+ mCamera.autoFocus(mAutoFocusCallback);
+ mCamera.cancelAutoFocus();
+ mCamera.release();
+
+ // Ensure the camera can be opened if release is called right after AF.
+ mCamera = Camera.open();
+ mCamera.startPreview();
+ mCamera.autoFocus(mAutoFocusCallback);
+ mCamera.release();
+
+ terminateMessageLooper();
+ }
+
+ private void checkFocusDistanceNotChanging() throws Exception {
+ float[] distances1 = new float[3];
+ float[] distances2 = new float[3];
+ Parameters parameters = mCamera.getParameters();
+ parameters.getFocusDistances(distances1);
+ Thread.sleep(100);
+ parameters = mCamera.getParameters();
+ parameters.getFocusDistances(distances2);
+ assertEquals(distances1[Parameters.FOCUS_DISTANCE_NEAR_INDEX],
+ distances2[Parameters.FOCUS_DISTANCE_NEAR_INDEX]);
+ assertEquals(distances1[Parameters.FOCUS_DISTANCE_OPTIMAL_INDEX],
+ distances2[Parameters.FOCUS_DISTANCE_OPTIMAL_INDEX]);
+ assertEquals(distances1[Parameters.FOCUS_DISTANCE_FAR_INDEX],
+ distances2[Parameters.FOCUS_DISTANCE_FAR_INDEX]);
+ }
+
}
diff --git a/tests/tests/hardware/src/android/hardware/cts/GeomagneticFieldTest.java b/tests/tests/hardware/src/android/hardware/cts/GeomagneticFieldTest.java
index e08da0e..d98d2d5 100644
--- a/tests/tests/hardware/src/android/hardware/cts/GeomagneticFieldTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/GeomagneticFieldTest.java
@@ -28,11 +28,11 @@
@TestTargetClass(GeomagneticField.class)
public class GeomagneticFieldTest extends AndroidTestCase {
- private static final float LATITUDE_OF_CHENGDU = 104.06f;
- private static final float LONGITUDE_OF_CHENGDU = 30.67f;
+ // Chengdu: Latitude 30d 40' 12", Longitude 104d 3' 36"
+ private static final float LATITUDE_OF_CHENGDU = 30.67f;
+ private static final float LONGITUDE_OF_CHENGDU = 104.06f;
private static final float ALTITUDE_OF_CHENGDU = 500f;
- private static final float DELTA = 1.0f;
- private static final long TEST_TIME = new GregorianCalendar(2009, 5, 1).getTimeInMillis();
+ private static final long TEST_TIME = new GregorianCalendar(2010, 5, 1).getTimeInMillis();
@TestTargets({
@TestTargetNew(
@@ -79,12 +79,16 @@
public void testGeomagneticField() {
GeomagneticField geomagneticField = new GeomagneticField(LATITUDE_OF_CHENGDU,
LONGITUDE_OF_CHENGDU, ALTITUDE_OF_CHENGDU, TEST_TIME);
- assertEquals(16.12f, geomagneticField.getDeclination(), DELTA);
- assertEquals(88.04f, geomagneticField.getInclination(), DELTA);
- assertEquals(56768.22f, geomagneticField.getFieldStrength(), DELTA);
- assertEquals(1943.81f, geomagneticField.getHorizontalStrength(), DELTA);
- assertEquals(1867.41f, geomagneticField.getX(), DELTA);
- assertEquals(539.61f, geomagneticField.getY(), DELTA);
- assertEquals(56734.93f, geomagneticField.getZ(), DELTA);
+
+ // Reference values calculated from NOAA online calculator for WMM 2010,
+ // and cross-checked in Matlab. The expected deltas are proportional to the
+ // magnitude of each value.
+ assertEquals(-1.867f, geomagneticField.getDeclination(), 0.1f);
+ assertEquals(47.133f, geomagneticField.getInclination(), 1.0f);
+ assertEquals(50375.6f, geomagneticField.getFieldStrength(), 100.0f);
+ assertEquals(34269.3f, geomagneticField.getHorizontalStrength(), 100.0f);
+ assertEquals(34251.2f, geomagneticField.getX(), 100.0f);
+ assertEquals(-1113.2f, geomagneticField.getY(), 10.0f);
+ assertEquals(36923.1f, geomagneticField.getZ(), 100.0f);
}
}
diff --git a/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java b/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
index 3f75f94..a97aa96 100644
--- a/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java
@@ -17,12 +17,15 @@
package android.telephony.cts;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import android.app.PendingIntent;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.os.SystemClock;
import android.telephony.TelephonyManager;
import android.telephony.SmsManager;
import android.test.AndroidTestCase;
@@ -50,6 +53,12 @@
private static final String SMS_SEND_ACTION = "CTS_SMS_SEND_ACTION";
private static final String SMS_DELIVERY_ACTION = "CTS_SMS_DELIVERY_ACTION";
+ // List of network operators that don't support SMS delivery report
+ private static final List<String> NO_DELIVERY_REPORTS =
+ Arrays.asList(
+ "310410" // AT&T Mobility
+ );
+
private TelephonyManager mTelephonyManager;
private String mDestAddr;
private String mText;
@@ -59,6 +68,7 @@
private PendingIntent mDeliveredIntent;
private Intent mSendIntent;
private Intent mDeliveryIntent;
+ private boolean mDeliveryReportSupported;
private static final int TIME_OUT = 1000 * 60 * 4;
@@ -69,6 +79,18 @@
(TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
mDestAddr = mTelephonyManager.getLine1Number();
mText = "This is a test message";
+
+ if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {
+ // CDMA supports SMS delivery report
+ mDeliveryReportSupported = true;
+ } else if (mTelephonyManager.getDeviceId().equals("000000000000000")) {
+ // emulator doesn't support SMS delivery report
+ mDeliveryReportSupported = false;
+ } else {
+ // is this a GSM network that doesn't support SMS delivery report?
+ String mccmnc = mTelephonyManager.getSimOperator();
+ mDeliveryReportSupported = !(NO_DELIVERY_REPORTS.contains(mccmnc));
+ }
}
@TestTargetNew(
@@ -120,8 +142,10 @@
// send single text sms
init();
sendTextMessage(mDestAddr, mDestAddr, mSentIntent, mDeliveredIntent);
- mSendReceiver.waitForCalls(1, TIME_OUT);
- mDeliveryReceiver.waitForCalls(1, TIME_OUT);
+ assertTrue(mSendReceiver.waitForCalls(1, TIME_OUT));
+ if (mDeliveryReportSupported) {
+ assertTrue(mDeliveryReceiver.waitForCalls(1, TIME_OUT));
+ }
if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {
// TODO: temp workaround, OCTET encoding for EMS not properly supported
@@ -134,8 +158,10 @@
init();
sendDataMessage(mDestAddr, port, data, mSentIntent, mDeliveredIntent);
- mSendReceiver.waitForCalls(1, TIME_OUT);
- mDeliveryReceiver.waitForCalls(1, TIME_OUT);
+ assertTrue(mSendReceiver.waitForCalls(1, TIME_OUT));
+ if (mDeliveryReportSupported) {
+ assertTrue(mDeliveryReceiver.waitForCalls(1, TIME_OUT));
+ }
// send multi parts text sms
init();
@@ -148,8 +174,10 @@
deliveryIntents.add(PendingIntent.getBroadcast(getContext(), 0, mDeliveryIntent, 0));
}
sendMultiPartTextMessage(mDestAddr, parts, sentIntents, deliveryIntents);
- mSendReceiver.waitForCalls(numParts, TIME_OUT);
- mDeliveryReceiver.waitForCalls(numParts, TIME_OUT);
+ assertTrue(mSendReceiver.waitForCalls(numParts, TIME_OUT));
+ if (mDeliveryReportSupported) {
+ assertTrue(mDeliveryReceiver.waitForCalls(numParts, TIME_OUT));
+ }
}
private void init() {
@@ -220,12 +248,20 @@
}
}
- public void waitForCalls(int expectedCalls, long timeout) throws InterruptedException {
+ public boolean waitForCalls(int expectedCalls, long timeout) throws InterruptedException {
synchronized(mLock) {
mExpectedCalls = expectedCalls;
- if (mCalls < mExpectedCalls) {
- mLock.wait(timeout);
+ long startTime = SystemClock.elapsedRealtime();
+
+ while (mCalls < mExpectedCalls) {
+ long waitTime = timeout - (SystemClock.elapsedRealtime() - startTime);
+ if (waitTime > 0) {
+ mLock.wait(waitTime);
+ } else {
+ return false; // timed out
+ }
}
+ return true; // success
}
}
}
diff --git a/tests/tests/telephony/src/android/telephony/cts/SmsMessageTest.java b/tests/tests/telephony/src/android/telephony/cts/SmsMessageTest.java
index 44b0871..515f8b5 100644
--- a/tests/tests/telephony/src/android/telephony/cts/SmsMessageTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/SmsMessageTest.java
@@ -212,7 +212,7 @@
assertEquals(SCA2, sms.getServiceCenterAddress());
assertEquals(OA2, sms.getOriginatingAddress());
assertEquals(MESSAGE_BODY2, sms.getMessageBody());
- CharSequence msgBody = (CharSequence) sms.getMessageBody();
+ CharSequence msgBody = sms.getMessageBody();
result = SmsMessage.calculateLength(msgBody, false);
assertEquals(SMS_NUMBER2, result[0]);
assertEquals(sms.getMessageBody().length(), result[1]);
diff --git a/tests/tests/telephony/src/android/telephony/gsm/cts/SmsManagerTest.java b/tests/tests/telephony/src/android/telephony/gsm/cts/SmsManagerTest.java
index 8dc6936..512e89d 100644
--- a/tests/tests/telephony/src/android/telephony/gsm/cts/SmsManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/gsm/cts/SmsManagerTest.java
@@ -28,6 +28,7 @@
@TestTargetClass(SmsManager.class)
public class SmsManagerTest extends android.telephony.cts.SmsManagerTest {
+ @Override
@TestTargetNew(
level = TestLevel.COMPLETE,
method = "getDefault",
diff --git a/tests/tests/view/src/android/view/cts/WindowTest.java b/tests/tests/view/src/android/view/cts/WindowTest.java
index 527f444..acd3c4e 100644
--- a/tests/tests/view/src/android/view/cts/WindowTest.java
+++ b/tests/tests/view/src/android/view/cts/WindowTest.java
@@ -44,6 +44,7 @@
import android.view.Menu;
import android.view.MenuItem;
import android.view.MotionEvent;
+import android.view.SurfaceHolder;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
@@ -1243,6 +1244,10 @@
public void setDefaultWindowFormat(int format) {
super.setDefaultWindowFormat(format);
}
+
+ @Override
+ public void takeSurface(SurfaceHolder.Callback callback) {
+ }
}
private class MockWindowCallback implements Window.Callback {