Fix CTS dpi tests.
Change dpi display check to use current api level rather than donut.
Refactor source packages to android.dpi namespace for consistency.
diff --git a/tests/tests/dpi/Android.mk b/tests/tests/dpi/Android.mk
index 672eca3..ffbe8a3 100644
--- a/tests/tests/dpi/Android.mk
+++ b/tests/tests/dpi/Android.mk
@@ -38,7 +38,7 @@
# CTS tests, so drop it into a library that other tests can use.
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := src/com/android/cts/dpi/DefaultManifestAttributesTest.java
+LOCAL_SRC_FILES := src/android/dpi/cts/DefaultManifestAttributesTest.java
LOCAL_MODULE_TAGS := optional
diff --git a/tests/tests/dpi/src/com/android/cts/dpi/ConfigurationTest.java b/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
similarity index 98%
rename from tests/tests/dpi/src/com/android/cts/dpi/ConfigurationTest.java
rename to tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
index e59b860..c03600a 100644
--- a/tests/tests/dpi/src/com/android/cts/dpi/ConfigurationTest.java
+++ b/tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java
@@ -27,7 +27,7 @@
import java.util.EnumSet;
/**
- * This is verifyin that the device under test is running a supported
+ * This is verifying that the device under test is running a supported
* resolution, and is being classified as the right Screen Layout
* Size.
*/
diff --git a/tests/tests/dpi/src/com/android/cts/dpi/DefaultManifestAttributesDonutTest.java b/tests/tests/dpi/src/android/dpi/cts/DefaultManifestAttributesSdkTest.java
similarity index 79%
rename from tests/tests/dpi/src/com/android/cts/dpi/DefaultManifestAttributesDonutTest.java
rename to tests/tests/dpi/src/android/dpi/cts/DefaultManifestAttributesSdkTest.java
index 683a9f8..9253eca 100644
--- a/tests/tests/dpi/src/com/android/cts/dpi/DefaultManifestAttributesDonutTest.java
+++ b/tests/tests/dpi/src/android/dpi/cts/DefaultManifestAttributesSdkTest.java
@@ -16,17 +16,19 @@
package android.dpi.cts;
+import android.os.Build;
+
/**
* This class actually tests the manifest attributes from
- * DefaultManifestAttributesTest for the donut sdk
+ * DefaultManifestAttributesTest for the current sdk
*/
-public class DefaultManifestAttributesDonutTest extends DefaultManifestAttributesTest {
+public class DefaultManifestAttributesSdkTest extends DefaultManifestAttributesTest {
protected String getPackageName() {
return "com.android.cts.dpi";
}
// This is a sanity test to make sure that we're instrumenting the proper package
public void testPackageHasExpectedSdkVersion() {
- assertEquals(4, getAppInfo().targetSdkVersion);
+ assertEquals(Build.VERSION.SDK_INT, getAppInfo().targetSdkVersion);
}
}
diff --git a/tests/tests/dpi/src/com/android/cts/dpi/DefaultManifestAttributesTest.java b/tests/tests/dpi/src/android/dpi/cts/DefaultManifestAttributesTest.java
similarity index 100%
rename from tests/tests/dpi/src/com/android/cts/dpi/DefaultManifestAttributesTest.java
rename to tests/tests/dpi/src/android/dpi/cts/DefaultManifestAttributesTest.java
diff --git a/tests/tests/dpi2/Android.mk b/tests/tests/dpi2/Android.mk
index ea17678..ae78a5c 100644
--- a/tests/tests/dpi2/Android.mk
+++ b/tests/tests/dpi2/Android.mk
@@ -28,7 +28,7 @@
LOCAL_MODULE_TAGS := optional
# We would set LOCAL_SDK_VERSION := 3 here, but the build system
-# doesn't currenlty support setting LOCAL_SDK_VERSION to anything but
+# doesn't currently support setting LOCAL_SDK_VERSION to anything but
# current.
include $(BUILD_PACKAGE)
diff --git a/tests/tests/dpi2/src/com/android/cts/dpi2/DefaultManifestAttributesCupcakeTest.java b/tests/tests/dpi2/src/android/dpi2/cts/DefaultManifestAttributesCupcakeTest.java
similarity index 100%
rename from tests/tests/dpi2/src/com/android/cts/dpi2/DefaultManifestAttributesCupcakeTest.java
rename to tests/tests/dpi2/src/android/dpi2/cts/DefaultManifestAttributesCupcakeTest.java