Merge changes I13c95c9e,I3026772e into nyc-dev
* changes:
Add CTS tests for some classes in android.transition.
Add tests for Transition.
diff --git a/OldCtsTestCaseList.mk b/OldCtsTestCaseList.mk
index 96547e7..edce609 100644
--- a/OldCtsTestCaseList.mk
+++ b/OldCtsTestCaseList.mk
@@ -267,7 +267,7 @@
CtsThemeHostTestCases \
CtsUiHostTestCases \
CtsUsbTests \
- CtsSystemUiHostTestCases \
+ CtsSystemUiHostTestCases
# List of native tests. For 32 bit targets, assumes that there will be
# one test executable, and it will end in 32. For 64 bit targets, assumes
diff --git a/apps/CtsVerifier/Android.mk b/apps/CtsVerifier/Android.mk
index 1ebc6ec..cf3d55a 100644
--- a/apps/CtsVerifier/Android.mk
+++ b/apps/CtsVerifier/Android.mk
@@ -33,7 +33,7 @@
apache-commons-math \
androidplot \
ctsverifier-opencv \
- core-tests \
+ core-tests-support \
android-support-v4 \
mockito-target \
mockwebserver \
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 85cd583..13bc98e 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -1457,6 +1457,18 @@
<meta-data android:name="test_required_features" android:value="android.software.device_admin" />
</activity>
+ <activity android:name=".managedprovisioning.DeviceOwnerRequestingBugreportTestActivity"
+ android:label="@string/device_owner_requesting_bugreport_tests">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <action android:name="com.android.cts.verifier.managedprovisioning.action.CHECK_DEVICE_OWNER_FOR_REQUESTING_BUGREPORT" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.cts.intent.category.MANUAL_TEST" />
+ </intent-filter>
+ <meta-data android:name="test_category" android:value="@string/test_category_managed_provisioning" />
+ <meta-data android:name="test_required_features" android:value="android.software.device_admin" />
+ </activity>
+
<activity android:name=".managedprovisioning.DeviceOwnerPositiveTestActivity$CommandReceiver"
android:exported="false"
android:theme="@android:style/Theme.NoDisplay"
diff --git a/apps/CtsVerifier/res/layout/requesting_bugreport_device_owner.xml b/apps/CtsVerifier/res/layout/requesting_bugreport_device_owner.xml
new file mode 100644
index 0000000..b2955ec
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/requesting_bugreport_device_owner.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ >
+
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="100dp"
+ android:layout_weight="2">
+ <TextView
+ android:id="@+id/requesting_bugreport_device_owner_instructions"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:padding="10dip"
+ android:text="@string/device_owner_requesting_bugreport_tests_info"
+ android:textSize="18dip" />
+ </ScrollView>
+
+ <Button
+ android:id="@+id/set_device_owner_button"
+ android:layout_width="204dp"
+ android:layout_height="wrap_content"
+ android:text="@string/set_device_owner_button_label" />
+
+ <ListView
+ android:id="@+id/android:list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="3" />
+
+ <include layout="@layout/pass_fail_buttons" />
+
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index 94c464f..cbd7f6b 100644
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -2146,6 +2146,90 @@
</string>
<string name="device_owner_user_vpn_restriction_set">Set VPN restriction</string>
+ <!-- Strings for DeviceOwnerBugreportTest -->
+ <string name="device_owner_requesting_bugreport_tests">Device Owner Requesting Bugreport Tests</string>
+ <string name="device_owner_requesting_bugreport_category">Device Owner Requesting Bugreport Tests</string>
+ <string name="device_owner_requesting_bugreport_tests_info">
+ The device owner requesting bugreport tests verify that a bugreport can be requested on a corporate owned device.\n
+ Press below button first, follow steps described in the dialog that pops up,
+ then proceed to the test cases.\n
+ Pressing \'back\', \'pass\' or \'fail\' on this test page will remove the device owner.\n
+ Alternatively, you can run the \'Remove device owner\' test. Ideally, that test should
+ be run last so that it does not interfere with other tests.
+ </string>
+ <string name="device_owner_request_bugreport">Request bugreport</string>
+ <string name="bugreport_sharing_declined">Bugreport sharing declined</string>
+ <string name="bugreport_shared_successfully">Bugreport shared successfully</string>
+ <string name="device_owner_bugreport_sharing_declined_while_being_taken">Sharing of requested bugreport declined while being taken</string>
+ <string name="device_owner_bugreport_sharing_declined_while_being_taken_info">
+ Please press the \"Request bugreport\" button to invoke the bugreport sharing operation.
+ Open the notifications panel and verify that:\n
+ \n
+ - Notification titled \"Taking bugreport...\" with an indefinite progress bar is present.\n
+ - Tapping on the \"Taking bugreport...\" notification opens a dialog titled \"Share bug report?\", that contains a message \"Your IT admin requested a bug report to help troubleshoot this device. Apps and data may be shared, and your device may temporarily slow down.\" and two buttons - \"DECLINE\" and \"SHARE\".\n
+ \n
+ Tap the \"DECLINE\" button and verify that:\n
+ \n
+ - \"Taking bugreport...\" notification with an indefinite progress bar is no longer present.\n
+ - Notification titled \"Device Owner Requesting Bugreport Tests\" with message \"Bugreport sharing declined\" is present.\n
+ \n
+ Dismiss the notifications and mark test as passed or failed.
+ </string>
+ <string name="device_owner_bugreport_sharing_accepted_while_being_taken">Sharing of requested bugreport accepted while being taken</string>
+ <string name="device_owner_bugreport_sharing_accepted_while_being_taken_info">
+ Please press the \"Request bugreport\" button to invoke the bugreport sharing operation.
+ Open the notifications panel and verify that:\n
+ \n
+ - Notification titled \"Taking bugreport...\" with an indefinite progress bar is present.\n
+ - Tapping on the \"Taking bugreport...\" notification opens a dialog titled \"Share bug report?\", that contains a message \"Your IT admin requested a bug report to help troubleshoot this device. Apps and data may be shared, and your device may temporarily slow down.\" and two buttons - \"DECLINE\" and \"SHARE\".\n
+ \n
+ Tap the \"SHARE\" button and verify that:\n
+ \n
+ - \"Taking bugreport...\" notification with an indefinite progress bar is no longer present.\n
+ - Notification titled \"Sharing bugreport...\" with an indefinite progress bar is present.\n
+ - After a few minutes (time necessary to wait for bugreport being collected) notification titled \"Sharing bugreport...\" is automatically dismissed and notification titled \"Device Owner Requesting Bugreport Tests\" with message \"Bugreport shared successfully\" is present.\n
+ \n
+ Dismiss the notifications and mark test as passed or failed.
+ </string>
+ <string name="device_owner_bugreport_sharing_declined_after_having_been_taken">Sharing of requested bugreport declined after having been taken</string>
+ <string name="device_owner_bugreport_sharing_declined_after_having_been_taken_info">
+ Please press the \"Request bugreport\" button to invoke the bugreport sharing operation.
+ Open the notifications panel and verify that:\n
+ \n
+ - Notification titled \"Taking bugreport...\" with an indefinite progress bar is present.\n
+ \n
+ Wait for a few minutes (time necessary for bugreport to be collected) and verify that:\n
+ \n
+ - \"Taking bugreport...\" notification with an indefinite progress bar is dismissed.\n
+ - Notification titled \"Share bug report?\", that contains a message \"Your IT admin requested a bug report to help troubleshoot this device. Apps and data may be shared.\" and two buttons - \"DECLINE\" and \"SHARE\" is shown.\n
+ \n
+ Tap the \"DECLINE\" button and verify that:\n
+ \n
+ - Notification titled \"Share bug report?\" is dismissed.\n
+ - Notification titled \"Device Owner Requesting Bugreport Tests\" with message \"Bugreport sharing declined\" is present.\n
+ \n
+ Dismiss the notifications and mark test as passed or failed.
+ </string>
+ <string name="device_owner_bugreport_sharing_accepted_after_having_been_taken">Sharing of requested bugreport accepted after having been taken</string>
+ <string name="device_owner_bugreport_sharing_accepted_after_having_been_taken_info">
+ Please press the \"Request bugreport\" button to invoke the bugreport sharing operation.
+ Open the notifications panel and verify that:\n
+ \n
+ - Notification titled \"Taking bugreport...\" with an indefinite progress bar is present.\n
+ \n
+ Wait for a few minutes (time necessary for bugreport to be collected) and verify that:\n
+ \n
+ - \"Taking bugreport...\" notification with an indefinite progress bar is dismissed.\n
+ - Notification titled \"Share bug report?\", that contains a message \"Your IT admin requested a bug report to help troubleshoot this device. Apps and data may be shared.\" and two buttons - \"DECLINE\" and \"SHARE\" is shown.\n
+ \n
+ Tap the \"SHARE\" button and verify that:\n
+ \n
+ - Notification titled \"Share bug report?\" is dismissed.\n
+ - Notification titled \"Device Owner Requesting Bugreport Tests\" with message \"Bugreport shared successfully\" is present.\n
+ \n
+ Dismiss the notifications and mark test as passed or failed.
+ </string>
+
<!-- Strings used for policy transparency test -->
<string name="device_profile_owner_policy_transparency_test">Policy transparency test</string>
<string name="device_profile_owner_policy_transparency_test_info">
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java
index e5af6ba..44029a9 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java
@@ -74,6 +74,7 @@
private Size mSurfaceSize;
private boolean mCameraInitialized = false;
private boolean mPreviewActive = false;
+ private boolean mTakingPicture = false;
private int mResolutionSpinnerIndex = -1;
private WakeLock mWakeLock;
private long shutterStartTime;
@@ -148,15 +149,18 @@
previewView.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
- shutterStartTime = System.currentTimeMillis();
+ if (!mTakingPicture) {
+ mTakingPicture = true;
+ shutterStartTime = System.currentTimeMillis();
- mCamera.takePicture(new ShutterCallback() {
- @Override
- public void onShutter() {
- long dT = System.currentTimeMillis() - shutterStartTime;
- Log.d("CTS", "Shutter Lag: " + dT);
- }
- }, null, PhotoCaptureActivity.this);
+ mCamera.takePicture(new ShutterCallback() {
+ @Override
+ public void onShutter() {
+ long dT = System.currentTimeMillis() - shutterStartTime;
+ Log.d("CTS", "Shutter Lag: " + dT);
+ }
+ }, null, PhotoCaptureActivity.this);
+ }
}
});
@@ -268,6 +272,7 @@
String message = getResources().getString(R.string.camera_fov_reported_fov_problem_message);
dialogBuilder.setMessage(String.format(message, mReportedFovPrePictureTaken, mReportedFovDegrees));
mActiveDialog = dialogBuilder.show();
+ mTakingPicture = false;
return;
}
@@ -285,8 +290,8 @@
Log.e(TAG, "Could not save picture file.", e);
Toast.makeText(this, "Could not save picture file: " + e.getMessage(),
Toast.LENGTH_LONG).show();
- return;
}
+ mTakingPicture = false;
}
@Override
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CommandReceiverActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CommandReceiverActivity.java
index 8636646..4f26b9c 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CommandReceiverActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CommandReceiverActivity.java
@@ -54,6 +54,7 @@
public static final String COMMAND_DEVICE_OWNER_CLEAR_POLICIES = "do-clear-policies";
public static final String COMMAND_PROFILE_OWNER_CLEAR_POLICIES = "po-clear-policies";
public static final String COMMAND_REMOVE_DEVICE_OWNER = "remove-device-owner";
+ public static final String COMMAND_REQUEST_BUGREPORT = "request-bugreport";
public static final String EXTRA_USER_RESTRICTION =
"com.android.cts.verifier.managedprovisioning.extra.USER_RESTRICTION";
@@ -142,6 +143,12 @@
clearAllPolicies();
mDpm.clearDeviceOwnerApp(getPackageName());
} break;
+ case COMMAND_REQUEST_BUGREPORT: {
+ if (!mDpm.isDeviceOwnerApp(getPackageName())) {
+ return;
+ }
+ mDpm.requestBugreport(mAdmin);
+ } break;
case COMMAND_DEVICE_OWNER_CLEAR_POLICIES: {
if (!mDpm.isDeviceOwnerApp(getPackageName())) {
return;
@@ -201,4 +208,4 @@
mDpm.setPermittedAccessibilityServices(mAdmin, null);
mDpm.setPermittedInputMethods(mAdmin, null);
}
-}
\ No newline at end of file
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceAdminTestReceiver.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceAdminTestReceiver.java
index a8870ca..d7d9b71 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceAdminTestReceiver.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceAdminTestReceiver.java
@@ -16,6 +16,8 @@
package com.android.cts.verifier.managedprovisioning;
+import android.app.Notification;
+import android.app.NotificationManager;
import android.app.admin.DeviceAdminReceiver;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
@@ -25,6 +27,7 @@
import android.provider.Settings;
import android.util.Log;
+import com.android.cts.verifier.R;
import com.android.cts.verifier.location.LocationListenerActivity;
/**
@@ -39,6 +42,7 @@
DEVICE_OWNER_PKG + ".managedprovisioning.DeviceAdminTestReceiver";
private static final ComponentName RECEIVER_COMPONENT_NAME = new ComponentName(
DEVICE_OWNER_PKG, ADMIN_RECEIVER_TEST_CLASS);
+ private static final int BUGREPORT_NOTIFICATION_ID = 12345;
public static ComponentName getReceiverComponentName() {
return RECEIVER_COMPONENT_NAME;
@@ -50,6 +54,20 @@
setupProfile(context);
}
+ @Override
+ public void onBugreportSharingDeclined(Context context, Intent intent) {
+ Log.i(TAG, "Bugreport sharing declined");
+ showBugreportNotification(context, context.getString(
+ R.string.bugreport_sharing_declined), BUGREPORT_NOTIFICATION_ID);
+ }
+
+ @Override
+ public void onBugreportShared(Context context, Intent intent, String bugreportFileHash) {
+ Log.i(TAG, "Bugreport shared");
+ showBugreportNotification(context, context.getString(
+ R.string.bugreport_shared_successfully), BUGREPORT_NOTIFICATION_ID);
+ }
+
private void setupProfile(Context context) {
DevicePolicyManager dpm = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
dpm.setProfileEnabled(new ComponentName(context.getApplicationContext(), getClass()));
@@ -102,4 +120,18 @@
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent);
}
+
+ private void showBugreportNotification(Context context, String msg,
+ int notificationId) {
+ NotificationManager mNotificationManager =
+ (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+ Notification notification = new Notification.Builder(context)
+ .setSmallIcon(R.drawable.icon)
+ .setContentTitle(context.getString(
+ R.string.device_owner_requesting_bugreport_tests))
+ .setContentText(msg)
+ .setStyle(new Notification.BigTextStyle().bigText(msg))
+ .build();
+ mNotificationManager.notify(notificationId, notification);
+ }
}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerRequestingBugreportTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerRequestingBugreportTestActivity.java
new file mode 100644
index 0000000..1d23175
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/DeviceOwnerRequestingBugreportTestActivity.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2016 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.cts.verifier.managedprovisioning;
+
+import static com.android.cts.verifier.managedprovisioning.Utils.createInteractiveTestItem;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.database.DataSetObserver;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+import com.android.cts.verifier.ArrayTestListAdapter;
+import com.android.cts.verifier.IntentDrivenTestActivity.ButtonInfo;
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.TestListAdapter.TestListItem;
+import com.android.cts.verifier.TestResult;
+
+/**
+ * Activity that lists all requesting bugreport device owner tests. Requires the following
+ * adb command be issued by the user prior to starting the tests:
+ *
+ * adb shell dpm set-device-owner
+ * 'com.android.cts.verifier/com.android.cts.verifier.managedprovisioning.DeviceAdminTestReceiver'
+ */
+public class DeviceOwnerRequestingBugreportTestActivity extends PassFailButtons.TestListActivity {
+ private static final String TAG = "DeviceOwnerRequestingBugreportTestActivity";
+
+ private static final String ACTION_CHECK_DEVICE_OWNER_FOR_REQUESTING_BUGREPORT =
+ "com.android.cts.verifier.managedprovisioning.action" +
+ ".CHECK_DEVICE_OWNER_FOR_REQUESTING_BUGREPORT";
+ static final String EXTRA_TEST_ID = "extra-test-id";
+
+ private static final String CHECK_DEVICE_OWNER_TEST_ID = "CHECK_DEVICE_OWNER";
+ private static final String DEVICE_ADMIN_SETTINGS_ID = "DEVICE_ADMIN_SETTINGS";
+ private static final String BUGREPORT_SHARING_DECLINED_WHILE_BEING_TAKEN =
+ "BUGREPORT_SHARING_DECLINED_WHILE_RUNNING";
+ private static final String BUGREPORT_SHARING_ACCEPTED_WHILE_BEING_TAKEN =
+ "BUGREPORT_SHARING_ACCEPTED_WHILE_RUNNING";
+ private static final String BUGREPORT_SHARING_DECLINED_AFTER_HAVING_BEEN_TAKEN =
+ "BUGREPORT_SHARING_DECLINED_AFTER_HAVING_BEEN_TAKEN";
+ private static final String BUGREPORT_SHARING_ACCEPTED_AFTER_HAVING_BEEN_TAKEN =
+ "BUGREPORT_SHARING_ACCEPTED_AFTER_HAVING_BEEN_TAKEN";
+ private static final String REMOVE_DEVICE_OWNER_TEST_ID = "REMOVE_DEVICE_OWNER";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ if (ACTION_CHECK_DEVICE_OWNER_FOR_REQUESTING_BUGREPORT.equals(getIntent().getAction())) {
+ DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(
+ Context.DEVICE_POLICY_SERVICE);
+ if (dpm.isDeviceOwnerApp(getPackageName())) {
+ TestResult.setPassedResult(this, getIntent().getStringExtra(EXTRA_TEST_ID),
+ null, null);
+ } else {
+ TestResult.setFailedResult(this, getIntent().getStringExtra(EXTRA_TEST_ID),
+ getString(R.string.device_owner_incorrect_device_owner), null);
+ }
+ finish();
+ return;
+ }
+
+ setContentView(R.layout.requesting_bugreport_device_owner);
+ setInfoResources(R.string.device_owner_requesting_bugreport_tests,
+ R.string.device_owner_requesting_bugreport_tests_info, 0);
+ setPassFailButtonClickListeners();
+
+ final ArrayTestListAdapter adapter = new ArrayTestListAdapter(this);
+ adapter.add(TestListItem.newCategory(this,
+ R.string.device_owner_requesting_bugreport_category));
+
+ addTestsToAdapter(adapter);
+
+ adapter.registerDataSetObserver(new DataSetObserver() {
+ @Override
+ public void onChanged() {
+ updatePassButton();
+ }
+ });
+
+ setTestListAdapter(adapter);
+
+ View setDeviceOwnerButton = findViewById(R.id.set_device_owner_button);
+ setDeviceOwnerButton.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ new AlertDialog.Builder(
+ DeviceOwnerRequestingBugreportTestActivity.this)
+ .setIcon(android.R.drawable.ic_dialog_info)
+ .setTitle(R.string.set_device_owner_dialog_title)
+ .setMessage(R.string.set_device_owner_dialog_text)
+ .setPositiveButton(android.R.string.ok, null)
+ .show();
+ }
+ });
+ }
+
+ @Override
+ public void finish() {
+ // If this activity was started for checking device owner status, then no need to do any
+ // tear down.
+ if (!ACTION_CHECK_DEVICE_OWNER_FOR_REQUESTING_BUGREPORT.equals(getIntent().getAction())) {
+ // Pass and fail buttons are known to call finish() when clicked,
+ // and this is when we want to remove the device owner.
+ startActivity(createTearDownIntent());
+ }
+ super.finish();
+ }
+
+ private void addTestsToAdapter(final ArrayTestListAdapter adapter) {
+ adapter.add(createTestItem(this, CHECK_DEVICE_OWNER_TEST_ID,
+ R.string.device_owner_check_device_owner_test,
+ new Intent(ACTION_CHECK_DEVICE_OWNER_FOR_REQUESTING_BUGREPORT)
+ .putExtra(EXTRA_TEST_ID, getIntent().getStringExtra(EXTRA_TEST_ID))));
+
+ // bugreport sharing declined while running test
+ adapter.add(createInteractiveTestItem(this, BUGREPORT_SHARING_DECLINED_WHILE_BEING_TAKEN,
+ R.string.device_owner_bugreport_sharing_declined_while_being_taken,
+ R.string.device_owner_bugreport_sharing_declined_while_being_taken_info,
+ new ButtonInfo(
+ R.string.device_owner_request_bugreport,
+ createRequestBugreportIntent())));
+
+ // bugreport sharing accepted while running test
+ adapter.add(createInteractiveTestItem(this, BUGREPORT_SHARING_ACCEPTED_WHILE_BEING_TAKEN,
+ R.string.device_owner_bugreport_sharing_accepted_while_being_taken,
+ R.string.device_owner_bugreport_sharing_accepted_while_being_taken_info,
+ new ButtonInfo(
+ R.string.device_owner_request_bugreport,
+ createRequestBugreportIntent())));
+
+ // bugreport sharing declined after having been taken test
+ adapter.add(createInteractiveTestItem(this,
+ BUGREPORT_SHARING_DECLINED_AFTER_HAVING_BEEN_TAKEN,
+ R.string.device_owner_bugreport_sharing_declined_after_having_been_taken,
+ R.string.device_owner_bugreport_sharing_declined_after_having_been_taken_info,
+ new ButtonInfo(
+ R.string.device_owner_request_bugreport,
+ createRequestBugreportIntent())));
+
+ // bugreport sharing accepted after having been taken test
+ adapter.add(createInteractiveTestItem(this,
+ BUGREPORT_SHARING_ACCEPTED_AFTER_HAVING_BEEN_TAKEN,
+ R.string.device_owner_bugreport_sharing_accepted_after_having_been_taken,
+ R.string.device_owner_bugreport_sharing_accepted_after_having_been_taken_info,
+ new ButtonInfo(
+ R.string.device_owner_request_bugreport,
+ createRequestBugreportIntent())));
+
+ // removeDeviceOwner
+ adapter.add(createInteractiveTestItem(this, REMOVE_DEVICE_OWNER_TEST_ID,
+ R.string.device_owner_remove_device_owner_test,
+ R.string.device_owner_remove_device_owner_test_info,
+ new ButtonInfo(
+ R.string.remove_device_owner_button,
+ createTearDownIntent())));
+ }
+
+ static TestListItem createTestItem(Activity activity, String id, int titleRes,
+ Intent intent) {
+ intent.putExtra(EXTRA_TEST_ID, id);
+ return TestListItem.newTest(activity, titleRes, id, intent, null);
+ }
+
+ private Intent createTearDownIntent() {
+ return new Intent(this, CommandReceiverActivity.class)
+ .putExtra(CommandReceiverActivity.EXTRA_COMMAND,
+ CommandReceiverActivity.COMMAND_REMOVE_DEVICE_OWNER);
+ }
+
+ private Intent createRequestBugreportIntent() {
+ return new Intent(this, CommandReceiverActivity.class)
+ .putExtra(CommandReceiverActivity.EXTRA_COMMAND,
+ CommandReceiverActivity.COMMAND_REQUEST_BUGREPORT);
+ }
+}
diff --git a/apps/PermissionApp/Android.mk b/apps/PermissionApp/Android.mk
index 57950da..50b1759 100644
--- a/apps/PermissionApp/Android.mk
+++ b/apps/PermissionApp/Android.mk
@@ -28,4 +28,7 @@
LOCAL_SDK_VERSION := current
+# tag this module as a cts test artifact
+LOCAL_COMPATIBILITY_SUITE := cts
+
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/SuspendPackageTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/SuspendPackageTest.java
index 15b4103..12461e1 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/SuspendPackageTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/SuspendPackageTest.java
@@ -32,6 +32,11 @@
{INTENT_RECEIVER_PKG}, true);
// all packages should be handled.
assertEquals(0, notHandledPackages.length);
+ // test getPackageSuspended
+ boolean isSuspended =
+ mDevicePolicyManager.getPackageSuspended(
+ ADMIN_RECEIVER_COMPONENT, INTENT_RECEIVER_PKG);
+ assertTrue(isSuspended);
}
public void testSetPackagesNotSuspended() {
@@ -41,6 +46,11 @@
false);
// all packages should be handled.
assertEquals(0, notHandledPackages.length);
+ // test getPackageSuspended
+ boolean isSuspended =
+ mDevicePolicyManager.getPackageSuspended(
+ ADMIN_RECEIVER_COMPONENT, INTENT_RECEIVER_PKG);
+ assertFalse(isSuspended);
}
/**
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/RemoteBugreportTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/RemoteBugreportTest.java
index 3cdaef0..d9364b9 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/RemoteBugreportTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/RemoteBugreportTest.java
@@ -43,6 +43,7 @@
"There should only be one user, managed by Device Owner";
private static final String TAKING_BUG_REPORT = "Taking bug report";
+ private static final String DECLINE = "DECLINE";
private DevicePolicyManager mDevicePolicyManager;
private Context mContext;
@@ -91,14 +92,15 @@
}
/**
- * Clicks on "Taking bugreport..." notification to cancel the whole
- * remote bugreport flow (including stopping the dumpstate service).
+ * Clicks on "Taking bugreport..." notification, and then DECLINE button on the consent dialog
+ * to cancel the whole remote bugreport flow (including stopping the dumpstate service).
*/
private void cancelRemoteBugreportFlowIfStartedSuccessfully(boolean startedSuccessfully) {
if (!startedSuccessfully) {
return;
}
mUiDevice.openNotification();
+
// give it max 5 seconds to find the notification
boolean notificationPresent = mUiDevice.wait(
Until.hasObject(By.textStartsWith(TAKING_BUG_REPORT)), UI_TIMEOUT);
@@ -111,7 +113,20 @@
bugreportNotification.click();
} catch (UiObjectNotFoundException e) {
throw new IllegalStateException(
- "Exception when clicking on 'taking bugreport' notification", e);
+ "Exception when clicking on 'Taking bugreport' notification", e);
+ }
+
+ // give it max 5 seconds to find the DECLINE button on the dialog
+ boolean declineButtonPresent = mUiDevice.wait(
+ Until.hasObject(By.text(DECLINE)), UI_TIMEOUT);
+ assertTrue(declineButtonPresent);
+
+ UiObject declineButton = mUiDevice.findObject(new UiSelector().text(DECLINE));
+ assertNotNull(declineButton);
+ try {
+ declineButton.click();
+ } catch (UiObjectNotFoundException e) {
+ throw new IllegalStateException("Exception when clicking on 'DECLINE' button", e);
}
}
}
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/WifiTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/WifiTest.java
index a585da4..e7df649 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/WifiTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/WifiTest.java
@@ -27,7 +27,7 @@
// wifi not supported.
return;
}
- final String macAddress = mDevicePolicyManager.getWifiMacAddress();
+ final String macAddress = mDevicePolicyManager.getWifiMacAddress(getWho());
assertFalse("Device owner should be able to get the real MAC address",
"02:00:00:00:00:00".equals(macAddress));
diff --git a/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/WifiTest.java b/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/WifiTest.java
index bbff4c5..7520ea4 100644
--- a/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/WifiTest.java
+++ b/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/WifiTest.java
@@ -18,7 +18,7 @@
public class WifiTest extends BaseProfileOwnerTest {
public void testGetWifiMacAddress() {
try {
- mDevicePolicyManager.getWifiMacAddress();
+ mDevicePolicyManager.getWifiMacAddress(getWho());
fail("Profile owner shouldn't be able to get the MAC address");
} catch (SecurityException e) {
if (!e.getMessage().contains("for policy #-2")) {
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java
index 71f11a7..60bbc55 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java
@@ -108,9 +108,15 @@
protected void installAppAsUser(String appFileName, int userId) throws FileNotFoundException,
DeviceNotAvailableException {
+ installAppAsUser(appFileName, true, userId);
+ }
+
+ protected void installAppAsUser(String appFileName, boolean grantPermissions, int userId)
+ throws FileNotFoundException, DeviceNotAvailableException {
CLog.logAndDisplay(LogLevel.INFO, "Installing app " + appFileName + " for user " + userId);
String result = getDevice().installPackageForUser(
- MigrationHelper.getTestFile(mCtsBuild, appFileName), true, userId);
+ MigrationHelper.getTestFile(mCtsBuild, appFileName), true, grantPermissions,
+ userId);
assertNull("Failed to install " + appFileName + " for user " + userId + ": " + result,
result);
}
@@ -166,7 +172,9 @@
}
protected void removeUser(int userId) throws Exception {
- assertTrue("Couldn't remove user", getDevice().removeUser(userId));
+ if (listUsers().contains(userId) && userId != 0) {
+ assertTrue("Couldn't remove user", getDevice().removeUser(userId));
+ }
}
protected void removeTestUsers() throws Exception {
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
index a9733ae..d9e7790 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
@@ -22,6 +22,7 @@
import com.android.tradefed.log.LogUtil.CLog;
import java.io.File;
+import java.io.FileNotFoundException;
/**
* Set of tests for use cases that apply to profile and device owner.
@@ -158,7 +159,7 @@
if (!mHasFeature) {
return;
}
- installAppAsUser(PERMISSIONS_APP_APK, mUserId);
+ installAppPermissionAppAsUser();
executeDeviceTestMethod(".PermissionsTest", "testPermissionGrantState");
}
@@ -174,7 +175,7 @@
if (!mHasFeature) {
return;
}
- installAppAsUser(PERMISSIONS_APP_APK, mUserId);
+ installAppPermissionAppAsUser();
executeDeviceTestMethod(".PermissionsTest", "testPermissionPolicy");
}
@@ -182,7 +183,7 @@
if (!mHasFeature) {
return;
}
- installAppAsUser(PERMISSIONS_APP_APK, mUserId);
+ installAppPermissionAppAsUser();
executeDeviceTestMethod(".PermissionsTest", "testPermissionMixedPolicies");
}
@@ -190,7 +191,7 @@
if (!mHasFeature) {
return;
}
- installAppAsUser(PERMISSIONS_APP_APK, mUserId);
+ installAppPermissionAppAsUser();
executeDeviceTestMethod(".PermissionsTest", "testPermissionPrompts");
}
@@ -198,31 +199,31 @@
if (!mHasFeature) {
return;
}
- installAppAsUser(PERMISSIONS_APP_APK, mUserId);
+ installAppPermissionAppAsUser();
executeDeviceTestMethod(".PermissionsTest", "testPermissionUpdate_setDeniedState");
executeDeviceTestMethod(".PermissionsTest", "testPermissionUpdate_checkDenied");
- installAppAsUser(PERMISSIONS_APP_APK, mUserId);
+ installAppPermissionAppAsUser();
executeDeviceTestMethod(".PermissionsTest", "testPermissionUpdate_checkDenied");
assertNull(getDevice().uninstallPackage(PERMISSIONS_APP_PKG));
- installAppAsUser(PERMISSIONS_APP_APK, mUserId);
+ installAppPermissionAppAsUser();
executeDeviceTestMethod(".PermissionsTest", "testPermissionUpdate_setGrantedState");
executeDeviceTestMethod(".PermissionsTest", "testPermissionUpdate_checkGranted");
- installAppAsUser(PERMISSIONS_APP_APK, mUserId);
+ installAppPermissionAppAsUser();
executeDeviceTestMethod(".PermissionsTest", "testPermissionUpdate_checkGranted");
assertNull(getDevice().uninstallPackage(PERMISSIONS_APP_PKG));
- installAppAsUser(PERMISSIONS_APP_APK, mUserId);
+ installAppPermissionAppAsUser();
executeDeviceTestMethod(".PermissionsTest", "testPermissionUpdate_setAutoDeniedPolicy");
executeDeviceTestMethod(".PermissionsTest", "testPermissionUpdate_checkDenied");
- installAppAsUser(PERMISSIONS_APP_APK, mUserId);
+ installAppPermissionAppAsUser();
executeDeviceTestMethod(".PermissionsTest", "testPermissionUpdate_checkDenied");
assertNull(getDevice().uninstallPackage(PERMISSIONS_APP_PKG));
- installAppAsUser(PERMISSIONS_APP_APK, mUserId);
+ installAppPermissionAppAsUser();
executeDeviceTestMethod(".PermissionsTest", "testPermissionUpdate_setAutoGrantedPolicy");
executeDeviceTestMethod(".PermissionsTest", "testPermissionUpdate_checkGranted");
- installAppAsUser(PERMISSIONS_APP_APK, mUserId);
+ installAppPermissionAppAsUser();
executeDeviceTestMethod(".PermissionsTest", "testPermissionUpdate_checkGranted");
}
@@ -268,7 +269,7 @@
if (!mHasFeature) {
return;
}
- installAppAsUser(PERMISSIONS_APP_APK, mUserId);
+ installAppPermissionAppAsUser();
executeDeviceTestClass(".ApplicationHiddenTest");
}
@@ -459,6 +460,11 @@
assertTrue(runDeviceTestsAsUser(DEVICE_ADMIN_PKG, className, testName, mUserId));
}
+ private void installAppPermissionAppAsUser()
+ throws FileNotFoundException, DeviceNotAvailableException {
+ installAppAsUser(PERMISSIONS_APP_APK, false, mUserId);
+ }
+
private void executeSuspendPackageTestMethod(String testName) throws Exception {
assertTrue(runDeviceTestsAsUser(INTENT_SENDER_PKG, ".SuspendPackageTest",
testName, mUserId));
diff --git a/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
index 73a5d57..def3439 100644
--- a/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
+++ b/hostsidetests/net/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
@@ -87,8 +87,6 @@
.getPackageInfo(mContext.getPackageName(), 0).applicationInfo.uid;
Log.d(TAG, "UIDS: test app=" + myUid + ", app2=" + mUid);
-
- setMeteredNetwork();
}
@Override
diff --git a/hostsidetests/net/app/src/com/android/cts/net/hostside/BatterySaverModeNonMeteredTest.java b/hostsidetests/net/app/src/com/android/cts/net/hostside/BatterySaverModeNonMeteredTest.java
new file mode 100644
index 0000000..5181057
--- /dev/null
+++ b/hostsidetests/net/app/src/com/android/cts/net/hostside/BatterySaverModeNonMeteredTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2016 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.cts.net.hostside;
+
+//TODO: move this and BatterySaverModeTest's logic into a common superclass
+public class BatterySaverModeNonMeteredTest extends AbstractRestrictBackgroundNetworkTestCase {
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+
+ setPowerSaveMode(false);
+ assertPowerSaveModeWhitelist(TEST_APP2_PKG, false); // Sanity check
+ registerApp2BroadcastReceiver();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+
+ setPowerSaveMode(false);
+ }
+
+ public void testBackgroundNetworkAccess_enabled() throws Exception {
+ setPowerSaveMode(true);
+ assertBackgroundNetworkAccess(false);
+ }
+
+ public void testBackgroundNetworkAccess_whitelisted() throws Exception {
+ setPowerSaveMode(true);
+ assertBackgroundNetworkAccess(false);
+ addPowerSaveModeWhitelist(TEST_APP2_PKG);
+ assertBackgroundNetworkAccess(true);
+ removePowerSaveModeWhitelist(TEST_APP2_PKG);
+ assertBackgroundNetworkAccess(false);
+ }
+
+ public void testBackgroundNetworkAccess_disabled() throws Exception {
+ setPowerSaveMode(false);
+ assertBackgroundNetworkAccess(true);
+ }
+}
diff --git a/hostsidetests/net/app/src/com/android/cts/net/hostside/BatterySaverModeTest.java b/hostsidetests/net/app/src/com/android/cts/net/hostside/BatterySaverModeTest.java
index 29a0309..18e2b3e 100644
--- a/hostsidetests/net/app/src/com/android/cts/net/hostside/BatterySaverModeTest.java
+++ b/hostsidetests/net/app/src/com/android/cts/net/hostside/BatterySaverModeTest.java
@@ -16,12 +16,14 @@
package com.android.cts.net.hostside;
+//TODO: move this and BatterySaverModeNonMeteredTest's logic into a common superclass
public class BatterySaverModeTest extends AbstractRestrictBackgroundNetworkTestCase {
@Override
public void setUp() throws Exception {
super.setUp();
+ setMeteredNetwork();
setPowerSaveMode(false);
assertPowerSaveModeWhitelist(TEST_APP2_PKG, false); // Sanity check
registerApp2BroadcastReceiver();
diff --git a/hostsidetests/net/app/src/com/android/cts/net/hostside/DataSaverModeTest.java b/hostsidetests/net/app/src/com/android/cts/net/hostside/DataSaverModeTest.java
index 61593a1..b9fca39 100644
--- a/hostsidetests/net/app/src/com/android/cts/net/hostside/DataSaverModeTest.java
+++ b/hostsidetests/net/app/src/com/android/cts/net/hostside/DataSaverModeTest.java
@@ -26,6 +26,7 @@
public void setUp() throws Exception {
super.setUp();
+ setMeteredNetwork();
setRestrictBackground(false);
registerApp2BroadcastReceiver();
}
diff --git a/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/Common.java b/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/Common.java
index f5f5faf..668669b 100644
--- a/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/Common.java
+++ b/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/Common.java
@@ -15,6 +15,10 @@
*/
package com.android.cts.net.hostside.app2;
+import android.content.Context;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.util.Log;
+
public final class Common {
static final String TAG = "CtsNetApp2";
@@ -35,4 +39,13 @@
static final char RESULT_SEPARATOR = ';';
static final String STATUS_NETWORK_UNAVAILABLE_PREFIX = "NetworkUnavailable:";
static final String STATUS_NETWORK_AVAILABLE_PREFIX = "NetworkAvailable:";
+
+ static int getUid(Context context) {
+ final String packageName = context.getPackageName();
+ try {
+ return context.getPackageManager().getPackageUid(packageName, 0);
+ } catch (NameNotFoundException e) {
+ throw new IllegalStateException("Could not get UID for " + packageName, e);
+ }
+ }
}
diff --git a/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyBroadcastReceiver.java b/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyBroadcastReceiver.java
index 94ec6af..07f717b 100644
--- a/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyBroadcastReceiver.java
+++ b/hostsidetests/net/app2/src/com/android/cts/net/hostside/app2/MyBroadcastReceiver.java
@@ -27,6 +27,7 @@
import static com.android.cts.net.hostside.app2.Common.STATUS_NETWORK_AVAILABLE_PREFIX;
import static com.android.cts.net.hostside.app2.Common.STATUS_NETWORK_UNAVAILABLE_PREFIX;
import static com.android.cts.net.hostside.app2.Common.TAG;
+import static com.android.cts.net.hostside.app2.Common.getUid;
import java.net.HttpURLConnection;
import java.net.URL;
@@ -110,7 +111,7 @@
final int apiStatus = cm.getRestrictBackgroundStatus();
String netStatus;
try {
- netStatus = checkNetworkStatus(cm);
+ netStatus = checkNetworkStatus(context, cm);
} catch (InterruptedException e) {
Log.e(TAG, "Timeout checking network status");
setResultData(null);
@@ -124,7 +125,8 @@
setResultData(data.toString());
}
- private String checkNetworkStatus(final ConnectivityManager cm) throws InterruptedException {
+ private String checkNetworkStatus(final Context context, final ConnectivityManager cm)
+ throws InterruptedException {
final LinkedBlockingQueue<String> result = new LinkedBlockingQueue<>(1);
new Thread(new Runnable() {
@@ -134,7 +136,7 @@
final String address = "http://example.com";
final NetworkInfo networkInfo = cm.getActiveNetworkInfo();
Log.d(TAG, "Running checkNetworkStatus() on thread "
- + Thread.currentThread().getName()
+ + Thread.currentThread().getName() + " for UID " + getUid(context)
+ "\n\tactiveNetworkInfo: " + networkInfo + "\n\tURL: " + address);
String prefix = STATUS_NETWORK_AVAILABLE_PREFIX;
try {
@@ -151,7 +153,9 @@
Log.d(TAG, "Exception getting " + address + ": " + e);
prefix = STATUS_NETWORK_UNAVAILABLE_PREFIX + "Exception " + e + ":";
}
- result.offer(prefix + networkInfo);
+ final String netInfo = prefix + networkInfo;
+ Log.d(TAG, "Offering " + netInfo);
+ result.offer(netInfo);
}
}, mName).start();
return result.poll(NETWORK_TIMEOUT_MS * 2, TimeUnit.MILLISECONDS);
diff --git a/hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java b/hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
index eade261..2bd76e6 100644
--- a/hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
+++ b/hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
@@ -100,6 +100,21 @@
assertPowerSaveModeWhitelist(TEST_PKG, false);
}
+ public void testBatteryBatterySaverModeNonMeteredTest_disabled() throws Exception {
+ runDeviceTests(TEST_PKG, TEST_PKG + ".BatterySaverModeNonMeteredTest",
+ "testBackgroundNetworkAccess_disabled");
+ }
+
+ public void testBatteryBatterySaverModeNonMeteredTest_whitelisted() throws Exception {
+ runDeviceTests(TEST_PKG, TEST_PKG + ".BatterySaverModeNonMeteredTest",
+ "testBackgroundNetworkAccess_whitelisted");
+ }
+
+ public void testBatteryBatterySaverModeNonMeteredTest_enabled() throws Exception {
+ runDeviceTests(TEST_PKG, TEST_PKG + ".BatterySaverModeNonMeteredTest",
+ "testBackgroundNetworkAccess_enabled");
+ }
+
private void assertRestrictBackgroundWhitelist(int uid, boolean expected) throws Exception {
final int max_tries = 5;
boolean actual = false;
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java
index 18581f1..840fb7f 100644
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java
+++ b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerDockedStackTests.java
@@ -155,15 +155,28 @@
}
public void testActivityLifeCycleOnResizeDockedStack() throws Exception {
- mDevice.executeShellCommand(getAmStartCmd(TEST_ACTIVITY_NAME));
- launchActivityInDockStack(NO_RELAUNCH_ACTIVITY_NAME);
+ mDevice.executeShellCommand(getAmStartCmd(NO_RELAUNCH_ACTIVITY_NAME));
+ mAmWmState.computeState(mDevice, new String[]{NO_RELAUNCH_ACTIVITY_NAME});
+ final Rectangle fullScreenBounds =
+ mAmWmState.getWmState().getStack(FULLSCREEN_WORKSPACE_STACK_ID).getBounds();
+
+ launchActivityInDockStack(TEST_ACTIVITY_NAME);
mAmWmState.computeState(mDevice,
new String[]{TEST_ACTIVITY_NAME, NO_RELAUNCH_ACTIVITY_NAME});
mAmWmState.assertSanity();
+ final Rectangle initialDockBounds =
+ mAmWmState.getWmState().getStack(DOCKED_STACK_ID).getBounds();
clearLogcat();
- resizeDockedStack(STACK_SIZE, STACK_SIZE, TASK_SIZE, TASK_SIZE);
+
+ Rectangle newBounds = computeNewDockBounds(fullScreenBounds, initialDockBounds, true);
+ resizeDockedStack(newBounds.width, newBounds.height, newBounds.width, newBounds.height);
+
+ // We resize twice to make sure we cross an orientation change threshold for both
+ // activities.
+ newBounds = computeNewDockBounds(fullScreenBounds, initialDockBounds, false);
+ resizeDockedStack(newBounds.width, newBounds.height, newBounds.width, newBounds.height);
mAmWmState.computeState(mDevice,
new String[]{TEST_ACTIVITY_NAME, NO_RELAUNCH_ACTIVITY_NAME});
@@ -173,6 +186,23 @@
assertActivityLifecycle(NO_RELAUNCH_ACTIVITY_NAME, false);
}
+ private Rectangle computeNewDockBounds(
+ Rectangle fullscreenBounds, Rectangle dockBounds, boolean reduceSize) {
+ final boolean inLandscape = fullscreenBounds.width > dockBounds.width;
+ // We are either increasing size or reducing it.
+ final float sizeChangeFactor = reduceSize ? 0.5f : 1.5f;
+ final Rectangle newBounds = new Rectangle(dockBounds);
+ if (inLandscape) {
+ // In landscape we change the width.
+ newBounds.width *= sizeChangeFactor;
+ } else {
+ // In portrait we change the height
+ newBounds.height *= sizeChangeFactor;
+ }
+
+ return newBounds;
+ }
+
private void launchActivityToSide(String activityName) throws Exception {
mDevice.executeShellCommand(
getAmStartCmd(activityName) + " -f 0x20000000 --ez launch_to_the_side true");
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerFreeformStackTests.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerFreeformStackTests.java
index bc48964..786e8e1 100644
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerFreeformStackTests.java
+++ b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerFreeformStackTests.java
@@ -21,6 +21,8 @@
public class ActivityManagerFreeformStackTests extends ActivityManagerTestBase {
private static final String TEST_ACTIVITY = "TestActivity";
+ private static final int TEST_TASK_OFFSET = 20;
+ private static final int TEST_TASK_OFFSET_2 = 100;
private static final int TEST_TASK_SIZE_1 = 500;
private static final int TEST_TASK_SIZE_2 = TEST_TASK_SIZE_1 * 2;
// NOTE: Launching the FreeformActivity will automatically launch the TestActivity
@@ -36,19 +38,20 @@
mAmWmState.assertSanity();
mAmWmState.assertValidBounds();
- if (supportsFreeform()) {
- mAmWmState.assertFrontStack(
- "Freeform stack must be the front stack.", FREEFORM_WORKSPACE_STACK_ID);
- mAmWmState.assertVisibility(FREEFORM_ACTIVITY, true);
- mAmWmState.assertVisibility(TEST_ACTIVITY, true);
- mAmWmState.assertFocusedActivity(
- TEST_ACTIVITY + " must be focused Activity", TEST_ACTIVITY);
- assertEquals(new Rectangle(0, 0, TEST_TASK_SIZE_1, TEST_TASK_SIZE_1),
- mAmWmState.getAmState().getTaskByActivityName(TEST_ACTIVITY).getBounds());
- } else {
+ if (!supportsFreeform()) {
mAmWmState.assertDoesNotContainsStack(
"Must not contain freeform stack.", FREEFORM_WORKSPACE_STACK_ID);
+ return;
}
+
+ mAmWmState.assertFrontStack(
+ "Freeform stack must be the front stack.", FREEFORM_WORKSPACE_STACK_ID);
+ mAmWmState.assertVisibility(FREEFORM_ACTIVITY, true);
+ mAmWmState.assertVisibility(TEST_ACTIVITY, true);
+ mAmWmState.assertFocusedActivity(
+ TEST_ACTIVITY + " must be focused Activity", TEST_ACTIVITY);
+ assertEquals(new Rectangle(0, 0, TEST_TASK_SIZE_1, TEST_TASK_SIZE_1),
+ mAmWmState.getAmState().getTaskByActivityName(TEST_ACTIVITY).getBounds());
}
public void testActivityLifeCycleOnResizeFreeformTask() throws Exception {
@@ -58,17 +61,25 @@
mAmWmState.computeState(mDevice, new String[]{TEST_ACTIVITY, NO_RELAUNCH_ACTIVITY});
mAmWmState.assertSanity();
- resizeActivityTask(TEST_ACTIVITY, 0, 0, TEST_TASK_SIZE_1, TEST_TASK_SIZE_2);
+ if (!supportsFreeform()) {
+ mAmWmState.assertDoesNotContainsStack(
+ "Must not contain freeform stack.", FREEFORM_WORKSPACE_STACK_ID);
+ return;
+ }
+
+ resizeActivityTask(TEST_ACTIVITY,
+ TEST_TASK_OFFSET, TEST_TASK_OFFSET, TEST_TASK_SIZE_1, TEST_TASK_SIZE_2);
resizeActivityTask(NO_RELAUNCH_ACTIVITY,
- TEST_TASK_SIZE_1, TEST_TASK_SIZE_1, TEST_TASK_SIZE_1, TEST_TASK_SIZE_2);
+ TEST_TASK_OFFSET_2, TEST_TASK_OFFSET_2, TEST_TASK_SIZE_1, TEST_TASK_SIZE_2);
mAmWmState.computeState(mDevice, new String[]{TEST_ACTIVITY, NO_RELAUNCH_ACTIVITY});
mAmWmState.assertSanity();
clearLogcat();
- resizeActivityTask(TEST_ACTIVITY, 0, 0, TEST_TASK_SIZE_2, TEST_TASK_SIZE_1);
+ resizeActivityTask(TEST_ACTIVITY,
+ TEST_TASK_OFFSET, TEST_TASK_OFFSET, TEST_TASK_SIZE_2, TEST_TASK_SIZE_1);
resizeActivityTask(NO_RELAUNCH_ACTIVITY,
- TEST_TASK_SIZE_1, TEST_TASK_SIZE_1, TEST_TASK_SIZE_2, TEST_TASK_SIZE_1);
+ TEST_TASK_OFFSET_2, TEST_TASK_OFFSET_2, TEST_TASK_SIZE_2, TEST_TASK_SIZE_1);
mAmWmState.computeState(mDevice, new String[]{TEST_ACTIVITY, NO_RELAUNCH_ACTIVITY});
mAmWmState.assertSanity();
diff --git a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerState.java b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerState.java
index 1a6a3b8..56ed5b3 100644
--- a/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerState.java
+++ b/hostsidetests/services/activitymanager/src/android/server/cts/ActivityManagerState.java
@@ -422,8 +422,9 @@
}
static class Activity {
- private static final Pattern VISIBILITY_PATTERN = Pattern.compile(
- "keysPaused=(\\S+) inHistory=(\\S+) visible=(\\S+) sleeping=(\\S+) idle=(\\S+)");
+ private static final Pattern VISIBILITY_PATTERN = Pattern.compile("keysPaused=(\\S+) "
+ + "inHistory=(\\S+) visible=(\\S+) sleeping=(\\S+) idle=(\\S+) "
+ + "mStartingWindowState=(\\S+)");
private static final Pattern FRONT_OF_TASK_PATTERN = Pattern.compile("frontOfTask=(\\S+) "
+ "task=TaskRecord\\{(\\S+) #(\\d+) A=(\\S+) U=(\\d+) StackId=(\\d+) sz=(\\d+)\\}");
diff --git a/hostsidetests/trustedvoice/Android.mk b/hostsidetests/trustedvoice/Android.mk
new file mode 100644
index 0000000..b4639b9
--- /dev/null
+++ b/hostsidetests/trustedvoice/Android.mk
@@ -0,0 +1,33 @@
+# Copyright (C) 2016 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_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_MODULE_TAGS := optional
+
+# Must match the package name in CtsTestCaseList.mk
+LOCAL_MODULE := CtsTrustedVoiceHostTestCases
+
+LOCAL_JAVA_LIBRARIES := old-cts-tradefed ddmlib-prebuilt tradefed-prebuilt
+
+LOCAL_CTS_TEST_PACKAGE := android.host.trustedvoice
+
+
+include $(BUILD_CTS_HOST_JAVA_LIBRARY)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/hostsidetests/trustedvoice/app/Android.mk b/hostsidetests/trustedvoice/app/Android.mk
new file mode 100644
index 0000000..598fb27
--- /dev/null
+++ b/hostsidetests/trustedvoice/app/Android.mk
@@ -0,0 +1,31 @@
+# Copyright (C) 2016 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
+
+# When built, explicitly put it in the data partition.
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+
+LOCAL_PACKAGE_NAME := CtsTrustedVoiceApp
+
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/trustedvoice/app/AndroidManifest.xml b/hostsidetests/trustedvoice/app/AndroidManifest.xml
new file mode 100755
index 0000000..53b2981
--- /dev/null
+++ b/hostsidetests/trustedvoice/app/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2016 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="android.trustedvoice.app">
+
+ <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+ <application>
+ <activity android:name=".TrustedVoiceActivity" >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
+ </application>
+
+</manifest>
+
diff --git a/hostsidetests/trustedvoice/app/src/android/trustedvoice/app/TrustedVoiceActivity.java b/hostsidetests/trustedvoice/app/src/android/trustedvoice/app/TrustedVoiceActivity.java
new file mode 100644
index 0000000..3c0cd65
--- /dev/null
+++ b/hostsidetests/trustedvoice/app/src/android/trustedvoice/app/TrustedVoiceActivity.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2016 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 android.trustedvoice.app;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.util.Log;
+import android.app.KeyguardManager;
+import android.content.Context;
+import android.view.WindowManager.LayoutParams;
+import java.lang.Override;
+
+/**
+ * This activity when in foreground sets the FLAG_DISMISS_KEYGUARD.
+ * It then confirms that the keyguard was successfully dismissed
+ * and logs a string to logcat on success.
+ */
+public class TrustedVoiceActivity extends Activity {
+
+ private static final String TAG = TrustedVoiceActivity.class.getSimpleName();
+ /**
+ * The test string to log.
+ */
+ private static final String TEST_STRING = "TrustedVoiceTestString";
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+
+ // Unlock the keyguard.
+ getWindow().addFlags(LayoutParams.FLAG_DISMISS_KEYGUARD | LayoutParams.FLAG_SHOW_WHEN_LOCKED);
+ }
+
+ @Override
+ public void onWindowFocusChanged(boolean hasFocus) {
+ super.onWindowFocusChanged(hasFocus);
+ if (hasFocus) {
+ // Confirm that the keyguard was successfully unlocked.
+ KeyguardManager kM = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
+ if (!kM.isKeyguardLocked()) {
+ // Log the test string.
+ Log.i(TAG, TEST_STRING);
+ }
+ }
+ }
+}
+
diff --git a/hostsidetests/trustedvoice/src/android/trustedvoice/cts/TrustedVoiceHostTest.java b/hostsidetests/trustedvoice/src/android/trustedvoice/cts/TrustedVoiceHostTest.java
new file mode 100644
index 0000000..d075e2c
--- /dev/null
+++ b/hostsidetests/trustedvoice/src/android/trustedvoice/cts/TrustedVoiceHostTest.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2016 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 android.trustedvoice.cts;
+
+import com.android.cts.tradefed.build.CtsBuildHelper;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.IBuildReceiver;
+
+
+import java.io.File;
+import java.lang.String;
+import java.util.Scanner;
+
+
+
+/**
+ * Test to check the APK logs to Logcat.
+ * This test first locks the device screen and then runs the associated app to run the test.
+ *
+ * When this test builds, it also builds {@see android.trustedvoice.app.TrustedVoiceActivity}
+ * into an APK which it then installs at runtime. TrustedVoiceActivity sets the
+ * FLAG_DISMISS_KEYGUARD, prints a message to Logcat and then gets uninstalled.
+ */
+public class TrustedVoiceHostTest extends DeviceTestCase implements IBuildReceiver {
+
+ /**
+ * The package name of the APK.
+ */
+ private static final String PACKAGE = "android.trustedvoice.app";
+
+ /**
+ * Lock screen key event code.
+ */
+ private static final int LOCK_KEYEVENT = 26;
+
+ /**
+ * The file name of the APK.
+ */
+ private static final String APK = "CtsTrustedVoiceApp.apk";
+
+ /**
+ * The class name of the main activity in the APK.
+ */
+ private static final String CLASS = "TrustedVoiceActivity";
+
+ /**
+ * The command to launch the main activity.
+ */
+ private static final String START_COMMAND = String.format(
+ "am start -W -a android.intent.action.MAIN -n %s/%s.%s", PACKAGE, PACKAGE, CLASS);
+
+ /**
+ * The command to lock the device.
+ */
+ private static final String LOCKSCREEN_COMMAND = String.format(
+ "input keyevent %d", LOCK_KEYEVENT);
+
+ /**
+ * The test string to look for.
+ */
+ private static final String TEST_STRING = "TrustedVoiceTestString";
+
+ /**
+ * A reference to the build.
+ */
+ private CtsBuildHelper mBuild;
+
+ /**
+ * A reference to the device under test.
+ */
+ private ITestDevice mDevice;
+
+ @Override
+ public void setBuild(IBuildInfo buildInfo) {
+ // Get the build, this is used to access the APK.
+ mBuild = CtsBuildHelper.createBuildHelper(buildInfo);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ // Get the device, this gives a handle to run commands and install APKs.
+ mDevice = getDevice();
+ // Remove any previously installed versions of this APK.
+ mDevice.uninstallPackage(PACKAGE);
+ // Get the APK from the build.
+ File app = mBuild.getTestApp(APK);
+ // Install the APK on the device.
+ mDevice.installPackage(app, false);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ // Remove the package once complete.
+ mDevice.uninstallPackage(PACKAGE);
+ super.tearDown();
+ }
+
+ /**
+ * Tests the string was successfully logged to Logcat from the activity.
+ *
+ * @throws Exception
+ */
+ public void testLogcat() throws Exception {
+ // Clear logcat.
+ mDevice.executeAdbCommand("logcat", "-c");
+ // Lock the device
+ mDevice.executeShellCommand(LOCKSCREEN_COMMAND);
+ // Start the APK and wait for it to complete.
+ mDevice.executeShellCommand(START_COMMAND);
+ // Dump logcat.
+ String logs = mDevice.executeAdbCommand("logcat", "-v", "brief", "-d", CLASS + ":I", "*S");
+ // Search for string.
+ Scanner in = new Scanner(logs);
+ String testString = "";
+ try {
+ while (in.hasNextLine()) {
+ String line = in.nextLine();
+ if(line.contains(TEST_STRING)) {
+ // Retrieve the test string.
+ testString = line.split(":")[1].trim();
+ break;
+ }
+ }
+ // Assert the logged string matches the test string.
+ assertNotNull("Test string must not be null", testString);
+ assertEquals("Test string does not match", TEST_STRING, testString);
+ } finally {
+ in.close();
+ }
+ }
+}
diff --git a/tests/app/Android.mk b/tests/app/Android.mk
index ac2c188..775e679 100644
--- a/tests/app/Android.mk
+++ b/tests/app/Android.mk
@@ -23,7 +23,7 @@
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common voip-common org.apache.http.legacy
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner ctstestserver
+LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner ctstestserver mockito-target
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/app/app/Android.mk b/tests/app/app/Android.mk
index 2cf15e9..24b5c5c 100644
--- a/tests/app/app/Android.mk
+++ b/tests/app/app/Android.mk
@@ -25,7 +25,7 @@
LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common voip-common org.apache.http.legacy
-LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner ctstestserver
+LOCAL_STATIC_JAVA_LIBRARIES := ctsdeviceutil ctstestrunner ctstestserver mockito-target
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
src/android/app/stubs/ISecondary.aidl
diff --git a/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java b/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
index 1a60225..0919fd3 100644
--- a/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
+++ b/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
@@ -21,6 +21,7 @@
import android.app.AlertDialog.Builder;
import android.app.Instrumentation;
import android.app.stubs.DialogStubActivity;
+import android.app.stubs.R;
import android.content.ContentResolver;
import android.content.ContentValues;
import android.content.Context;
@@ -35,20 +36,19 @@
import android.graphics.drawable.Drawable;
import android.provider.Contacts.People;
import android.test.ActivityInstrumentationTestCase2;
+import android.test.suitebuilder.annotation.SmallTest;
import android.view.KeyEvent;
import android.view.View;
-import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.ArrayAdapter;
import android.widget.Button;
-import android.widget.FrameLayout;
import android.widget.ListAdapter;
import android.widget.ListView;
+import org.mockito.ArgumentCaptor;
-import android.app.stubs.R;
+import static org.mockito.Mockito.*;
-import java.util.ArrayList;
-
+@SmallTest
public class AlertDialog_BuilderTest extends ActivityInstrumentationTestCase2<DialogStubActivity> {
private Builder mBuilder;
private Context mContext;
@@ -57,8 +57,6 @@
private Drawable mDrawable;
private AlertDialog mDialog;
private Button mButton;
- private boolean mResult;
- private boolean mItemSelected;
private CharSequence mSelectedItem;
private final String[] mPROJECTION = new String[] {
People._ID, People.NAME
@@ -66,45 +64,17 @@
private View mView;
private ListView mListView;
- private ArrayList<Integer> mSelectedItems;
- private FrameLayout mFrameLayout;
- private OnClickListener mOnClickListener = new OnClickListener() {
- public void onClick(DialogInterface dialog, int which) {
- mResult = true;
- }
- };
+ private OnClickListener mOnClickListener = mock(OnClickListener.class);
- private OnCancelListener mOnCancelListener = new OnCancelListener() {
- public void onCancel(DialogInterface dialog) {
- mResult = true;
- }
- };
+ private OnCancelListener mOnCancelListener = mock(OnCancelListener.class);
- private OnKeyListener mOnKeyListener = new OnKeyListener() {
- public boolean onKey(DialogInterface dialog, int key, KeyEvent envnt) {
- mResult = true;
- return true;
- }
- };
+ private OnKeyListener mOnKeyListener = mock(OnKeyListener.class);
- private OnItemSelectedListener mOnItemSelectedListener = new OnItemSelectedListener() {
- public void onItemSelected(AdapterView parent, View v, int position, long id) {
- mItemSelected = true;
- }
-
- public void onNothingSelected(AdapterView parent) {
- }
-
- };
+ private OnItemSelectedListener mOnItemSelectedListener = mock(OnItemSelectedListener.class);
private OnMultiChoiceClickListener mOnMultiChoiceClickListener =
- new OnMultiChoiceClickListener() {
- public void onClick(DialogInterface dialog, int which, boolean isChecked) {
- mSelectedItems.add(which);
- mResult = true;
- }
- };
+ mock(OnMultiChoiceClickListener.class);
@Override
protected void setUp() throws Exception {
@@ -123,9 +93,7 @@
mView = null;
mListView = null;
mDialog = null;
- mItemSelected = false;
mSelectedItem = null;
- mSelectedItems = new ArrayList<Integer>();
}
public AlertDialog_BuilderTest() {
@@ -173,7 +141,8 @@
mInstrumentation.waitForIdleSync();
assertEquals(mContext.getText(android.R.string.yes), mButton.getText());
- assertTrue(mResult);
+ verify(mOnClickListener, times(1)).onClick(mDialog, DialogInterface.BUTTON_POSITIVE);
+ verifyNoMoreInteractions(mOnClickListener);
}
public void testSetPositiveButtonWithParamCharSequence() throws Throwable {
@@ -188,7 +157,8 @@
});
mInstrumentation.waitForIdleSync();
assertEquals(mContext.getText(android.R.string.yes), mButton.getText());
- assertTrue(mResult);
+ verify(mOnClickListener, times(1)).onClick(mDialog, DialogInterface.BUTTON_POSITIVE);
+ verifyNoMoreInteractions(mOnClickListener);
}
public void testSetNegativeButtonWithParamCharSequence() throws Throwable {
@@ -203,7 +173,8 @@
});
mInstrumentation.waitForIdleSync();
assertEquals(mTitle, mButton.getText());
- assertTrue(mResult);
+ verify(mOnClickListener, times(1)).onClick(mDialog, DialogInterface.BUTTON_NEGATIVE);
+ verifyNoMoreInteractions(mOnClickListener);
}
public void testSetNegativeButtonWithParamInt() throws Throwable {
@@ -218,7 +189,8 @@
});
mInstrumentation.waitForIdleSync();
assertEquals(mContext.getText(R.string.notify), mButton.getText());
- assertTrue(mResult);
+ verify(mOnClickListener, times(1)).onClick(mDialog, DialogInterface.BUTTON_NEGATIVE);
+ verifyNoMoreInteractions(mOnClickListener);
}
public void testSetNeutralButtonWithParamInt() throws Throwable {
@@ -233,7 +205,8 @@
});
mInstrumentation.waitForIdleSync();
assertEquals(mContext.getText(R.string.notify), mButton.getText());
- assertTrue(mResult);
+ verify(mOnClickListener, times(1)).onClick(mDialog, DialogInterface.BUTTON_NEUTRAL);
+ verifyNoMoreInteractions(mOnClickListener);
}
public void testSetNeutralButtonWithParamCharSequence() throws Throwable {
@@ -248,7 +221,8 @@
});
mInstrumentation.waitForIdleSync();
assertEquals(mTitle, mButton.getText());
- assertTrue(mResult);
+ verify(mOnClickListener, times(1)).onClick(mDialog, DialogInterface.BUTTON_NEUTRAL);
+ verifyNoMoreInteractions(mOnClickListener);
}
private void testCancelable(final boolean cancelable) throws Throwable {
@@ -303,7 +277,8 @@
}
});
mInstrumentation.waitForIdleSync();
- assertTrue(mResult);
+ verify(mOnCancelListener, times(1)).onCancel(mDialog);
+ verifyNoMoreInteractions(mOnCancelListener);
}
public void testSetOnKeyListener() throws Throwable {
@@ -315,8 +290,20 @@
}
});
mInstrumentation.waitForIdleSync();
- sendKeys(KeyEvent.ACTION_DOWN, KeyEvent.ACTION_DOWN);
- assertTrue(mResult);
+ sendKeys(KeyEvent.KEYCODE_0, KeyEvent.KEYCODE_1);
+ // Use Mockito captures so that we can verify that each "sent" key code resulted
+ // in one DOWN event and one UP event.
+ ArgumentCaptor<KeyEvent> keyEvent0Captor = ArgumentCaptor.forClass(KeyEvent.class);
+ ArgumentCaptor<KeyEvent> keyEvent1Captor = ArgumentCaptor.forClass(KeyEvent.class);
+ verify(mOnKeyListener, times(2)).onKey(eq(mDialog), eq(KeyEvent.KEYCODE_0),
+ keyEvent0Captor.capture());
+ verify(mOnKeyListener, times(2)).onKey(eq(mDialog), eq(KeyEvent.KEYCODE_1),
+ keyEvent1Captor.capture());
+ verifyNoMoreInteractions(mOnKeyListener);
+ assertEquals(KeyEvent.ACTION_DOWN, keyEvent0Captor.getAllValues().get(0).getAction());
+ assertEquals(KeyEvent.ACTION_UP, keyEvent0Captor.getAllValues().get(1).getAction());
+ assertEquals(KeyEvent.ACTION_DOWN, keyEvent1Captor.getAllValues().get(0).getAction());
+ assertEquals(KeyEvent.ACTION_UP, keyEvent1Captor.getAllValues().get(1).getAction());
}
public void testSetItemsWithParamInt() throws Throwable {
@@ -382,7 +369,8 @@
mInstrumentation.waitForIdleSync();
final CursorWrapper selected = (CursorWrapper)mListView.getSelectedItem();
assertEquals(c.getString(1), selected.getString(1));
- assertTrue(mResult);
+ verify(mOnClickListener, times(1)).onClick(mDialog, 0);
+ verifyNoMoreInteractions(mOnClickListener);
}
public void testSetMultiChoiceItemsWithParamInt() throws Throwable {
@@ -404,9 +392,10 @@
});
mInstrumentation.waitForIdleSync();
assertEquals(items[0], mSelectedItem);
- assertEquals(2, mSelectedItems.size());
+ verify(mOnMultiChoiceClickListener, times(1)).onClick(mDialog, 0, true);
+ verify(mOnMultiChoiceClickListener, times(1)).onClick(mDialog, 1, true);
+ verifyNoMoreInteractions(mOnMultiChoiceClickListener);
assertEquals(items[0], mListView.getItemAtPosition(0));
- assertTrue(mResult);
}
public void testSetMultiChoiceItemsWithParamCharSequence() throws Throwable {
@@ -426,9 +415,10 @@
});
mInstrumentation.waitForIdleSync();
assertEquals(items[0], mSelectedItem);
- assertEquals(2, mSelectedItems.size());
+ verify(mOnMultiChoiceClickListener, times(1)).onClick(mDialog, 0, true);
+ verify(mOnMultiChoiceClickListener, times(1)).onClick(mDialog, 1, true);
+ verifyNoMoreInteractions(mOnMultiChoiceClickListener);
assertEquals(items[0], mListView.getItemAtPosition(0));
- assertTrue(mResult);
}
public void testSetMultiChoiceItemsWithParamCursor() throws Throwable {
@@ -450,8 +440,9 @@
mInstrumentation.waitForIdleSync();
final CursorWrapper selected = (CursorWrapper)mListView.getSelectedItem();
assertEquals(c.getString(1), selected.getString(1));
- assertEquals(2, mSelectedItems.size());
- assertTrue(mResult);
+ verify(mOnMultiChoiceClickListener, times(1)).onClick(mDialog, 0, true);
+ verify(mOnMultiChoiceClickListener, times(1)).onClick(mDialog, 1, true);
+ verifyNoMoreInteractions(mOnMultiChoiceClickListener);
}
public void testSetSingleChoiceItemsWithParamInt() throws Throwable {
@@ -472,16 +463,17 @@
mInstrumentation.waitForIdleSync();
assertEquals(items[0], mSelectedItem);
assertEquals(items[0], mListView.getItemAtPosition(0));
- assertTrue(mResult);
+ verify(mOnClickListener, times(1)).onClick(mDialog, 0);
+ verifyNoMoreInteractions(mOnClickListener);
}
private void preparePeople() {
final ContentResolver mResolver = mContext.getContentResolver();
mResolver.delete(People.CONTENT_URI, null, null);
- final ContentValues valuse = new ContentValues();
- valuse.put(People._ID, "1");
- valuse.put(People.NAME, "name");
- mResolver.insert(People.CONTENT_URI, valuse);
+ final ContentValues values = new ContentValues();
+ values.put(People._ID, "1");
+ values.put(People.NAME, "name");
+ mResolver.insert(People.CONTENT_URI, values);
}
public void testSetSingleChoiceItemsWithParamCursor() throws Throwable {
@@ -504,7 +496,8 @@
mInstrumentation.waitForIdleSync();
final CursorWrapper selected = (CursorWrapper)mListView.getSelectedItem();
assertEquals(c.getString(1), selected.getString(1));
- assertTrue(mResult);
+ verify(mOnClickListener, times(1)).onClick(mDialog, 0);
+ verifyNoMoreInteractions(mOnClickListener);
}
public void testSetSingleChoiceItemsWithParamCharSequence() throws Throwable {
@@ -524,7 +517,8 @@
mInstrumentation.waitForIdleSync();
assertEquals(items[0], mSelectedItem);
assertEquals(items[0], mListView.getItemAtPosition(0));
- assertTrue(mResult);
+ verify(mOnClickListener, times(1)).onClick(mDialog, 0);
+ verifyNoMoreInteractions(mOnClickListener);
}
public void testSetSingleChoiceItems() throws Throwable {
@@ -546,7 +540,8 @@
mInstrumentation.waitForIdleSync();
assertEquals(items[0], mSelectedItem);
assertEquals(items[0], mListView.getItemAtPosition(0));
- assertTrue(mResult);
+ verify(mOnClickListener, times(1)).onClick(mDialog, 0);
+ verifyNoMoreInteractions(mOnClickListener);
}
public void testSetOnItemSelectedListener() throws Throwable {
@@ -561,7 +556,9 @@
}
});
mInstrumentation.waitForIdleSync();
- assertTrue(mItemSelected);
+ verify(mOnItemSelectedListener, times(1)).onItemSelected(eq(mListView), any(View.class),
+ eq(0), any(Long.class));
+ verifyNoMoreInteractions(mOnItemSelectedListener);
}
public void testSetView() throws Throwable {
diff --git a/tests/camera/Android.mk b/tests/camera/Android.mk
index 85eaf5b..4065bfb 100644
--- a/tests/camera/Android.mk
+++ b/tests/camera/Android.mk
@@ -28,7 +28,9 @@
mockito-target \
android-ex-camera2
-LOCAL_JNI_SHARED_LIBRARIES := libctscamera2ndk_jni libnativehelper_compat_libc++
+LOCAL_JNI_SHARED_LIBRARIES := \
+ libctscamera2_jni \
+ libnativehelper_compat_libc++
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
diff --git a/tests/camera/libcamera2ndkjni/Android.mk b/tests/camera/libctscamera2jni/Android.mk
similarity index 61%
rename from tests/camera/libcamera2ndkjni/Android.mk
rename to tests/camera/libctscamera2jni/Android.mk
index 89690a2..eac42f5 100644
--- a/tests/camera/libcamera2ndkjni/Android.mk
+++ b/tests/camera/libctscamera2jni/Android.mk
@@ -16,12 +16,13 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := libctscamera2ndk_jni
+LOCAL_MODULE := libctscamera2_jni
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := \
- native-camera-jni.cpp
+ native-camera-jni.cpp \
+ dng-validate-jni.cpp
LOCAL_C_INCLUDES := \
$(JNI_H_INCLUDE) \
@@ -29,12 +30,24 @@
frameworks/av/include/camera/ndk \
frameworks/av/include/ndk \
+# Flags needed by DNG SDK
+LOCAL_CFLAGS := -DUNIX_ENV=1 -DqDNGBigEndian=0 -DqDNGThreadSafe=1 -DqDNGUseLibJPEG=1 -DqDNGUseXMP=0 -DqDNGValidate=1 -DqDNGValidateTarget=1 -DqAndroid=1 -fexceptions -Wsign-compare -Wno-reorder -Wframe-larger-than=20000
+
+# Flags to avoid warnings from DNG SDK
+LOCAL_CFLAGS += -Wno-unused-parameter
+
+LOCAL_STATIC_LIBRARIES := libdng_sdk_validate libjpeg_static libz
LOCAL_SHARED_LIBRARIES := libandroid \
libnativehelper_compat_libc++ \
liblog \
libcamera2ndk \
libmediandk
+# NDK build, shared C++ runtime
+#LOCAL_SDK_VERSION := current
+#LOCAL_NDK_STL_VARIANT := c++_shared
+
+# Temporary workaround until camera2 NDK is active. See b/27102995.
LOCAL_CXX_STL := libc++_static
include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/camera/libctscamera2jni/dng-validate-jni.cpp b/tests/camera/libctscamera2jni/dng-validate-jni.cpp
new file mode 100644
index 0000000..186cf3f
--- /dev/null
+++ b/tests/camera/libctscamera2jni/dng-validate-jni.cpp
@@ -0,0 +1,469 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+//#define LOG_NDEBUG 0
+#define LOG_TAG "DngValidateCamera"
+#include <log/log.h>
+#include <jni.h>
+
+#include <string>
+#include <sstream>
+#include <iostream>
+
+/**
+ * Use DNG SDK to validate captured DNG file.
+ *
+ * This code is largely based on the dng_validate.cpp implementation included
+ * with the DNG SDK. The portions of this file that are from the DNG SDK are
+ * covered by the the DNG SDK license in /external/dng_sdk/LICENSE
+ */
+
+#include "dng_color_space.h"
+#include "dng_date_time.h"
+#include "dng_exceptions.h"
+#include "dng_file_stream.h"
+#include "dng_globals.h"
+#include "dng_host.h"
+#include "dng_ifd.h"
+#include "dng_image_writer.h"
+#include "dng_info.h"
+#include "dng_linearization_info.h"
+#include "dng_mosaic_info.h"
+#include "dng_negative.h"
+#include "dng_preview.h"
+#include "dng_render.h"
+#include "dng_simple_image.h"
+#include "dng_tag_codes.h"
+#include "dng_tag_types.h"
+#include "dng_tag_values.h"
+
+// Version of DNG validate referenced for this implementation
+#define kDNGValidateVersion "1.4"
+
+static bool gFourColorBayer = false;
+
+static int32 gMosaicPlane = -1;
+
+static uint32 gPreferredSize = 0;
+static uint32 gMinimumSize = 0;
+static uint32 gMaximumSize = 0;
+
+static uint32 gProxyDNGSize = 0;
+
+static const dng_color_space *gFinalSpace = &dng_space_sRGB::Get();
+
+static uint32 gFinalPixelType = ttByte;
+
+static dng_string gDumpStage1;
+static dng_string gDumpStage2;
+static dng_string gDumpStage3;
+static dng_string gDumpTIF;
+static dng_string gDumpDNG;
+
+/**
+ * Validate DNG file in provided buffer.
+ *
+ * Returns dng_error_none (0) on success, otherwise one of the
+ * dng_error_code enum values is returned.
+ *
+ * Warnings and errors found during validation are printed to stderr
+ */
+static dng_error_code dng_validate(const void* data, uint32_t count) {
+
+ ALOGI("Validating DNG buffer");
+
+ try {
+ dng_stream stream(data, count);
+
+ dng_host host;
+
+ host.SetPreferredSize(gPreferredSize);
+ host.SetMinimumSize(gMinimumSize);
+ host.SetMaximumSize(gMaximumSize);
+
+ host.ValidateSizes();
+
+ if (host.MinimumSize()) {
+ host.SetForPreview(true);
+ gDumpDNG.Clear();
+ }
+
+ if (gDumpDNG.NotEmpty()) {
+ host.SetSaveDNGVersion(dngVersion_SaveDefault);
+ host.SetSaveLinearDNG(false);
+ host.SetKeepOriginalFile(false);
+ }
+
+ // Read into the negative.
+
+ AutoPtr<dng_negative> negative;
+ {
+ dng_info info;
+ info.Parse(host, stream);
+ info.PostParse(host);
+ if (!info.IsValidDNG()) {
+ return dng_error_bad_format;
+ }
+
+ negative.Reset(host.Make_dng_negative());
+ negative->Parse(host, stream, info);
+ negative->PostParse(host, stream, info);
+
+ {
+ dng_timer timer("Raw image read time");
+ negative->ReadStage1Image(host, stream, info);
+ }
+
+ if (info.fMaskIndex != -1) {
+ dng_timer timer("Transparency mask read time");
+ negative->ReadTransparencyMask(host, stream, info);
+ }
+
+ negative->ValidateRawImageDigest(host);
+ }
+
+ // Option to write stage 1 image.
+
+ if (gDumpStage1.NotEmpty()) {
+ dng_file_stream stream2 (gDumpStage1.Get(), true);
+ const dng_image &stage1 = *negative->Stage1Image();
+ dng_image_writer writer;
+
+ writer.WriteTIFF(host,
+ stream2,
+ stage1,
+ stage1.Planes() >= 3 ? piRGB
+ : piBlackIsZero);
+
+ gDumpStage1.Clear();
+ }
+
+ // Metadata.
+
+ negative->SynchronizeMetadata();
+
+ // Four color Bayer option.
+
+ if (gFourColorBayer) {
+ negative->SetFourColorBayer();
+ }
+
+ // Build stage 2 image.
+
+ {
+ dng_timer timer("Linearization time");
+ negative->BuildStage2Image(host);
+ }
+
+ if (gDumpStage2.NotEmpty()) {
+ dng_file_stream stream2(gDumpStage2.Get(), true);
+ const dng_image &stage2 = *negative->Stage2Image();
+ dng_image_writer writer;
+
+ writer.WriteTIFF (host,
+ stream2,
+ stage2,
+ stage2.Planes() >= 3 ? piRGB
+ : piBlackIsZero);
+
+ gDumpStage2.Clear();
+ }
+
+ // Build stage 3 image.
+
+ {
+ dng_timer timer("Interpolate time");
+ negative->BuildStage3Image(host,
+ gMosaicPlane);
+ }
+
+ // Convert to proxy, if requested.
+
+ if (gProxyDNGSize) {
+ dng_timer timer("ConvertToProxy time");
+ dng_image_writer writer;
+
+ negative->ConvertToProxy(host,
+ writer,
+ gProxyDNGSize);
+ }
+
+ // Flatten transparency, if required.
+
+ if (negative->NeedFlattenTransparency(host)) {
+ dng_timer timer("FlattenTransparency time");
+ negative->FlattenTransparency(host);
+ }
+
+ if (gDumpStage3.NotEmpty()) {
+ dng_file_stream stream2(gDumpStage3.Get(), true);
+ const dng_image &stage3 = *negative->Stage3Image();
+ dng_image_writer writer;
+
+ writer.WriteTIFF (host,
+ stream2,
+ stage3,
+ stage3.Planes () >= 3 ? piRGB
+ : piBlackIsZero);
+
+ gDumpStage3.Clear();
+ }
+
+ // Output DNG file if requested.
+
+ if (gDumpDNG.NotEmpty()) {
+ // Build the preview list.
+ dng_preview_list previewList;
+ dng_date_time_info dateTimeInfo;
+ CurrentDateTimeAndZone(dateTimeInfo);
+
+ for (uint32 previewIndex = 0; previewIndex < 2; previewIndex++) {
+
+ // Skip preview if writing a compresssed main image to save space
+ // in this example code.
+ if (negative->RawJPEGImage() != NULL && previewIndex > 0) {
+ break;
+ }
+
+ // Report timing.
+ dng_timer timer(previewIndex == 0 ? "Build thumbnail time"
+ : "Build preview time");
+
+ // Render a preview sized image.
+ AutoPtr<dng_image> previewImage;
+
+ {
+ dng_render render (host, *negative);
+ render.SetFinalSpace (negative->IsMonochrome() ?
+ dng_space_GrayGamma22::Get() : dng_space_sRGB::Get());
+ render.SetFinalPixelType (ttByte);
+ render.SetMaximumSize (previewIndex == 0 ? 256 : 1024);
+
+ previewImage.Reset (render.Render());
+ }
+
+ // Don't write the preview if it is same size as thumbnail.
+
+ if (previewIndex > 0 &&
+ Max_uint32(previewImage->Bounds().W(),
+ previewImage->Bounds().H()) <= 256) {
+ break;
+ }
+
+ // If we have compressed JPEG data, create a compressed thumbnail. Otherwise
+ // save a uncompressed thumbnail.
+ bool useCompressedPreview = (negative->RawJPEGImage() != NULL) ||
+ (previewIndex > 0);
+
+ AutoPtr<dng_preview> preview (useCompressedPreview ?
+ (dng_preview *) new dng_jpeg_preview :
+ (dng_preview *) new dng_image_preview);
+
+ // Setup up preview info.
+
+ preview->fInfo.fApplicationName.Set("dng_validate");
+ preview->fInfo.fApplicationVersion.Set(kDNGValidateVersion);
+
+ preview->fInfo.fSettingsName.Set("Default");
+
+ preview->fInfo.fColorSpace = previewImage->Planes() == 1 ?
+ previewColorSpace_GrayGamma22 :
+ previewColorSpace_sRGB;
+
+ preview->fInfo.fDateTime = dateTimeInfo.Encode_ISO_8601();
+
+ if (!useCompressedPreview) {
+ dng_image_preview *imagePreview = static_cast<dng_image_preview *>(preview.Get());
+ imagePreview->fImage.Reset(previewImage.Release());
+ } else {
+ dng_jpeg_preview *jpegPreview = static_cast<dng_jpeg_preview *>(preview.Get());
+ int32 quality = (previewIndex == 0 ? 8 : 5);
+ dng_image_writer writer;
+ writer.EncodeJPEGPreview (host,
+ *previewImage,
+ *jpegPreview,
+ quality);
+ }
+ previewList.Append (preview);
+ }
+
+ // Write DNG file.
+
+ dng_file_stream stream2(gDumpDNG.Get(), true);
+
+ {
+ dng_timer timer("Write DNG time");
+ dng_image_writer writer;
+
+ writer.WriteDNG(host,
+ stream2,
+ *negative.Get(),
+ &previewList,
+ dngVersion_Current,
+ false);
+ }
+
+ gDumpDNG.Clear();
+ }
+
+ // Output TIF file if requested.
+ if (gDumpTIF.NotEmpty()) {
+
+ // Render final image.
+
+ dng_render render(host, *negative);
+
+ render.SetFinalSpace(*gFinalSpace );
+ render.SetFinalPixelType(gFinalPixelType);
+
+ if (host.MinimumSize()) {
+ dng_point stage3Size = negative->Stage3Image()->Size();
+ render.SetMaximumSize (Max_uint32(stage3Size.v,
+ stage3Size.h));
+ }
+
+ AutoPtr<dng_image> finalImage;
+
+ {
+ dng_timer timer("Render time");
+ finalImage.Reset(render.Render());
+ }
+
+ finalImage->Rotate(negative->Orientation());
+
+ // Now that Camera Raw supports non-raw formats, we should
+ // not keep any Camera Raw settings in the XMP around when
+ // writing rendered files.
+#if qDNGUseXMP
+ if (negative->GetXMP()) {
+ negative->GetXMP()->RemoveProperties(XMP_NS_CRS);
+ negative->GetXMP()->RemoveProperties(XMP_NS_CRSS);
+ }
+#endif
+
+ // Write TIF file.
+ dng_file_stream stream2(gDumpTIF.Get(), true);
+
+ {
+ dng_timer timer("Write TIFF time");
+ dng_image_writer writer;
+
+ writer.WriteTIFF(host,
+ stream2,
+ *finalImage.Get(),
+ finalImage->Planes() >= 3 ? piRGB
+ : piBlackIsZero,
+ ccUncompressed,
+ negative.Get(),
+ &render.FinalSpace());
+ }
+ gDumpTIF.Clear();
+ }
+ } catch (const dng_exception &except) {
+ return except.ErrorCode();
+ } catch (...) {
+ return dng_error_unknown;
+ }
+
+ ALOGI("DNG validation complete");
+
+ return dng_error_none;
+}
+
+extern "C" jboolean
+Java_android_hardware_camera2_cts_DngCreatorTest_validateDngNative(
+ JNIEnv* env, jclass /*clazz*/, jbyteArray dngBuffer) {
+
+ jbyte* buffer = env->GetByteArrayElements(dngBuffer, NULL);
+ jsize bufferCount = env->GetArrayLength(dngBuffer);
+ if (buffer == nullptr) {
+ ALOGE("Unable to map DNG buffer to native");
+ return JNI_FALSE;
+ }
+
+ // DNG parsing warnings/errors fprintfs are spread throughout the DNG SDK,
+ // guarded by the qDNGValidate define flag. To avoid modifying the SDK,
+ // redirect stderr to a pipe to capture output locally.
+
+ int pipeFds[2];
+ int err;
+
+ err = pipe(pipeFds);
+ if (err != 0) {
+ ALOGE("Error redirecting dng_validate output: %d", errno);
+ env->ReleaseByteArrayElements(dngBuffer, buffer, 0);
+ return JNI_FALSE;
+ }
+
+ int stderrFd = dup(fileno(stderr));
+ dup2(pipeFds[1], fileno(stderr));
+ close(pipeFds[1]);
+
+ // Actually run the validation
+ dng_error_code dng_err = dng_validate(buffer, bufferCount);
+
+ env->ReleaseByteArrayElements(dngBuffer, buffer, 0);
+
+ // Restore stderr and read out pipe
+ dup2(stderrFd, fileno(stderr));
+
+ std::stringstream errorStream;
+ const size_t BUF_SIZE = 256;
+ char readBuf[BUF_SIZE];
+
+ ssize_t count = 0;
+ while((count = read(pipeFds[0], readBuf, BUF_SIZE)) > 0) {
+ errorStream.write(readBuf, count);
+ }
+ if (count < 0) {
+ ALOGE("Error reading from dng_validate output pipe: %d", errno);
+ return JNI_FALSE;
+ }
+ close(pipeFds[1]);
+
+ std::string line;
+ int lineCount = 0;
+ ALOGI("Output from DNG validation:");
+ // dng_validate doesn't actually propagate all errors/warnings to the
+ // return error code, so look for an error pattern in output to detect
+ // problems. Also make sure the output is long enough since some non-error
+ // content should always be printed.
+ while(std::getline(errorStream, line, '\n')) {
+ lineCount++;
+ if ( (line.size() > 3) &&
+ (line[0] == line[1]) &&
+ (line[1] == line[2]) &&
+ (line[2] == '*') ) {
+ // Found a warning or error, so need to fail the test
+ if (dng_err == dng_error_none) {
+ dng_err = dng_error_bad_format;
+ }
+ ALOGE("**|%s", line.c_str());
+ } else {
+ ALOGI(" |%s", line.c_str());
+ }
+ }
+ // If no output is produced, assume something went wrong
+ if (lineCount < 3) {
+ ALOGE("Validation output less than expected!");
+ dng_err = dng_error_unknown;
+ }
+ if (dng_err != dng_error_none) {
+ ALOGE("DNG validation failed!");
+ }
+
+ return (dng_err == dng_error_none) ? JNI_TRUE : JNI_FALSE;
+}
diff --git a/tests/camera/libcamera2ndkjni/native-camera-jni.cpp b/tests/camera/libctscamera2jni/native-camera-jni.cpp
similarity index 100%
rename from tests/camera/libcamera2ndkjni/native-camera-jni.cpp
rename to tests/camera/libctscamera2jni/native-camera-jni.cpp
diff --git a/tests/camera/src/android/hardware/camera2/cts/CameraDeviceTest.java b/tests/camera/src/android/hardware/camera2/cts/CameraDeviceTest.java
index 542e0fd..b8366d8 100644
--- a/tests/camera/src/android/hardware/camera2/cts/CameraDeviceTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/CameraDeviceTest.java
@@ -90,6 +90,11 @@
CameraDevice.TEMPLATE_VIDEO_SNAPSHOT
};
+ private static int[] sInvalidTemplates = new int[] {
+ CameraDevice.TEMPLATE_PREVIEW - 1,
+ CameraDevice.TEMPLATE_MANUAL + 1,
+ };
+
// Request templates that are unsupported by LEGACY mode.
private static Set<Integer> sLegacySkipTemplates = new HashSet<>();
static {
@@ -299,6 +304,20 @@
capReq.get(CaptureRequest.SENSOR_SENSITIVITY));
}
}
+
+ /**
+ * Test: creating capture requests with an invalid template ID should throw
+ * IllegalArgumentException.
+ */
+ for (int j = 0; j < sInvalidTemplates.length; j++) {
+ try {
+ CaptureRequest.Builder capReq =
+ mCamera.createCaptureRequest(sInvalidTemplates[j]);
+ fail("Should get IllegalArgumentException due to an invalid template ID.");
+ } catch (IllegalArgumentException e) {
+ // Expected exception.
+ }
+ }
}
finally {
try {
diff --git a/tests/camera/src/android/hardware/camera2/cts/DngCreatorTest.java b/tests/camera/src/android/hardware/camera2/cts/DngCreatorTest.java
index 6488cc6..a9f0008 100644
--- a/tests/camera/src/android/hardware/camera2/cts/DngCreatorTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/DngCreatorTest.java
@@ -81,6 +81,11 @@
private static final Calendar GPS_CALENDAR =
Calendar.getInstance(TimeZone.getTimeZone("GMT+0"));
+ /** Load DNG validation jni on initialization */
+ static {
+ System.loadLibrary("ctscamera2_jni");
+ }
+
static {
GPS_CALENDAR.set(2015, 0, 27, 2, 12, 01);
}
@@ -166,6 +171,8 @@
fileStream.close();
Log.v(TAG, "Test DNG file for camera " + deviceId + " saved to " + dngFilePath);
}
+ assertTrue("Generated DNG file does not pass validation",
+ validateDngNative(outputStream.toByteArray()));
} finally {
closeDevice(deviceId);
closeImageReader(captureReader);
@@ -266,6 +273,9 @@
Log.v(TAG, "Test DNG file for camera " + deviceId + " saved to " + filePath);
}
+ assertTrue("Generated DNG file does not pass validation",
+ validateDngNative(outputStream.toByteArray()));
+
ExifInterface exifInterface = new ExifInterface(filePath);
// Verify GPS data.
float[] latLong = new float[2];
@@ -687,8 +697,9 @@
@Override
public void onCaptureProgressed(CameraCaptureSession session,
CaptureRequest request, CaptureResult partialResult) {
- if (partialResult.get(CaptureResult.CONTROL_AE_STATE) ==
- CaptureRequest.CONTROL_AE_STATE_CONVERGED) {
+ int aeState = partialResult.get(CaptureResult.CONTROL_AE_STATE);
+ if (aeState == CaptureRequest.CONTROL_AE_STATE_CONVERGED ||
+ aeState == CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED) {
waitForAeCondition.open();
}
}
@@ -696,8 +707,9 @@
@Override
public void onCaptureCompleted(CameraCaptureSession session,
CaptureRequest request, TotalCaptureResult result) {
- if (result.get(CaptureResult.CONTROL_AE_STATE) ==
- CaptureRequest.CONTROL_AE_STATE_CONVERGED) {
+ int aeState = result.get(CaptureResult.CONTROL_AE_STATE);
+ if (aeState == CaptureRequest.CONTROL_AE_STATE_CONVERGED ||
+ aeState == CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED) {
waitForAeCondition.open();
}
}
@@ -740,4 +752,12 @@
return ret;
}
+
+ /**
+ * Use the DNG SDK to validate a DNG file stored in the buffer.
+ *
+ * Returns false if the DNG has validation errors. Validation warnings/errors
+ * will be printed to logcat.
+ */
+ private static native boolean validateDngNative(byte[] dngBuffer);
}
diff --git a/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java b/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
index 3bb573b..81767a6 100644
--- a/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
@@ -681,16 +681,23 @@
boolean supportZslEdgeMode = false;
boolean supportZslNoiseReductionMode = false;
+ boolean supportHiQNoiseReductionMode = false;
+ boolean supportHiQEdgeMode = false;
if (availableEdgeModes != null) {
supportZslEdgeMode = Arrays.asList(CameraTestUtils.toObject(availableEdgeModes)).
contains(CaptureRequest.EDGE_MODE_ZERO_SHUTTER_LAG);
+ supportHiQEdgeMode = Arrays.asList(CameraTestUtils.toObject(availableEdgeModes)).
+ contains(CaptureRequest.EDGE_MODE_HIGH_QUALITY);
}
if (availableNoiseReductionModes != null) {
supportZslNoiseReductionMode = Arrays.asList(
CameraTestUtils.toObject(availableNoiseReductionModes)).contains(
CaptureRequest.NOISE_REDUCTION_MODE_ZERO_SHUTTER_LAG);
+ supportHiQNoiseReductionMode = Arrays.asList(
+ CameraTestUtils.toObject(availableNoiseReductionModes)).contains(
+ CaptureRequest.NOISE_REDUCTION_MODE_HIGH_QUALITY);
}
if (supportYUV || supportOpaque) {
@@ -702,6 +709,15 @@
"NOISE_REDUCTION_MODE_ZERO_SHUTTER_LAG is not supported",
supportZslNoiseReductionMode);
+ // For reprocessing, if we only require OFF and ZSL mode, it will be just like jpeg
+ // encoding. We implicitly require FAST to make reprocessing meaningful, which means
+ // that we also require HIGH_QUALITY.
+ mCollector.expectTrue("Support reprocessing but EDGE_MODE_HIGH_QUALITY is " +
+ "not supported", supportHiQEdgeMode);
+ mCollector.expectTrue("Support reprocessing but " +
+ "NOISE_REDUCTION_MODE_HIGH_QUALITY is not supported",
+ supportHiQNoiseReductionMode);
+
// Verify mandatory input formats are supported
mCollector.expectTrue("YUV_420_888 input must be supported for YUV reprocessing",
!supportYUV || arrayContains(inputFormats, ImageFormat.YUV_420_888));
diff --git a/tests/camera/src/android/hardware/camera2/cts/NativeCameraDeviceTest.java b/tests/camera/src/android/hardware/camera2/cts/NativeCameraDeviceTest.java
index ad460c8..e2a61a6 100644
--- a/tests/camera/src/android/hardware/camera2/cts/NativeCameraDeviceTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/NativeCameraDeviceTest.java
@@ -31,7 +31,7 @@
/** Load jni on initialization */
static {
Log.i("NativeCameraDeviceTest", "before loadlibrary");
- System.loadLibrary("ctscamera2ndk_jni");
+ System.loadLibrary("ctscamera2_jni");
Log.i("NativeCameraDeviceTest", "after loadlibrary");
}
diff --git a/tests/camera/src/android/hardware/camera2/cts/NativeCameraManagerTest.java b/tests/camera/src/android/hardware/camera2/cts/NativeCameraManagerTest.java
index 6d0d73c..08e0363 100644
--- a/tests/camera/src/android/hardware/camera2/cts/NativeCameraManagerTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/NativeCameraManagerTest.java
@@ -29,7 +29,7 @@
/** Load jni on initialization */
static {
Log.i("NativeCameraManagerTest", "before loadlibrary");
- System.loadLibrary("ctscamera2ndk_jni");
+ System.loadLibrary("ctscamera2_jni");
Log.i("NativeCameraManagerTest", "after loadlibrary");
}
diff --git a/tests/camera/src/android/hardware/camera2/cts/NativeImageReaderTest.java b/tests/camera/src/android/hardware/camera2/cts/NativeImageReaderTest.java
index 24fc04f..7e4508a 100644
--- a/tests/camera/src/android/hardware/camera2/cts/NativeImageReaderTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/NativeImageReaderTest.java
@@ -29,7 +29,7 @@
/** Load jni on initialization */
static {
Log.i("NativeImageReaderTest", "before loadlibrary");
- System.loadLibrary("ctscamera2ndk_jni");
+ System.loadLibrary("ctscamera2_jni");
Log.i("NativeImageReaderTest", "after loadlibrary");
}
diff --git a/tests/camera/src/android/hardware/camera2/cts/NativeStillCaptureTest.java b/tests/camera/src/android/hardware/camera2/cts/NativeStillCaptureTest.java
index 50fa715..14b5a22 100644
--- a/tests/camera/src/android/hardware/camera2/cts/NativeStillCaptureTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/NativeStillCaptureTest.java
@@ -31,7 +31,7 @@
/** Load jni on initialization */
static {
Log.i("NativeStillCaptureTest", "before loadlibrary");
- System.loadLibrary("ctscamera2ndk_jni");
+ System.loadLibrary("ctscamera2_jni");
Log.i("NativeStillCaptureTest", "after loadlibrary");
}
diff --git a/tests/camera/src/android/hardware/camera2/cts/PerformanceTest.java b/tests/camera/src/android/hardware/camera2/cts/PerformanceTest.java
index 3f8e7db..9ecdc2d 100644
--- a/tests/camera/src/android/hardware/camera2/cts/PerformanceTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/PerformanceTest.java
@@ -334,9 +334,8 @@
}
/**
- * Test reprocessing shot-to-shot latency, i.e., from the time a reprocess
- * request is issued to the time the reprocess image is returned.
- *
+ * Test reprocessing shot-to-shot latency with default NR and edge options, i.e., from the time
+ * a reprocess request is issued to the time the reprocess image is returned.
*/
public void testReprocessingLatency() throws Exception {
for (String id : mCameraIds) {
@@ -348,7 +347,8 @@
try {
openDevice(id);
- reprocessingPerformanceTestByCamera(format, /*asyncMode*/false);
+ reprocessingPerformanceTestByCamera(format, /*asyncMode*/false,
+ /*highQuality*/false);
} finally {
closeReaderWriters();
closeDevice();
@@ -358,7 +358,7 @@
}
/**
- * Test reprocessing throughput, i.e., how many frames can be reprocessed
+ * Test reprocessing throughput with default NR and edge options, i.e., how many frames can be reprocessed
* during a given amount of time.
*
*/
@@ -372,7 +372,57 @@
try {
openDevice(id);
- reprocessingPerformanceTestByCamera(format, /*asyncMode*/true);
+ reprocessingPerformanceTestByCamera(format, /*asyncMode*/true,
+ /*highQuality*/false);
+ } finally {
+ closeReaderWriters();
+ closeDevice();
+ }
+ }
+ }
+ }
+
+ /**
+ * Test reprocessing shot-to-shot latency with High Quality NR and edge options, i.e., from the
+ * time a reprocess request is issued to the time the reprocess image is returned.
+ */
+ public void testHighQualityReprocessingLatency() throws Exception {
+ for (String id : mCameraIds) {
+ for (int format : REPROCESS_FORMATS) {
+ if (!isReprocessSupported(id, format)) {
+ continue;
+ }
+
+ try {
+ openDevice(id);
+
+ reprocessingPerformanceTestByCamera(format, /*asyncMode*/false,
+ /*requireHighQuality*/true);
+ } finally {
+ closeReaderWriters();
+ closeDevice();
+ }
+ }
+ }
+ }
+
+ /**
+ * Test reprocessing throughput with high quality NR and edge options, i.e., how many frames can
+ * be reprocessed during a given amount of time.
+ *
+ */
+ public void testHighQualityReprocessingThroughput() throws Exception {
+ for (String id : mCameraIds) {
+ for (int format : REPROCESS_FORMATS) {
+ if (!isReprocessSupported(id, format)) {
+ continue;
+ }
+
+ try {
+ openDevice(id);
+
+ reprocessingPerformanceTestByCamera(format, /*asyncMode*/true,
+ /*requireHighQuality*/true);
} finally {
closeReaderWriters();
closeDevice();
@@ -422,6 +472,10 @@
WAIT_FOR_RESULT_TIMEOUT_MS, inputImages[i].getTimestamp());
reprocessReqs[i] = mCamera.createReprocessCaptureRequest(zslResult);
reprocessReqs[i].addTarget(mJpegReader.getSurface());
+ reprocessReqs[i].set(CaptureRequest.NOISE_REDUCTION_MODE,
+ CaptureRequest.NOISE_REDUCTION_MODE_HIGH_QUALITY);
+ reprocessReqs[i].set(CaptureRequest.EDGE_MODE,
+ CaptureRequest.EDGE_MODE_HIGH_QUALITY);
mWriter.queueInputImage(inputImages[i]);
}
@@ -506,7 +560,8 @@
}
}
- private void reprocessingPerformanceTestByCamera(int reprocessInputFormat, boolean asyncMode)
+ private void reprocessingPerformanceTestByCamera(int reprocessInputFormat, boolean asyncMode,
+ boolean requireHighQuality)
throws Exception {
// Prepare the reprocessing capture
prepareReprocessCapture(reprocessInputFormat);
@@ -526,6 +581,13 @@
mZslResultListener.getCaptureResult(
WAIT_FOR_RESULT_TIMEOUT_MS, inputImages[i].getTimestamp());
reprocessReqs[i] = mCamera.createReprocessCaptureRequest(zslResult);
+ if (requireHighQuality) {
+ // Reprocessing should support high quality for NR and edge modes.
+ reprocessReqs[i].set(CaptureRequest.NOISE_REDUCTION_MODE,
+ CaptureRequest.NOISE_REDUCTION_MODE_HIGH_QUALITY);
+ reprocessReqs[i].set(CaptureRequest.EDGE_MODE,
+ CaptureRequest.EDGE_MODE_HIGH_QUALITY);
+ }
reprocessReqs[i].addTarget(mJpegReader.getSurface());
}
@@ -578,16 +640,25 @@
}
// Report the performance data
+ String captureMsg;
if (asyncMode) {
+ captureMsg = "capture latency";
+ if (requireHighQuality) {
+ captureMsg += " for High Quality noise reduction and edge modes";
+ }
mReportLog.addValues("Camera " + mCamera.getId()
- + ":" + reprocessType + "capture latency", getImageLatenciesMs,
+ + ":" + reprocessType + captureMsg, getImageLatenciesMs,
ResultType.LOWER_BETTER, ResultUnit.MS);
mReportLog.setSummary("Camera reprocessing average latency for Camera " +
mCamera.getId(), Stat.getAverage(getImageLatenciesMs), ResultType.LOWER_BETTER,
ResultUnit.MS);
} else {
+ captureMsg = "shot to shot latency";
+ if (requireHighQuality) {
+ captureMsg += " for High Quality noise reduction and edge modes";
+ }
mReportLog.addValues("Camera " + mCamera.getId()
- + ":" + reprocessType + "shot to shot latency", getImageLatenciesMs,
+ + ":" + reprocessType + captureMsg, getImageLatenciesMs,
ResultType.LOWER_BETTER, ResultUnit.MS);
mReportLog.setSummary("Camera reprocessing shot to shot average latency for Camera " +
mCamera.getId(), Stat.getAverage(getImageLatenciesMs), ResultType.LOWER_BETTER,
diff --git a/tests/core/runner/Android.mk b/tests/core/runner/Android.mk
index 0ca371b..158a1f1 100644
--- a/tests/core/runner/Android.mk
+++ b/tests/core/runner/Android.mk
@@ -27,7 +27,7 @@
LOCAL_PACKAGE_NAME := android.core.tests.runner
-LOCAL_STATIC_JAVA_LIBRARIES := core-tests android-support-test
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
diff --git a/tests/tests/graphics/Android.mk b/tests/tests/graphics/Android.mk
index 074b7bce..b6d8bc9 100644
--- a/tests/tests/graphics/Android.mk
+++ b/tests/tests/graphics/Android.mk
@@ -18,6 +18,8 @@
LOCAL_MODULE_TAGS := tests
+LOCAL_JAVA_LIBRARIES := android.test.runner
+
LOCAL_STATIC_JAVA_LIBRARIES := mockito-target ctsdeviceutil ctstestrunner
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
index 60da3ad..33b99a4 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
@@ -153,8 +153,22 @@
assertStoppedAnimation(THIRD_FRAME_INDEX, THIRD_FRAME_DURATION);
}
- public void testRun() {
- // This method should not be called directly.
+ public void testRun() throws Throwable {
+ assertFalse(mAnimationDrawable.isRunning());
+ runTestOnUiThread(new Runnable() {
+ public void run() {
+ mAnimationDrawable.run();
+ }
+ });
+
+ assertTrue(mAnimationDrawable.isRunning());
+ pollingCheckDrawable(SECOND_FRAME_INDEX, FIRST_FRAME_DURATION);
+
+ runTestOnUiThread(new Runnable() {
+ public void run() {
+ mAnimationDrawable.unscheduleSelf(mAnimationDrawable);
+ }
+ });
}
public void testUnscheduleSelf() throws Throwable {
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
index 67a2dd2..ed31a94 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/BitmapDrawableTest.java
@@ -124,6 +124,17 @@
assertEquals(Integer.MAX_VALUE, bitmapDrawable.getGravity());
}
+ public void testAccessMipMap() {
+ Bitmap source = BitmapFactory.decodeResource(mContext.getResources(), R.raw.testimage);
+ BitmapDrawable bitmapDrawable = new BitmapDrawable(source);
+
+ bitmapDrawable.setMipMap(true);
+ assertTrue(source.hasMipMap());
+
+ bitmapDrawable.setMipMap(false);
+ assertFalse(source.hasMipMap());
+ }
+
public void testSetAntiAlias() {
InputStream source = mContext.getResources().openRawResource(R.raw.testimage);
BitmapDrawable bitmapDrawable = new BitmapDrawable(source);
@@ -352,7 +363,21 @@
bitmapDrawable = new BitmapDrawable(bitmap);
sourceDensity = bitmap.getDensity();
targetDensity = canvas.getDensity();
- bitmapDrawable.setTargetDensity(targetDensity);
+ bitmapDrawable.setTargetDensity(canvas);
+ targetWidth = DrawableTestUtils.scaleBitmapFromDensity(
+ sourceWidth, sourceDensity, targetDensity);
+ targetHeight = DrawableTestUtils.scaleBitmapFromDensity(
+ sourceHeight, sourceDensity, targetDensity);
+ assertEquals(targetWidth, bitmapDrawable.getIntrinsicWidth());
+ assertEquals(targetHeight, bitmapDrawable.getIntrinsicHeight());
+
+ sourceWidth = 200;
+ sourceHeight = 300;
+ bitmap = Bitmap.createBitmap(sourceWidth, sourceHeight, Config.RGB_565);
+ bitmapDrawable = new BitmapDrawable(bitmap);
+ sourceDensity = bitmap.getDensity();
+ targetDensity = mContext.getResources().getDisplayMetrics().densityDpi;
+ bitmapDrawable.setTargetDensity(mContext.getResources().getDisplayMetrics());
targetWidth = DrawableTestUtils.scaleBitmapFromDensity(
sourceWidth, sourceDensity, targetDensity);
targetHeight = DrawableTestUtils.scaleBitmapFromDensity(
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTest.java
index 0858c6b..bc452f3 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableTest.java
@@ -16,6 +16,8 @@
package android.graphics.drawable.cts;
+import android.content.res.Resources.Theme;
+import android.graphics.drawable.Drawable.Callback;
import android.view.View;
import android.graphics.cts.R;
@@ -46,6 +48,8 @@
import android.util.TypedValue;
import android.util.Xml;
+import static org.mockito.Mockito.mock;
+
public class DrawableTest extends AndroidTestCase {
Resources mResources;
@@ -57,7 +61,7 @@
}
public void testClearColorFilter() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
mockDrawable.clearColorFilter();
assertNull(mockDrawable.getColorFilter());
@@ -70,7 +74,7 @@
}
public void testCopyBounds() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
Rect rect1 = mockDrawable.copyBounds();
Rect r1 = new Rect();
mockDrawable.copyBounds(r1);
@@ -301,9 +305,23 @@
public void testCreateFromXml() throws XmlPullParserException, IOException {
XmlPullParser parser = mResources.getXml(R.drawable.gradientdrawable);
Drawable drawable = Drawable.createFromXml(mResources, parser);
- // values from gradientdrawable.xml
- assertEquals(42, drawable.getIntrinsicWidth());
- assertEquals(63, drawable.getIntrinsicHeight());
+ assertNotNull(drawable);
+
+ Drawable expected = mResources.getDrawable(R.drawable.gradientdrawable, null);
+ assertEquals(expected.getIntrinsicWidth(), drawable.getIntrinsicWidth());
+ assertEquals(expected.getIntrinsicHeight(), drawable.getIntrinsicHeight());
+ }
+
+ public void testCreateFromXmlThemed() throws XmlPullParserException, IOException {
+ XmlPullParser parser = mResources.getXml(R.drawable.gradientdrawable_theme);
+ Theme theme = mResources.newTheme();
+ theme.applyStyle(R.style.Theme_ThemedDrawableTest, true);
+ Drawable drawable = Drawable.createFromXml(mResources, parser, theme);
+ assertNotNull(drawable);
+
+ Drawable expected = mResources.getDrawable(R.drawable.gradientdrawable_theme, theme);
+ assertEquals(expected.getIntrinsicWidth(), drawable.getIntrinsicWidth());
+ assertEquals(expected.getIntrinsicHeight(), drawable.getIntrinsicHeight());
}
public void testCreateFromXmlInner() throws XmlPullParserException, IOException {
@@ -315,14 +333,29 @@
Drawable drawable = Drawable.createFromXmlInner(mResources, parser, attrs);
assertNotNull(drawable);
- Drawable expected = mResources.getDrawable(R.drawable.gradientdrawable);
+ Drawable expected = mResources.getDrawable(R.drawable.gradientdrawable, null);
+ assertEquals(expected.getIntrinsicWidth(), drawable.getIntrinsicWidth());
+ assertEquals(expected.getIntrinsicHeight(), drawable.getIntrinsicHeight());
+ }
+ public void testCreateFromXmlInnerThemed() throws XmlPullParserException, IOException {
+ XmlPullParser parser = mResources.getXml(R.drawable.gradientdrawable_theme);
+ while (parser.next() != XmlPullParser.START_TAG) {
+ // ignore event, just seek to first tag
+ }
+ AttributeSet attrs = Xml.asAttributeSet(parser);
+ Theme theme = mResources.newTheme();
+ theme.applyStyle(R.style.Theme_ThemedDrawableTest, true);
+ Drawable drawable = Drawable.createFromXmlInner(mResources, parser, attrs, theme);
+ assertNotNull(drawable);
+
+ Drawable expected = mResources.getDrawable(R.drawable.gradientdrawable_theme, theme);
assertEquals(expected.getIntrinsicWidth(), drawable.getIntrinsicWidth());
assertEquals(expected.getIntrinsicHeight(), drawable.getIntrinsicHeight());
}
public void testAccessBounds() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
mockDrawable.setBounds(0, 0, 100, 100);
Rect r = mockDrawable.getBounds();
assertEquals(0, r.left);
@@ -345,7 +378,7 @@
}
public void testAccessChangingConfigurations() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
assertEquals(0, mockDrawable.getChangingConfigurations());
mockDrawable.setChangingConfigurations(1);
@@ -359,27 +392,27 @@
}
public void testGetConstantState() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
assertNull(mockDrawable.getConstantState());
}
public void testGetCurrent() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
assertSame(mockDrawable, mockDrawable.getCurrent());
}
public void testGetIntrinsicHeight() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
assertEquals(-1, mockDrawable.getIntrinsicHeight());
}
public void testGetIntrinsicWidth() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
assertEquals(-1, mockDrawable.getIntrinsicWidth());
}
public void testAccessLevel() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
assertEquals(0, mockDrawable.getLevel());
assertFalse(mockDrawable.setLevel(10));
@@ -396,17 +429,17 @@
}
public void testGetMinimumHeight() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
assertEquals(0, mockDrawable.getMinimumHeight());
}
public void testGetMinimumWidth() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
assertEquals(0, mockDrawable.getMinimumWidth());
}
public void testGetPadding() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
Rect r = new Rect(10, 10, 20, 20);
assertFalse(mockDrawable.getPadding(r));
assertEquals(0, r.bottom);
@@ -422,7 +455,7 @@
}
public void testAccessState() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
assertEquals(StateSet.WILD_CARD, mockDrawable.getState());
int[] states = new int[] {1, 2, 3};
@@ -433,12 +466,12 @@
}
public void testGetTransparentRegion() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
assertNull(mockDrawable.getTransparentRegion());
}
public void testInflate() throws XmlPullParserException, IOException {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
XmlPullParser parser = mResources.getXml(R.xml.drawable_test);
while (parser.next() != XmlPullParser.START_TAG) {
@@ -452,7 +485,7 @@
}
public void testInvalidateSelf() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
// if setCallback() is not called, invalidateSelf() would do nothing,
// so just call it to check whether it throws exceptions.
mockDrawable.invalidateSelf();
@@ -464,12 +497,12 @@
}
public void testIsStateful() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
assertFalse(mockDrawable.isStateful());
}
public void testVisible() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
assertTrue(mockDrawable.isVisible());
assertTrue(mockDrawable.setVisible(false, false));
@@ -485,7 +518,7 @@
public void testOnBoundsChange() {
MockDrawable mockDrawable = new MockDrawable();
- // onBoundsChange is a non-operation function.
+ // No-op in the Drawable superclass.
mockDrawable.onBoundsChange(new Rect(0, 0, 10, 10));
}
@@ -522,56 +555,45 @@
assertEquals(1000L, mockCallback.getWhen());
}
- public void testSetCallback() {
- MockDrawable mockDrawable = new MockDrawable();
+ public void testAccessCallback() {
+ Drawable mockDrawable = new MockDrawable();
+ Callback mockCallback = mock(Callback.class);
- MockCallback mockCallback = new MockCallback();
mockDrawable.setCallback(mockCallback);
- mockDrawable.scheduleSelf(null, 1000L);
- assertEquals(mockDrawable, mockCallback.getScheduleDrawable());
- assertNull(mockCallback.getRunnable());
- assertEquals(1000L, mockCallback.getWhen());
+ assertEquals(mockCallback, mockDrawable.getCallback());
+
+ mockDrawable.setCallback(null);
+ assertEquals(null, mockDrawable.getCallback());
}
public void testSetColorFilter() {
- MockDrawable mockDrawable = new MockDrawable();
-
+ Drawable mockDrawable = new MockDrawable();
mockDrawable.setColorFilter(5, PorterDuff.Mode.CLEAR);
}
public void testSetDither() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
- // setDither is a non-operation function.
+ // No-op in the Drawable superclass.
mockDrawable.setDither(false);
}
public void testSetHotspotBounds() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
- // setHotspotBounds is a non-operation function.
+ // No-op in the Drawable superclass.
mockDrawable.setHotspotBounds(10, 15, 100, 150);
}
public void testGetHotspotBounds() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
- // getHotspotBounds doesn't do anything interesting in the Drawable superclass
+ // No-op in the Drawable superclass.
mockDrawable.getHotspotBounds(new Rect());
}
- public void testSetLayoutDirection() {
- MockDrawable mockDrawable = new MockDrawable();
-
- mockDrawable.setLayoutDirection(View.LAYOUT_DIRECTION_LTR);
- assertEquals(View.LAYOUT_DIRECTION_LTR, mockDrawable.getLayoutDirection());
-
- mockDrawable.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
- assertEquals(View.LAYOUT_DIRECTION_RTL, mockDrawable.getLayoutDirection());
- }
-
- public void testGetLayoutDirection() {
- MockDrawable mockDrawable = new MockDrawable();
+ public void testAccessLayoutDirection() {
+ Drawable mockDrawable = new MockDrawable();
mockDrawable.setLayoutDirection(View.LAYOUT_DIRECTION_LTR);
assertEquals(View.LAYOUT_DIRECTION_LTR, mockDrawable.getLayoutDirection());
@@ -581,28 +603,28 @@
}
public void testOnLayoutDirectionChanged() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
- // onLayoutDirectionChanged is a non-operation function.
+ // No-op in the Drawable superclass.
mockDrawable.onLayoutDirectionChanged(View.LAYOUT_DIRECTION_LTR);
}
public void testSetFilterBitmap() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
- // setFilterBitmap is a non-operation function.
+ // No-op in the Drawable superclass.
mockDrawable.setFilterBitmap(false);
}
public void testIsFilterBitmap() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
- // setFilterBitmap is a non-operation function.
+ // No-op in the Drawable superclass.
mockDrawable.isFilterBitmap();
}
public void testUnscheduleSelf() {
- MockDrawable mockDrawable = new MockDrawable();
+ Drawable mockDrawable = new MockDrawable();
MockCallback mockCallback = new MockCallback();
mockDrawable.setCallback(mockCallback);
mockDrawable.unscheduleSelf(null);
@@ -611,8 +633,7 @@
}
public void testMutate() {
- MockDrawable mockDrawable = new MockDrawable();
-
+ Drawable mockDrawable = new MockDrawable();
assertSame(mockDrawable, mockDrawable.mutate());
}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableWrapperTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableWrapperTest.java
index 9037e6a..340f945 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableWrapperTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/DrawableWrapperTest.java
@@ -42,7 +42,7 @@
@SuppressWarnings("deprecation")
public void testConstructor() {
Drawable d = new BitmapDrawable();
- MyWrapper wrapper = new MyWrapper(d);
+ DrawableWrapper wrapper = new MyWrapper(d);
assertSame(d, wrapper.getDrawable());
new MyWrapper(null);
@@ -51,14 +51,14 @@
@SuppressWarnings("deprecation")
public void testGetDrawable() {
Drawable d = new BitmapDrawable();
- MyWrapper wrapper = new MyWrapper(d);
+ DrawableWrapper wrapper = new MyWrapper(d);
assertSame(d, wrapper.getDrawable());
}
@SuppressWarnings("deprecation")
public void testSetDrawable() {
Drawable d = new BitmapDrawable();
- MyWrapper wrapper = new MyWrapper(null);
+ DrawableWrapper wrapper = new MyWrapper(null);
assertSame(null, wrapper.getDrawable());
wrapper.setDrawable(d);
@@ -67,7 +67,7 @@
@SuppressWarnings("deprecation")
public void testInvalidateDrawable() {
- MyWrapper wrapper = new MyWrapper(new BitmapDrawable());
+ DrawableWrapper wrapper = new MyWrapper(new BitmapDrawable());
MockCallback cb = new MockCallback();
wrapper.setCallback(cb);
@@ -86,7 +86,7 @@
@SuppressWarnings("deprecation")
public void testScheduleDrawable() {
- MyWrapper wrapper = new MyWrapper(new BitmapDrawable());
+ DrawableWrapper wrapper = new MyWrapper(new BitmapDrawable());
MockCallback cb = new MockCallback();
wrapper.setCallback(cb);
@@ -108,7 +108,7 @@
@SuppressWarnings("deprecation")
public void testUnscheduleDrawable() {
- MyWrapper wrapper = new MyWrapper(new BitmapDrawable());
+ DrawableWrapper wrapper = new MyWrapper(new BitmapDrawable());
MockCallback cb = new MockCallback();
wrapper.setCallback(cb);
@@ -170,7 +170,7 @@
public void testDraw() {
MockDrawable mockDrawable = new MockDrawable();
- MyWrapper wrapper = new MyWrapper(mockDrawable);
+ DrawableWrapper wrapper = new MyWrapper(mockDrawable);
wrapper.draw(new Canvas());
assertTrue(mockDrawable.hasCalledDraw());
@@ -185,7 +185,7 @@
final int CONTAINED_DRAWABLE_CONFIG = 2;
MockDrawable mockDrawable = new MockDrawable();
- MyWrapper wrapper = new MyWrapper(mockDrawable);
+ DrawableWrapper wrapper = new MyWrapper(mockDrawable);
assertEquals(0, wrapper.getChangingConfigurations());
@@ -199,7 +199,7 @@
public void testGetPadding() {
MockDrawable mockDrawable = new MockDrawable();
- MyWrapper wrapper = new MyWrapper(mockDrawable);
+ DrawableWrapper wrapper = new MyWrapper(mockDrawable);
// this method will call contained drawable's getPadding method.
wrapper.getPadding(new Rect());
@@ -215,7 +215,7 @@
public void testSetVisible() {
MockDrawable mockDrawable = new MockDrawable();
- MyWrapper wrapper = new MyWrapper(mockDrawable);
+ DrawableWrapper wrapper = new MyWrapper(mockDrawable);
assertTrue(wrapper.isVisible());
assertTrue(wrapper.setVisible(false, false));
@@ -235,7 +235,7 @@
public void testSetAlpha() {
MockDrawable mockDrawable = new MockDrawable();
- MyWrapper wrapper = new MyWrapper(mockDrawable);
+ DrawableWrapper wrapper = new MyWrapper(mockDrawable);
// this method will call contained drawable's setAlpha method.
wrapper.setAlpha(100);
@@ -252,7 +252,7 @@
public void testSetColorFilter() {
MockDrawable mockDrawable = new MockDrawable();
- MyWrapper wrapper = new MyWrapper(mockDrawable);
+ DrawableWrapper wrapper = new MyWrapper(mockDrawable);
// this method will call contained drawable's setColorFilter method.
wrapper.setColorFilter(new ColorFilter());
@@ -265,7 +265,7 @@
public void testGetOpacity() {
MockDrawable mockDrawable = new MockDrawable();
- MyWrapper wrapper = new MyWrapper(mockDrawable);
+ DrawableWrapper wrapper = new MyWrapper(mockDrawable);
// This method will call contained drawable's getOpacity method.
wrapper.setLevel(1);
@@ -275,7 +275,7 @@
public void testIsStateful() {
MockDrawable mockDrawable = new MockDrawable();
- MyWrapper wrapper = new MyWrapper(mockDrawable);
+ DrawableWrapper wrapper = new MyWrapper(mockDrawable);
// this method will call contained drawable's isStateful method.
wrapper.isStateful();
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/GradientDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/GradientDrawableTest.java
index e118a66..713f61a 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/GradientDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/GradientDrawableTest.java
@@ -16,26 +16,35 @@
package android.graphics.drawable.cts;
-import android.content.res.Resources.Theme;
-import android.content.res.XmlResourceParser;
-import android.graphics.cts.R;
-
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
+import android.content.res.ColorStateList;
import android.content.res.Resources;
+import android.content.res.Resources.Theme;
+import android.content.res.XmlResourceParser;
import android.graphics.Canvas;
+import android.graphics.Color;
import android.graphics.ColorFilter;
+import android.graphics.PixelFormat;
import android.graphics.Rect;
-import android.graphics.drawable.GradientDrawable;
+import android.graphics.cts.R;
import android.graphics.drawable.Drawable.ConstantState;
+import android.graphics.drawable.GradientDrawable;
+import android.graphics.drawable.GradientDrawable.Orientation;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.SmallTest;
import android.util.AttributeSet;
import android.util.Xml;
import java.io.IOException;
+import java.util.Arrays;
+
+import static org.junit.Assert.assertArrayEquals;
public class GradientDrawableTest extends AndroidTestCase {
+ @SmallTest
public void testConstructor() {
int[] color = new int[] {1, 2, 3};
@@ -44,12 +53,61 @@
new GradientDrawable(null, null);
}
+ @SmallTest
+ public void testGetOpacity() {
+ GradientDrawable gradientDrawable = new GradientDrawable();
+ assertEquals("Default opacity is TRANSLUCENT",
+ PixelFormat.TRANSLUCENT, gradientDrawable.getOpacity());
+
+ gradientDrawable.setColor(Color.TRANSPARENT);
+ assertEquals("Color.TRANSPARENT is TRANSLUCENT",
+ PixelFormat.TRANSLUCENT, gradientDrawable.getOpacity());
+
+ gradientDrawable.setColor(0x80FFFFFF);
+ assertEquals("0x80FFFFFF is TRANSLUCENT",
+ PixelFormat.TRANSLUCENT, gradientDrawable.getOpacity());
+
+ gradientDrawable.setColors(new int[] { Color.RED, Color.TRANSPARENT });
+ assertEquals("{ RED, TRANSPARENT } is TRANSLUCENT",
+ PixelFormat.TRANSLUCENT, gradientDrawable.getOpacity());
+
+ gradientDrawable.setColors(new int[] { Color.RED, Color.BLUE });
+ assertEquals("{ RED, BLUE } is OPAQUE",
+ PixelFormat.OPAQUE, gradientDrawable.getOpacity());
+
+ gradientDrawable.setColor(Color.RED);
+ assertEquals("RED is OPAQUE",
+ PixelFormat.OPAQUE, gradientDrawable.getOpacity());
+
+ gradientDrawable.setCornerRadius(10);
+ gradientDrawable.setColor(Color.RED);
+ assertEquals("RED with corner radius is TRANSLUCENT",
+ PixelFormat.TRANSLUCENT, gradientDrawable.getOpacity());
+
+ }
+
+ @SmallTest
+ public void testSetOrientation() {
+ GradientDrawable gradientDrawable = new GradientDrawable();
+ Orientation orientation;
+
+ orientation = Orientation.BL_TR;
+ gradientDrawable.setOrientation(orientation);
+ assertEquals("Orientation set/get are symmetric",
+ orientation, gradientDrawable.getOrientation());
+ }
+
+ @SmallTest
public void testSetCornerRadii() {
float[] radii = new float[] {1.0f, 2.0f, 3.0f};
GradientDrawable gradientDrawable = new GradientDrawable();
gradientDrawable.setCornerRadii(radii);
+ float[] radiiActual = gradientDrawable.getCornerRadii();
+ assertArrayEquals("Gradient radius set/get are symmetric",
+ radii, radiiActual, 0);
+
ConstantState constantState = gradientDrawable.getConstantState();
assertNotNull(constantState);
@@ -57,6 +115,7 @@
gradientDrawable.setCornerRadii(null);
}
+ @SmallTest
public void testSetCornerRadius() {
GradientDrawable gradientDrawable = new GradientDrawable();
@@ -64,75 +123,133 @@
gradientDrawable.setCornerRadius(-2.5f);
}
+ @SmallTest
public void testSetStroke() {
- GradientDrawable gradientDrawable = new GradientDrawable();
-
- gradientDrawable.setStroke(2, 3);
- gradientDrawable.setStroke(-2, -3);
+ helpTestSetStroke(2, Color.RED);
+ helpTestSetStroke(-2, Color.TRANSPARENT);
+ helpTestSetStroke(0, 0);
}
- public void testSetStroke1() {
- int width = 2;
- int color = 3;
- float dashWidth = 3.4f;
- float dashGap = 5.5f;
-
+ private void helpTestSetStroke(int width, int color) {
GradientDrawable gradientDrawable = new GradientDrawable();
- gradientDrawable.setStroke(width, color, dashWidth, dashGap);
-
- width = -2;
- color = -3;
- dashWidth = -3.4f;
- dashGap = -5.5f;
- gradientDrawable.setStroke(width, color, dashWidth, dashGap);
+ gradientDrawable.setStroke(width, color);
+ // TODO: Verify stroke properties.
}
+ @SmallTest
+ public void testSetStroke_WidthGap() {
+ helpTestSetStroke_WidthGap(2, Color.RED, 3.4f, 5.5f);
+ helpTestSetStroke_WidthGap(-2, Color.TRANSPARENT, -3.4f, -5.5f);
+ helpTestSetStroke_WidthGap(0, 0, 0, (float) 0.0f);
+ }
+
+ private void helpTestSetStroke_WidthGap(int width, int color,
+ float dashWidth, float dashGap) {
+ GradientDrawable gradientDrawable = new GradientDrawable();
+ gradientDrawable.setStroke(width, color, dashWidth, dashGap);
+ // TODO: Verify stroke properties.
+ }
+
+ @SmallTest
+ public void testSetStrokeList() {
+ helpTestSetStrokeList(2, ColorStateList.valueOf(Color.RED));
+ helpTestSetStrokeList(-2, ColorStateList.valueOf(Color.TRANSPARENT));
+ helpTestSetStrokeList(0, null);
+ }
+
+ private void helpTestSetStrokeList(int width,
+ ColorStateList colorList) {
+ GradientDrawable gradientDrawable = new GradientDrawable();
+ gradientDrawable.setStroke(width, colorList);
+ // TODO: Verify stroke properties.
+ }
+
+ @SmallTest
+ public void testSetStrokeList_WidthGap() {
+ helpTestSetStrokeList_WidthGap(2, ColorStateList.valueOf(Color.RED), 3.4f, 5.5f);
+ helpTestSetStrokeList_WidthGap(-2, ColorStateList.valueOf(Color.TRANSPARENT), -3.4f, -5.5f);
+ helpTestSetStrokeList_WidthGap(0, null, 0.0f, 0.0f);
+ }
+
+ private void helpTestSetStrokeList_WidthGap(int width, ColorStateList colorList,
+ float dashWidth, float dashGap) {
+ GradientDrawable gradientDrawable = new GradientDrawable();
+ gradientDrawable.setStroke(width, colorList, dashWidth, dashGap);
+ // TODO: Verify stroke properties.
+ }
+
+ @SmallTest
public void testSetSize() {
- GradientDrawable gradientDrawable = new GradientDrawable();
- gradientDrawable.setSize(6, 4);
- assertEquals(6, gradientDrawable.getIntrinsicWidth());
- assertEquals(4, gradientDrawable.getIntrinsicHeight());
-
- gradientDrawable.setSize(-30, -40);
- assertEquals(-30, gradientDrawable.getIntrinsicWidth());
- assertEquals(-40, gradientDrawable.getIntrinsicHeight());
-
- gradientDrawable.setSize(0, 0);
- assertEquals(0, gradientDrawable.getIntrinsicWidth());
- assertEquals(0, gradientDrawable.getIntrinsicHeight());
-
- gradientDrawable.setSize(Integer.MAX_VALUE, Integer.MIN_VALUE);
- assertEquals(Integer.MAX_VALUE, gradientDrawable.getIntrinsicWidth());
- assertEquals(Integer.MIN_VALUE, gradientDrawable.getIntrinsicHeight());
+ helpTestSetSize(6, 4);
+ helpTestSetSize(-30, -40);
+ helpTestSetSize(0, 0);
+ helpTestSetSize(Integer.MAX_VALUE, Integer.MIN_VALUE);
}
+ private void helpTestSetSize(int width, int height) {
+ GradientDrawable gradientDrawable = new GradientDrawable();
+ gradientDrawable.setSize(width, height);
+ assertEquals(width, gradientDrawable.getIntrinsicWidth());
+ assertEquals(height, gradientDrawable.getIntrinsicHeight());
+ }
+
+ @SmallTest
public void testSetShape() {
GradientDrawable gradientDrawable = new GradientDrawable();
+ int shape;
- gradientDrawable.setShape(6);
- gradientDrawable.setShape(-6);
+ shape = GradientDrawable.OVAL;
+ gradientDrawable.setShape(shape);
+ assertEquals("Gradient shape set/get are symmetric",
+ shape, gradientDrawable.getShape());
- gradientDrawable.setShape(Integer.MAX_VALUE);
- gradientDrawable.setShape(Integer.MIN_VALUE);
+ shape = -1;
+ gradientDrawable.setShape(shape);
+ assertEquals("Invalid gradient shape set/get are symmetric",
+ shape, gradientDrawable.getShape());
}
+ @SmallTest
public void testSetGradientType() {
GradientDrawable gradientDrawable = new GradientDrawable();
+ int gradientType;
- gradientDrawable.setGradientType(7);
- gradientDrawable.setGradientType(-7);
+ gradientType = GradientDrawable.LINEAR_GRADIENT;
+ gradientDrawable.setGradientType(gradientType);
+ assertEquals("Gradient type set/get are symmetric",
+ gradientType, gradientDrawable.getGradientType());
- gradientDrawable.setGradientType(Integer.MAX_VALUE);
- gradientDrawable.setGradientType(Integer.MIN_VALUE);
+ gradientType = -1;
+ gradientDrawable.setGradientType(gradientType);
+ assertEquals("Invalid gradient type set/get are symmetric",
+ gradientType, gradientDrawable.getGradientType());
}
+ @SmallTest
public void testSetGradientCenter() {
GradientDrawable gradientDrawable = new GradientDrawable();
+ float centerX;
+ float centerY;
- gradientDrawable.setGradientCenter(3.4f, 5.5f);
- gradientDrawable.setGradientCenter(-3.4f, -5.5f);
+ centerX = 0.5f;
+ centerY = 0.5f;
+ assertEquals(centerX, gradientDrawable.getGradientCenterX(), 0.01f);
+ assertEquals(centerY, gradientDrawable.getGradientCenterY(), 0.01f);
+
+ centerX = -0.5f;
+ centerY = -0.5f;
+ gradientDrawable.setGradientCenter(centerX, centerY);
+ assertEquals(centerX, gradientDrawable.getGradientCenterX(), 0.01f);
+ assertEquals(centerY, gradientDrawable.getGradientCenterY(), 0.01f);
+
+ centerX = 0.0f;
+ centerY = 0.0f;
+ gradientDrawable.setGradientCenter(centerX, centerY);
+ assertEquals(centerX, gradientDrawable.getGradientCenterX());
+ assertEquals(centerY, gradientDrawable.getGradientCenterY());
}
+ @SmallTest
public void testSetGradientRadius() {
GradientDrawable gradientDrawable = new GradientDrawable();
@@ -140,13 +257,25 @@
gradientDrawable.setGradientRadius(-3.6f);
}
+ @SmallTest
public void testSetUseLevel() {
GradientDrawable gradientDrawable = new GradientDrawable();
+ boolean useLevel;
- gradientDrawable.setUseLevel(true);
- gradientDrawable.setUseLevel(false);
+ assertFalse("Default useLevel is false", gradientDrawable.getUseLevel());
+
+ useLevel = true;
+ gradientDrawable.setUseLevel(useLevel);
+ assertEquals("Gradient set/get useLevel is symmetric",
+ useLevel, gradientDrawable.getUseLevel());
+
+ useLevel = false;
+ gradientDrawable.setUseLevel(useLevel);
+ assertEquals("Gradient set/get useLevel is symmetric",
+ useLevel, gradientDrawable.getUseLevel());
}
+ @SmallTest
public void testDraw() {
GradientDrawable gradientDrawable = new GradientDrawable();
Canvas c = new Canvas();
@@ -156,16 +285,53 @@
gradientDrawable.draw(null);
}
+ @SmallTest
public void testSetColor() {
GradientDrawable gradientDrawable = new GradientDrawable();
+ int color;
- gradientDrawable.setColor(8);
- gradientDrawable.setColor(-8);
+ color = Color.RED;
+ gradientDrawable.setColor(color);
+ assertEquals("Color was set to " + color, color,
+ gradientDrawable.getColor().getDefaultColor());
- gradientDrawable.setColor(Integer.MAX_VALUE);
- gradientDrawable.setColor(Integer.MIN_VALUE);
+ color = Color.TRANSPARENT;
+ gradientDrawable.setColor(color);
+ assertEquals("Color was set to " + color, color,
+ gradientDrawable.getColor().getDefaultColor());
}
+ @SmallTest
+ public void testSetColors() {
+ GradientDrawable gradientDrawable = new GradientDrawable();
+ int[] colors;
+
+ colors = new int[] { Color.RED };
+ gradientDrawable.setColors(colors);
+ assertArrayEquals("Color was set to " + Arrays.toString(colors),
+ colors, gradientDrawable.getColors());
+
+ colors = null;
+ gradientDrawable.setColors(colors);
+ assertArrayEquals("Color was set to " + Arrays.toString(colors),
+ colors, gradientDrawable.getColors());
+ }
+
+ @SmallTest
+ public void testSetColorList() {
+ GradientDrawable gradientDrawable = new GradientDrawable();
+ ColorStateList color;
+
+ color = ColorStateList.valueOf(Color.RED);
+ gradientDrawable.setColor(color);
+ assertEquals("Color was set to RED", color, gradientDrawable.getColor());
+
+ color = null;
+ gradientDrawable.setColor(color);
+ assertEquals("Color was set to null (TRANSPARENT)", color, gradientDrawable.getColor());
+ }
+
+ @SmallTest
public void testGetChangingConfigurations() {
GradientDrawable gradientDrawable = new GradientDrawable();
assertEquals(0, gradientDrawable.getChangingConfigurations());
@@ -177,6 +343,7 @@
assertEquals(-20, gradientDrawable.getChangingConfigurations());
}
+ @SmallTest
public void testSetAlpha() {
GradientDrawable gradientDrawable = new GradientDrawable();
@@ -184,6 +351,7 @@
gradientDrawable.setAlpha(-1);
}
+ @SmallTest
public void testSetDither() {
GradientDrawable gradientDrawable = new GradientDrawable();
@@ -191,6 +359,7 @@
gradientDrawable.setDither(false);
}
+ @SmallTest
public void testSetColorFilter() {
GradientDrawable gradientDrawable = new GradientDrawable();
ColorFilter cf = new ColorFilter();
@@ -200,10 +369,7 @@
gradientDrawable.setColorFilter(null);
}
- public void testMethods() {
- // implementation details, do not test.
- }
-
+ @SmallTest
public void testInflate() throws XmlPullParserException, IOException {
GradientDrawable gradientDrawable = new GradientDrawable();
Rect rect = new Rect();
@@ -248,6 +414,7 @@
}
}
+ @SmallTest
public void testInflateGradientRadius() throws XmlPullParserException, IOException {
Rect parentBounds = new Rect(0, 0, 100, 100);
Resources resources = mContext.getResources();
@@ -268,6 +435,7 @@
assertEquals(50.0f, radius, 0.0f);
}
+ @SmallTest
public void testGetIntrinsicWidth() {
GradientDrawable gradientDrawable = new GradientDrawable();
gradientDrawable.setSize(6, 4);
@@ -277,6 +445,7 @@
assertEquals(-10, gradientDrawable.getIntrinsicWidth());
}
+ @SmallTest
public void testGetIntrinsicHeight() {
GradientDrawable gradientDrawable = new GradientDrawable();
gradientDrawable.setSize(5, 3);
@@ -286,11 +455,13 @@
assertEquals(-15, gradientDrawable.getIntrinsicHeight());
}
+ @SmallTest
public void testGetConstantState() {
GradientDrawable gradientDrawable = new GradientDrawable();
assertNotNull(gradientDrawable.getConstantState());
}
+ @SmallTest
public void testMutate() {
Resources resources = mContext.getResources();
GradientDrawable d1 = (GradientDrawable) resources.getDrawable(R.drawable.gradientdrawable);
@@ -323,6 +494,7 @@
assertEquals(40, d3.getIntrinsicWidth());
}
+ @MediumTest
public void testPreloadDensity() throws XmlPullParserException, IOException {
final Resources res = getContext().getResources();
final int densityDpi = res.getConfiguration().densityDpi;
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/LayerDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/LayerDrawableTest.java
index 37654dc..3c63515 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/LayerDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/LayerDrawableTest.java
@@ -16,7 +16,6 @@
package android.graphics.drawable.cts;
-import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import android.content.res.Resources;
@@ -444,7 +443,7 @@
assertEquals(superConfig | childConfig, layerDrawable.getChangingConfigurations());
}
- public void testGetPadding() {
+ public void testAccessPadding() {
Drawable[] array = new Drawable[] { new ShapeDrawable(), new ShapeDrawable() };
LayerDrawable layerDrawable = new LayerDrawable(array);
@@ -472,6 +471,27 @@
assertEquals(padding0.bottom + padding1.bottom, rc.bottom);
}
+ public void testAccessPaddingMode() {
+ Rect padding = new Rect();
+ Drawable dr0 = new IntrinsicSizeDrawable(20, 30, new Rect(1, 2, 3, 4));
+ Drawable dr1 = new IntrinsicSizeDrawable(30, 40, new Rect(9, 8, 7, 6));
+ LayerDrawable layerDrawable = new LayerDrawable(new Drawable[] { dr0, dr1 });
+
+ assertEquals("Default padding mode is NEST",
+ LayerDrawable.PADDING_MODE_NEST, layerDrawable.getPaddingMode());
+ assertEquals(34, layerDrawable.getIntrinsicWidth());
+ assertEquals(46, layerDrawable.getIntrinsicHeight());
+ assertTrue(layerDrawable.getPadding(padding));
+ assertEquals(new Rect(10, 10, 10, 10), padding);
+
+ layerDrawable.setPaddingMode(LayerDrawable.PADDING_MODE_STACK);
+ assertEquals(LayerDrawable.PADDING_MODE_STACK, layerDrawable.getPaddingMode());
+ assertEquals(30, layerDrawable.getIntrinsicWidth());
+ assertEquals(40, layerDrawable.getIntrinsicHeight());
+ assertTrue(layerDrawable.getPadding(padding));
+ assertEquals(new Rect(9, 8, 7, 6), padding);
+ }
+
@SuppressWarnings("deprecation")
public void testSetVisible() {
Drawable[] array = new Drawable[] { new BitmapDrawable(), new ColorDrawable(Color.BLUE) };
@@ -567,7 +587,7 @@
assertTrue(mockDrawable2.hasCalledColorFilter());
}
- public void testGetOpacity() {
+ public void testAccessOpacity() {
Drawable[] array = new Drawable[0];
LayerDrawable layerDrawable = new LayerDrawable(array);
assertEquals(PixelFormat.TRANSPARENT, layerDrawable.getOpacity());
@@ -591,6 +611,13 @@
mockDrawable1.setOpacity(PixelFormat.TRANSLUCENT);
mockDrawable2.setOpacity(PixelFormat.UNKNOWN);
assertEquals(PixelFormat.UNKNOWN, layerDrawable.getOpacity());
+
+ layerDrawable = new LayerDrawable(array);
+ layerDrawable.setOpacity(PixelFormat.OPAQUE);
+ mockDrawable1.setOpacity(PixelFormat.TRANSLUCENT);
+ mockDrawable2.setOpacity(PixelFormat.UNKNOWN);
+ assertEquals(PixelFormat.OPAQUE, layerDrawable.getOpacity());
+
}
@SuppressWarnings("deprecation")
@@ -1682,6 +1709,7 @@
final int initialWidth = preloadedDrawable.getIntrinsicWidth();
final int initialLeftPadding = preloadedDrawable.getLeftPadding();
final int initialRightPadding = preloadedDrawable.getRightPadding();
+ final int initialContentWidth = initialWidth - initialLeftPadding - initialRightPadding;
final int initialBottomPadding = preloadedDrawable.getBottomPadding();
final int initialTopPadding = preloadedDrawable.getTopPadding();
final int initialLayerInsetLeft = preloadedDrawable.getLayerInsetLeft(0);
@@ -1692,13 +1720,19 @@
final int initialLayerHeight = preloadedDrawable.getLayerHeight(0);
// Set density to half of original. Padding and insets are
- // truncated, dimensions are rounded to the nearest pixel.
+ // truncated, dimensions are rounded to the nearest pixel. Because
+ // LayerDrawable's intrinsic width is a combination of padding and
+ // dimensions, some computation is necessary.
DrawableTestUtils.setResourcesDensity(res, densityDpi / 2);
final LayerDrawable halfDrawable =
(LayerDrawable) preloadedConstantState.newDrawable(res);
- assertEquals(Math.round(initialWidth / 2f), halfDrawable.getIntrinsicWidth());
- assertEquals(initialLeftPadding / 2, halfDrawable.getLeftPadding());
- assertEquals(initialRightPadding / 2, halfDrawable.getRightPadding());
+ final int halfContentWidth = Math.round(initialContentWidth / 2f);
+ final int halfLeftPadding = initialLeftPadding / 2;
+ final int halfRightPadding = initialRightPadding / 2;
+ final int halfIntrinsicWidth = halfContentWidth + halfLeftPadding + halfRightPadding;
+ assertEquals(halfIntrinsicWidth, halfDrawable.getIntrinsicWidth());
+ assertEquals(halfLeftPadding, halfDrawable.getLeftPadding());
+ assertEquals(halfRightPadding, halfDrawable.getRightPadding());
assertEquals(initialBottomPadding / 2, halfDrawable.getBottomPadding());
assertEquals(initialTopPadding / 2, halfDrawable.getTopPadding());
assertEquals(initialLayerInsetLeft / 2,halfDrawable.getLayerInsetLeft(0));
@@ -1742,18 +1776,24 @@
// Ensure theme density is applied correctly.
final Theme t = res.newTheme();
+
+ // The half-density drawable will scale-up all of the values that were
+ // previously scaled-down, so we need to capture the rounding errors.
halfDrawable.applyTheme(t);
- assertEquals(initialWidth, halfDrawable.getIntrinsicWidth());
- assertEquals(initialLeftPadding, halfDrawable.getLeftPadding());
- assertEquals(initialRightPadding, halfDrawable.getRightPadding());
- assertEquals(initialBottomPadding, halfDrawable.getBottomPadding());
- assertEquals(initialTopPadding, halfDrawable.getTopPadding());
- assertEquals(initialLayerInsetLeft, halfDrawable.getLayerInsetLeft(0));
- assertEquals(initialLayerInsetRight, halfDrawable.getLayerInsetRight(0));
- assertEquals(initialLayerInsetTop, halfDrawable.getLayerInsetTop(0));
- assertEquals(initialLayerInsetBottom, halfDrawable.getLayerInsetBottom(0));
- assertEquals(initialLayerWidth, halfDrawable.getLayerWidth(0));
- assertEquals(initialLayerHeight, halfDrawable.getLayerHeight(0));
+ assertEquals(halfIntrinsicWidth * 2, halfDrawable.getIntrinsicWidth());
+ assertEquals(halfLeftPadding * 2, halfDrawable.getLeftPadding());
+ assertEquals(halfRightPadding * 2, halfDrawable.getRightPadding());
+ assertEquals(2 * (initialBottomPadding / 2), halfDrawable.getBottomPadding());
+ assertEquals(2 * (initialTopPadding / 2), halfDrawable.getTopPadding());
+ assertEquals(2 * (initialLayerInsetLeft / 2), halfDrawable.getLayerInsetLeft(0));
+ assertEquals(2 * (initialLayerInsetRight / 2), halfDrawable.getLayerInsetRight(0));
+ assertEquals(2 * (initialLayerInsetTop / 2), halfDrawable.getLayerInsetTop(0));
+ assertEquals(2 * (initialLayerInsetBottom / 2), halfDrawable.getLayerInsetBottom(0));
+ assertEquals(2 * Math.round(initialLayerWidth / 2f), halfDrawable.getLayerWidth(0));
+ assertEquals(2 * Math.round(initialLayerHeight / 2f), halfDrawable.getLayerHeight(0));
+
+ // The double-density drawable will scale-down all of the values that
+ // were previously scaled-up, so we don't need to worry about rounding.
doubleDrawable.applyTheme(t);
assertEquals(initialWidth, doubleDrawable.getIntrinsicWidth());
assertEquals(initialLeftPadding, doubleDrawable.getLeftPadding());
@@ -1767,4 +1807,49 @@
assertEquals(initialLayerWidth, doubleDrawable.getLayerWidth(0));
assertEquals(initialLayerHeight, doubleDrawable.getLayerHeight(0));
}
+
+ private static class IntrinsicSizeDrawable extends Drawable {
+ private final int mIntrinsicWidth;
+ private final int mIntrinsicHeight;
+ private final Rect mPadding;
+
+ public IntrinsicSizeDrawable(int intrinsicWidth, int intrinsicHeight, Rect padding) {
+ mIntrinsicWidth = intrinsicWidth;
+ mIntrinsicHeight = intrinsicHeight;
+ mPadding = new Rect(padding);
+ }
+
+ @Override
+ public boolean getPadding(Rect padding) {
+ padding.set(mPadding);
+ return true;
+ }
+
+ @Override
+ public int getIntrinsicHeight() {
+ return mIntrinsicHeight;
+ }
+
+ @Override
+ public int getIntrinsicWidth() {
+ return mIntrinsicWidth;
+ }
+
+ @Override
+ public void draw(Canvas canvas) {
+ }
+
+ @Override
+ public void setAlpha(int alpha) {
+ }
+
+ @Override
+ public void setColorFilter(ColorFilter colorFilter) {
+ }
+
+ @Override
+ public int getOpacity() {
+ return 0;
+ }
+ }
}
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableTest.java
index 4da4180..f174f01 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableTest.java
@@ -26,12 +26,15 @@
import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.Color;
+import android.graphics.PixelFormat;
import android.graphics.PorterDuff.Mode;
import android.graphics.PorterDuffColorFilter;
import android.graphics.cts.R;
import android.graphics.drawable.Drawable.ConstantState;
import android.graphics.drawable.VectorDrawable;
import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+import android.test.suitebuilder.annotation.SmallTest;
import android.util.AttributeSet;
import android.util.Log;
import android.util.Xml;
@@ -159,14 +162,17 @@
mResources = mContext.getResources();
}
+ @MediumTest
public void testSimpleVectorDrawables() throws XmlPullParserException, IOException {
verifyVectorDrawables(ICON_RES_IDS, GOLDEN_IMAGES, null);
}
+ @MediumTest
public void testVectorDrawableGradient() throws XmlPullParserException, IOException {
verifyVectorDrawables(GRADIENT_ICON_RES_IDS, GRADIENT_GOLDEN_IMAGES, null);
}
+ @MediumTest
public void testColorStateList() throws XmlPullParserException, IOException {
for (int i = 0; i < STATEFUL_STATE_SETS.length; i++) {
verifyVectorDrawables(
@@ -278,6 +284,7 @@
return builder.toString();
}
+ @SmallTest
public void testGetChangingConfigurations() {
VectorDrawable vectorDrawable = new VectorDrawable();
ConstantState constantState = vectorDrawable.getConstantState();
@@ -301,6 +308,7 @@
assertEquals(0xffff, vectorDrawable.getChangingConfigurations());
}
+ @SmallTest
public void testGetConstantState() {
VectorDrawable vectorDrawable = new VectorDrawable();
ConstantState constantState = vectorDrawable.getConstantState();
@@ -313,6 +321,7 @@
assertEquals(1, constantState.getChangingConfigurations());
}
+ @SmallTest
public void testMutate() {
Resources resources = mContext.getResources();
// d1 will be mutated, while d2 / d3 will not.
@@ -340,6 +349,7 @@
d2.setAlpha(originalAlpha);
}
+ @SmallTest
public void testColorFilter() {
PorterDuffColorFilter filter = new PorterDuffColorFilter(Color.RED, Mode.SRC_IN);
VectorDrawable vectorDrawable = new VectorDrawable();
@@ -348,6 +358,7 @@
assertEquals(filter, vectorDrawable.getColorFilter());
}
+ @SmallTest
public void testPreloadDensity() throws XmlPullParserException, IOException {
final Resources res = getContext().getResources();
final int densityDpi = res.getConfiguration().densityDpi;
@@ -358,6 +369,20 @@
}
}
+ @SmallTest
+ public void testGetOpacity () throws XmlPullParserException, IOException {
+ VectorDrawable vectorDrawable = new VectorDrawable();
+
+ assertEquals("Default alpha should be 255", 255, vectorDrawable.getAlpha());
+ assertEquals("Default opacity should be TRANSLUCENT", PixelFormat.TRANSLUCENT,
+ vectorDrawable.getOpacity());
+
+ vectorDrawable.setAlpha(0);
+ assertEquals("Alpha should be 0 now", 0, vectorDrawable.getAlpha());
+ assertEquals("Opacity should be TRANSPARENT now", PixelFormat.TRANSPARENT,
+ vectorDrawable.getOpacity());
+ }
+
private void testPreloadDensityInner(Resources res, int densityDpi)
throws XmlPullParserException, IOException {
// Capture initial state at default density.
diff --git a/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp b/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp
index acc3b98..cf3b7e7 100644
--- a/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp
+++ b/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp
@@ -146,7 +146,8 @@
// Check the error message
std::string err = dlerror();
- if (err != "dlopen failed: library \"" + path + "\" is not accessible for the namespace \"classloader-namespace\"") {
+ if (err.find("dlopen failed: library \"" + path + "\"") != 0 ||
+ err.find("is not accessible for the namespace \"classloader-namespace\"") == std::string::npos) {
*error_msg = "unexpected dlerror: " + err;
return false;
}
diff --git a/tests/tests/location/Android.mk b/tests/tests/location/Android.mk
index 55dbcab..842a92d 100644
--- a/tests/tests/location/Android.mk
+++ b/tests/tests/location/Android.mk
@@ -30,6 +30,6 @@
LOCAL_PACKAGE_NAME := CtsLocationTestCases
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := test_current
include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/location/src/android/location/cts/AddressTest.java b/tests/tests/location/src/android/location/cts/AddressTest.java
index 66e4fad..411a687 100644
--- a/tests/tests/location/src/android/location/cts/AddressTest.java
+++ b/tests/tests/location/src/android/location/cts/AddressTest.java
@@ -270,6 +270,39 @@
assertNull(address.getLocality());
}
+ public void testAccessPremises() {
+ Address address = new Address(Locale.PRC);
+
+ String premises = "Appartment";
+ address.setPremises(premises);
+ assertEquals(premises, address.getPremises());
+
+ address.setPremises(null);
+ assertNull(address.getPremises());
+ }
+
+ public void testAccessSubLocality() {
+ Address address = new Address(Locale.PRC);
+
+ String subLocality = "Sarchnar";
+ address.setSubLocality(subLocality);
+ assertEquals(subLocality, address.getSubLocality());
+
+ address.setSubLocality(null);
+ assertNull(address.getSubLocality());
+ }
+
+ public void testAccessSubThoroughfare() {
+ Address address = new Address(Locale.PRC);
+
+ String subThoroughfare = "1600";
+ address.setSubThoroughfare(subThoroughfare);
+ assertEquals(subThoroughfare, address.getSubThoroughfare());
+
+ address.setSubThoroughfare(null);
+ assertNull(address.getSubThoroughfare());
+ }
+
public void testWriteToParcel() {
Locale locale = Locale.KOREA;
Address address = new Address(locale);
diff --git a/tests/tests/location/src/android/location/cts/GeocoderTest.java b/tests/tests/location/src/android/location/cts/GeocoderTest.java
index a073284..d96b73f 100644
--- a/tests/tests/location/src/android/location/cts/GeocoderTest.java
+++ b/tests/tests/location/src/android/location/cts/GeocoderTest.java
@@ -41,6 +41,11 @@
}
}
+ public void testIsPresent() {
+ Geocoder geocoder = new Geocoder(getContext());
+ assertTrue(geocoder.isPresent());
+ }
+
public void testGetFromLocation() throws IOException, InterruptedException {
Geocoder geocoder = new Geocoder(getContext());
diff --git a/tests/tests/location/src/android/location/cts/GnssClockTest.java b/tests/tests/location/src/android/location/cts/GnssClockTest.java
new file mode 100644
index 0000000..e2ac503
--- /dev/null
+++ b/tests/tests/location/src/android/location/cts/GnssClockTest.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2016 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 android.location.cts;
+
+import android.location.GnssClock;
+import android.os.Parcel;
+import android.test.AndroidTestCase;
+
+public class GnssClockTest extends AndroidTestCase {
+ public void testDescribeContents() {
+ GnssClock clock = new GnssClock();
+ clock.describeContents();
+ }
+
+ public void testReset() {
+ GnssClock clock = new GnssClock();
+ clock.reset();
+ }
+
+ private static void setTestValues(GnssClock clock) {
+ clock.setBiasNanos(1.0);
+ clock.setBiasUncertaintyNanos(2.0);
+ clock.setDriftNanosPerSecond(3.0);
+ clock.setDriftUncertaintyNanosPerSecond(4.0);
+ clock.setFullBiasNanos(5);
+ clock.setHardwareClockDiscontinuityCount(6);
+ clock.setLeapSecond(7);
+ clock.setTimeNanos(8);
+ clock.setTimeUncertaintyNanos(9.0);
+ }
+
+ private static void verifyTestValues(GnssClock clock) {
+ assertEquals(1.0, clock.getBiasNanos());
+ assertEquals(2.0, clock.getBiasUncertaintyNanos());
+ assertEquals(3.0, clock.getDriftNanosPerSecond());
+ assertEquals(4.0, clock.getDriftUncertaintyNanosPerSecond());
+ assertEquals(5, clock.getFullBiasNanos());
+ assertEquals(6, clock.getHardwareClockDiscontinuityCount());
+ assertEquals(7, clock.getLeapSecond());
+ assertEquals(8, clock.getTimeNanos());
+ assertEquals(9.0, clock.getTimeUncertaintyNanos());
+ }
+
+ public void testWriteToParcel() {
+ GnssClock clock = new GnssClock();
+ setTestValues(clock);
+ Parcel parcel = Parcel.obtain();
+ clock.writeToParcel(parcel, 0);
+ parcel.setDataPosition(0);
+ GnssClock newClock = GnssClock.CREATOR.createFromParcel(parcel);
+ verifyTestValues(newClock);
+ }
+
+ public void testSet() {
+ GnssClock clock = new GnssClock();
+ setTestValues(clock);
+ GnssClock newClock = new GnssClock();
+ newClock.set(clock);
+ verifyTestValues(newClock);
+ }
+
+ public void testHasAndReset() {
+ GnssClock clock = new GnssClock();
+ setTestValues(clock);
+
+ assertTrue(clock.hasBiasNanos());
+ clock.resetBiasNanos();
+ assertFalse(clock.hasBiasNanos());
+
+ assertTrue(clock.hasBiasUncertaintyNanos());
+ clock.resetBiasUncertaintyNanos();
+ assertFalse(clock.hasBiasUncertaintyNanos());
+
+ assertTrue(clock.hasDriftNanosPerSecond());
+ clock.resetDriftNanosPerSecond();
+ assertFalse(clock.hasDriftNanosPerSecond());
+
+ assertTrue(clock.hasDriftUncertaintyNanosPerSecond());
+ clock.resetDriftUncertaintyNanosPerSecond();
+ assertFalse(clock.hasDriftUncertaintyNanosPerSecond());
+
+ assertTrue(clock.hasFullBiasNanos());
+ clock.resetFullBiasNanos();
+ assertFalse(clock.hasFullBiasNanos());
+
+ assertTrue(clock.hasLeapSecond());
+ clock.resetLeapSecond();
+ assertFalse(clock.hasLeapSecond());
+
+ assertTrue(clock.hasTimeUncertaintyNanos());
+ clock.resetTimeUncertaintyNanos();
+ assertFalse(clock.hasTimeUncertaintyNanos());
+ }
+}
diff --git a/tests/tests/location/src/android/location/cts/GnssMeasurementTest.java b/tests/tests/location/src/android/location/cts/GnssMeasurementTest.java
new file mode 100644
index 0000000..ce81402
--- /dev/null
+++ b/tests/tests/location/src/android/location/cts/GnssMeasurementTest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2016 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 android.location.cts;
+
+import android.location.GnssMeasurement;
+import android.location.GnssStatus;
+import android.os.Parcel;
+import android.test.AndroidTestCase;
+
+public class GnssMeasurementTest extends AndroidTestCase {
+ public void testDescribeContents() {
+ GnssMeasurement measurement = new GnssMeasurement();
+ measurement.describeContents();
+ }
+
+ public void testReset() {
+ GnssMeasurement measurement = new GnssMeasurement();
+ measurement.reset();
+ }
+
+ private static void setTestValues(GnssMeasurement measurement) {
+ measurement.setAccumulatedDeltaRangeMeters(1.0);
+ measurement.setAccumulatedDeltaRangeState(2);
+ measurement.setAccumulatedDeltaRangeUncertaintyMeters(3.0);
+ measurement.setCarrierCycles(4);
+ measurement.setCarrierFrequencyHz(5.0f);
+ measurement.setCarrierPhase(6.0);
+ measurement.setCarrierPhaseUncertainty(7.0);
+ measurement.setCn0DbHz(8.0);
+ measurement.setConstellationType(GnssStatus.CONSTELLATION_GALILEO);
+ measurement.setMultipathIndicator(GnssMeasurement.MULTIPATH_INDICATOR_DETECTED);
+ measurement.setPseudorangeRateMetersPerSecond(9.0);
+ measurement.setPseudorangeRateUncertaintyMetersPerSecond(10.0);
+ measurement.setReceivedSvTimeNanos(11);
+ measurement.setReceivedSvTimeUncertaintyNanos(12);
+ measurement.setSnrInDb(13.0);
+ measurement.setState(14);
+ measurement.setSvid(15);
+ measurement.setTimeOffsetNanos(16.0);
+ measurement.setPseudorangeRateCorrected(true);
+ }
+
+ private static void verifyTestValues(GnssMeasurement measurement) {
+ assertEquals(1.0, measurement.getAccumulatedDeltaRangeMeters());
+ assertEquals(2, measurement.getAccumulatedDeltaRangeState());
+ assertEquals(3.0, measurement.getAccumulatedDeltaRangeUncertaintyMeters());
+ assertEquals(4, measurement.getCarrierCycles());
+ assertEquals(5.0f, measurement.getCarrierFrequencyHz());
+ assertEquals(6.0, measurement.getCarrierPhase());
+ assertEquals(7.0, measurement.getCarrierPhaseUncertainty());
+ assertEquals(8.0, measurement.getCn0DbHz());
+ assertEquals(GnssStatus.CONSTELLATION_GALILEO, measurement.getConstellationType());
+ assertEquals(GnssMeasurement.MULTIPATH_INDICATOR_DETECTED,
+ measurement.getMultipathIndicator());
+ assertEquals(9.0, measurement.getPseudorangeRateMetersPerSecond());
+ assertEquals(10.0, measurement.getPseudorangeRateUncertaintyMetersPerSecond());
+ assertEquals(11, measurement.getReceivedSvTimeNanos());
+ assertEquals(12, measurement.getReceivedSvTimeUncertaintyNanos());
+ assertEquals(13.0, measurement.getSnrInDb());
+ assertEquals(14, measurement.getState());
+ assertEquals(15, measurement.getSvid());
+ assertEquals(16.0, measurement.getTimeOffsetNanos());
+ assertTrue(measurement.isPseudorangeRateCorrected());
+ }
+
+ public void testWriteToParcel() {
+ GnssMeasurement measurement = new GnssMeasurement();
+ setTestValues(measurement);
+ Parcel parcel = Parcel.obtain();
+ measurement.writeToParcel(parcel, 0);
+ parcel.setDataPosition(0);
+ GnssMeasurement newMeasurement = GnssMeasurement.CREATOR.createFromParcel(parcel);
+ verifyTestValues(newMeasurement);
+ }
+
+ public void testSet() {
+ GnssMeasurement measurement = new GnssMeasurement();
+ setTestValues(measurement);
+ GnssMeasurement newMeasurement = new GnssMeasurement();
+ newMeasurement.set(measurement);
+ verifyTestValues(newMeasurement);
+ }
+
+ public void testPseudorangeRateCorrected() {
+ GnssMeasurement measurement = new GnssMeasurement();
+ measurement.isPseudorangeRateCorrected();
+ }
+
+ public void testSetReset() {
+ GnssMeasurement measurement = new GnssMeasurement();
+ setTestValues(measurement);
+
+ assertTrue(measurement.hasCarrierCycles());
+ measurement.resetCarrierCycles();
+ assertFalse(measurement.hasCarrierCycles());
+
+ assertTrue(measurement.hasCarrierFrequencyHz());
+ measurement.resetCarrierFrequencyHz();
+ assertFalse(measurement.hasCarrierFrequencyHz());
+
+ assertTrue(measurement.hasCarrierPhase());
+ measurement.resetCarrierPhase();
+ assertFalse(measurement.hasCarrierPhase());
+
+ assertTrue(measurement.hasCarrierPhaseUncertainty());
+ measurement.resetCarrierPhaseUncertainty();
+ assertFalse(measurement.hasCarrierPhaseUncertainty());
+
+ assertTrue(measurement.hasSnrInDb());
+ measurement.resetSnrInDb();
+ assertFalse(measurement.hasSnrInDb());
+ }
+}
diff --git a/tests/tests/location/src/android/location/cts/GnssMeasurementsEventCallbackTest.java b/tests/tests/location/src/android/location/cts/GnssMeasurementsEventCallbackTest.java
new file mode 100644
index 0000000..930c344
--- /dev/null
+++ b/tests/tests/location/src/android/location/cts/GnssMeasurementsEventCallbackTest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2016 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 android.location.cts;
+
+import android.location.GnssMeasurementsEvent;
+import android.test.AndroidTestCase;
+
+public class GnssMeasurementsEventCallbackTest extends AndroidTestCase {
+ private static class MockCallback extends GnssMeasurementsEvent.Callback {
+ }
+
+ public void testAllMethodsExist() {
+ GnssMeasurementsEvent.Callback callback = new MockCallback();
+ GnssMeasurementsEvent event = new GnssMeasurementsEvent(null, null);
+ callback.onGnssMeasurementsReceived(event);
+ callback.onStatusChanged(GnssMeasurementsEvent.STATUS_READY);
+ }
+}
diff --git a/tests/tests/location/src/android/location/cts/GnssMeasurementsEventTest.java b/tests/tests/location/src/android/location/cts/GnssMeasurementsEventTest.java
new file mode 100644
index 0000000..33cf924
--- /dev/null
+++ b/tests/tests/location/src/android/location/cts/GnssMeasurementsEventTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2016 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 android.location.cts;
+
+import android.location.GnssClock;
+import android.location.GnssMeasurement;
+import android.location.GnssMeasurementsEvent;
+import android.location.GnssStatus;
+import android.os.Parcel;
+import android.test.AndroidTestCase;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+public class GnssMeasurementsEventTest extends AndroidTestCase {
+ public void testDescribeContents() {
+ GnssMeasurementsEvent event = new GnssMeasurementsEvent(null, null);
+ event.describeContents();
+ }
+
+ public void testWriteToParcel() {
+ GnssClock clock = new GnssClock();
+ clock.setLeapSecond(100);
+ GnssMeasurement m1 = new GnssMeasurement();
+ m1.setConstellationType(GnssStatus.CONSTELLATION_GLONASS);
+ GnssMeasurement m2 = new GnssMeasurement();
+ m2.setReceivedSvTimeNanos(43999);
+ GnssMeasurementsEvent event = new GnssMeasurementsEvent(
+ clock, new GnssMeasurement[] {m1, m2});
+ Parcel parcel = Parcel.obtain();
+ event.writeToParcel(parcel, 0);
+ parcel.setDataPosition(0);
+ GnssMeasurementsEvent newEvent = GnssMeasurementsEvent.CREATOR.createFromParcel(parcel);
+ assertEquals(100, newEvent.getClock().getLeapSecond());
+ Collection<GnssMeasurement> measurements = newEvent.getMeasurements();
+ assertEquals(2, measurements.size());
+ Iterator<GnssMeasurement> iterator = measurements.iterator();
+ GnssMeasurement newM1 = iterator.next();
+ assertEquals(GnssStatus.CONSTELLATION_GLONASS, newM1.getConstellationType());
+ GnssMeasurement newM2 = iterator.next();
+ assertEquals(43999, newM2.getReceivedSvTimeNanos());
+ }
+}
diff --git a/tests/tests/location/src/android/location/cts/GnssNavigationMessageEventCallbackTest.java b/tests/tests/location/src/android/location/cts/GnssNavigationMessageEventCallbackTest.java
new file mode 100644
index 0000000..a548122
--- /dev/null
+++ b/tests/tests/location/src/android/location/cts/GnssNavigationMessageEventCallbackTest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2016 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 android.location.cts;
+
+import android.location.GnssNavigationMessageEvent;
+import android.test.AndroidTestCase;
+
+public class GnssNavigationMessageEventCallbackTest extends AndroidTestCase {
+ private static class MockCallback extends GnssNavigationMessageEvent.Callback {
+ }
+
+ public void testAllMethodsExist() {
+ GnssNavigationMessageEvent.Callback callback = new MockCallback();
+ GnssNavigationMessageEvent event = new GnssNavigationMessageEvent(null);
+ callback.onGnssNavigationMessageReceived(event);
+ callback.onStatusChanged(GnssNavigationMessageEvent.STATUS_READY);
+ }
+}
diff --git a/tests/tests/location/src/android/location/cts/GnssNavigationMessageEventTest.java b/tests/tests/location/src/android/location/cts/GnssNavigationMessageEventTest.java
new file mode 100644
index 0000000..730bd525
--- /dev/null
+++ b/tests/tests/location/src/android/location/cts/GnssNavigationMessageEventTest.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2016 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 android.location.cts;
+
+import android.location.GnssNavigationMessage;
+import android.location.GnssNavigationMessageEvent;
+import android.os.Parcel;
+import android.test.AndroidTestCase;
+
+public class GnssNavigationMessageEventTest extends AndroidTestCase {
+ public void testDescribeContents() {
+ GnssNavigationMessageEvent event = new GnssNavigationMessageEvent(null);
+ event.describeContents();
+ }
+
+ public void testWriteToParcel() {
+ GnssNavigationMessage message = new GnssNavigationMessage();
+ message.setMessageId(2);
+ GnssNavigationMessageEvent event = new GnssNavigationMessageEvent(message);
+ Parcel parcel = Parcel.obtain();
+ event.writeToParcel(parcel, 0);
+ parcel.setDataPosition(0);
+ GnssNavigationMessageEvent newEvent =
+ GnssNavigationMessageEvent.CREATOR.createFromParcel(parcel);
+ assertEquals(2, newEvent.getNavigationMessage().getMessageId());
+ }
+}
diff --git a/tests/tests/location/src/android/location/cts/GnssNavigationMessageTest.java b/tests/tests/location/src/android/location/cts/GnssNavigationMessageTest.java
index 4ac64f4..87814c5 100644
--- a/tests/tests/location/src/android/location/cts/GnssNavigationMessageTest.java
+++ b/tests/tests/location/src/android/location/cts/GnssNavigationMessageTest.java
@@ -19,6 +19,7 @@
import android.location.GnssNavigationMessage;
import android.location.GnssNavigationMessageEvent;
import android.test.AndroidTestCase;
+import android.os.Parcel;
import android.util.Log;
import java.util.List;
@@ -88,4 +89,55 @@
// Verify mandatory GnssNavigationMessage field values.
TestMeasurementUtil.verifyGnssNavMessageMandatoryField(events);
}
+
+ private static void setTestValues(GnssNavigationMessage message) {
+ message.setData(new byte[] {1, 2, 3, 4});
+ message.setMessageId(5);
+ message.setStatus(GnssNavigationMessage.PARCELABLE_WRITE_RETURN_VALUE);
+ message.setSubmessageId(6);
+ message.setSvid(7);
+ message.setType(GnssNavigationMessage.TYPE_GPS_L2CNAV);
+ }
+
+ private static void verifyTestValues(GnssNavigationMessage message) {
+ byte[] data = message.getData();
+ assertEquals(1, data[0]);
+ assertEquals(2, data[1]);
+ assertEquals(3, data[2]);
+ assertEquals(4, data[3]);
+ assertEquals(5, message.getMessageId());
+ assertEquals(GnssNavigationMessage.PARCELABLE_WRITE_RETURN_VALUE, message.getStatus());
+ assertEquals(6, message.getSubmessageId());
+ assertEquals(7, message.getSvid());
+ assertEquals(GnssNavigationMessage.TYPE_GPS_L2CNAV, message.getType());
+ }
+
+ public void testDescribeContents() {
+ GnssNavigationMessage message = new GnssNavigationMessage();
+ message.describeContents();
+ }
+
+ public void testWriteToParcel() {
+ GnssNavigationMessage message = new GnssNavigationMessage();
+ setTestValues(message);
+ Parcel parcel = Parcel.obtain();
+ message.writeToParcel(parcel, 0);
+ parcel.setDataPosition(0);
+ GnssNavigationMessage newMessage =
+ GnssNavigationMessage.CREATOR.createFromParcel(parcel);
+ verifyTestValues(newMessage);
+ }
+
+ public void testReset() {
+ GnssNavigationMessage message = new GnssNavigationMessage();
+ message.reset();
+ }
+
+ public void testSet() {
+ GnssNavigationMessage message = new GnssNavigationMessage();
+ setTestValues(message);
+ GnssNavigationMessage newMessage = new GnssNavigationMessage();
+ newMessage.set(message);
+ verifyTestValues(newMessage);
+ }
}
diff --git a/tests/tests/location/src/android/location/cts/GnssStatusCallbackTest.java b/tests/tests/location/src/android/location/cts/GnssStatusCallbackTest.java
new file mode 100644
index 0000000..d69fc01
--- /dev/null
+++ b/tests/tests/location/src/android/location/cts/GnssStatusCallbackTest.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2016 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 android.location.cts;
+
+import android.location.GnssStatusCallback;
+import android.test.AndroidTestCase;
+
+public class GnssStatusCallbackTest extends AndroidTestCase {
+ private static class MockCallback extends GnssStatusCallback {
+ }
+
+ public void testAllMethodsExist() {
+ GnssStatusCallback callback = new MockCallback();
+ callback.onStarted();
+ callback.onFirstFix(10);
+ callback.onSatelliteStatusChanged(null);
+ callback.onStopped();
+ }
+}
diff --git a/tests/tests/location/src/android/location/cts/LocationManagerTest.java b/tests/tests/location/src/android/location/cts/LocationManagerTest.java
index d9a871d..85de83d 100644
--- a/tests/tests/location/src/android/location/cts/LocationManagerTest.java
+++ b/tests/tests/location/src/android/location/cts/LocationManagerTest.java
@@ -24,6 +24,9 @@
import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.location.Criteria;
+import android.location.GnssNmeaListener;
+import android.location.GnssStatus;
+import android.location.GnssStatusCallback;
import android.location.GpsStatus;
import android.location.GpsStatus.Listener;
import android.location.GpsStatus.NmeaListener;
@@ -32,6 +35,7 @@
import android.location.LocationManager;
import android.location.LocationProvider;
import android.os.Bundle;
+import android.os.Handler;
import android.os.HandlerThread;
import android.os.Looper;
import android.os.SystemClock;
@@ -562,6 +566,8 @@
updateLocation(latitude3, longitude3);
assertFalse(listener.hasCalledOnLocationChanged(TEST_TIME_OUT));
+ mManager.requestSingleUpdate(LocationManager.GPS_PROVIDER, mPendingIntent);
+
try {
mManager.requestSingleUpdate(LocationManager.GPS_PROVIDER, (LocationListener) null,
Looper.myLooper());
@@ -899,6 +905,18 @@
mManager.addNmeaListener((NmeaListener) null);
mManager.removeNmeaListener((NmeaListener) null);
+
+ MockGnssNmeaListener gnssListener = new MockGnssNmeaListener();
+ mManager.addNmeaListener(gnssListener);
+ mManager.removeNmeaListener(gnssListener);
+
+ HandlerThread handlerThread = new HandlerThread("testNmeaListener");
+ handlerThread.start();
+ mManager.addNmeaListener(gnssListener, new Handler(handlerThread.getLooper()));
+ mManager.removeNmeaListener(gnssListener);
+
+ mManager.addNmeaListener((GnssNmeaListener) null);
+ mManager.removeNmeaListener((GnssNmeaListener) null);
}
public void testIsProviderEnabled() {
@@ -987,6 +1005,22 @@
assertSame(status, mManager.getGpsStatus(status));
}
+ @UiThreadTest
+ public void testGnssStatusListener() {
+ MockGnssStatusCallback callback = new MockGnssStatusCallback();
+ mManager.registerGnssStatusCallback(callback);
+ mManager.unregisterGnssStatusCallback(callback);
+
+ mManager.registerGnssStatusCallback(null);
+ mManager.unregisterGnssStatusCallback(null);
+
+ HandlerThread handlerThread = new HandlerThread("testStatusUpdates");
+ handlerThread.start();
+
+ mManager.registerGnssStatusCallback(callback, new Handler(handlerThread.getLooper()));
+ mManager.unregisterGnssStatusCallback(callback);
+ }
+
public void testSendExtraCommand() {
// this test assumes TEST_MOCK_PROVIDER_NAME was created in setUp.
assertNotNull(mManager.getProvider(TEST_MOCK_PROVIDER_NAME));
@@ -1390,6 +1424,23 @@
}
}
+ private static class MockGnssNmeaListener implements GnssNmeaListener {
+ private boolean mIsNmeaReceived;
+
+ @Override
+ public void onNmeaReceived(long timestamp, String nmea) {
+ mIsNmeaReceived = true;
+ }
+
+ public boolean isNmeaRecevied() {
+ return mIsNmeaReceived;
+ }
+
+ public void reset() {
+ mIsNmeaReceived = false;
+ }
+ }
+
private static class MockGpsStatusListener implements Listener {
private boolean mHasCallOnGpsStatusChanged;
@@ -1405,4 +1456,20 @@
mHasCallOnGpsStatusChanged = true;
}
}
+
+ private static class MockGnssStatusCallback extends GnssStatusCallback {
+ @Override
+ public void onSatelliteStatusChanged(GnssStatus status) {
+ for (int i = 0; i < status.getNumSatellites(); ++i) {
+ status.getAzimuthDegrees(i);
+ status.getCn0DbHz(i);
+ status.getConstellationType(i);
+ status.getElevationDegrees(i);
+ status.getSvid(i);
+ status.hasAlmanac(i);
+ status.hasEphemeris(i);
+ status.usedInFix(i);
+ }
+ }
+ }
}
diff --git a/tests/tests/location/src/android/location/cts/LocationTest.java b/tests/tests/location/src/android/location/cts/LocationTest.java
index db2820c..18faaee 100644
--- a/tests/tests/location/src/android/location/cts/LocationTest.java
+++ b/tests/tests/location/src/android/location/cts/LocationTest.java
@@ -377,6 +377,19 @@
assertEquals(12000, location.getTime());
}
+ public void testAccessElapsedRealtime() {
+ Location location = new Location("");
+
+ location.setElapsedRealtimeNanos(0);
+ assertEquals(0, location.getElapsedRealtimeNanos());
+
+ location.setElapsedRealtimeNanos(Long.MAX_VALUE);
+ assertEquals(Long.MAX_VALUE, location.getElapsedRealtimeNanos());
+
+ location.setElapsedRealtimeNanos(12000);
+ assertEquals(12000, location.getElapsedRealtimeNanos());
+ }
+
public void testSet() {
Location location = new Location("");
@@ -453,6 +466,8 @@
// enabled == true case
service.setEnabled(true);
+ assertTrue(service.onGetEnabled());
+ assertEquals("Summary", service.onGetSummary());
resultHandler.expectEnabled(true);
resultHandler.expectMessage(true);
ret = service.callOnStartCommand(intent, SettingInjectorService.START_NOT_STICKY, 0);
@@ -563,7 +578,7 @@
@Override
// Deprecated API
protected String onGetSummary() {
- return "";
+ return "Summary";
}
@Override
@@ -575,7 +590,7 @@
mEnabled = enabled;
}
- // API coverage dashboard will not cound method call from derived class.
+ // API coverage dashboard will not count method call from derived class.
// Thus, it is necessary to make explicit call to SettingInjectorService public methods.
public IBinder callOnBind(Intent intent) {
return super.onBind(intent);
diff --git a/tests/tests/location/src/android/location/cts/TestGnssStatusCallback.java b/tests/tests/location/src/android/location/cts/TestGnssStatusCallback.java
new file mode 100644
index 0000000..076e4cd
--- /dev/null
+++ b/tests/tests/location/src/android/location/cts/TestGnssStatusCallback.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2016 Google Inc.
+ *
+ * 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 android.location.cts;
+
+import android.location.GnssStatus;
+import android.location.GnssStatusCallback;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Used for receiving notifications when GNSS status has changed.
+ */
+class TestGnssStatusCallback extends GnssStatusCallback {
+
+ private volatile boolean mGpsStatusReceived;
+ private GnssStatus mGnssStatus = null;
+ // Timeout in sec for count down latch wait
+ private static final int TIMEOUT_IN_SEC = 90;
+ private final CountDownLatch mCountDownLatch;
+ // Store list of Prn for Satellites.
+ private List<List<Integer>> mGpsSatellitePrns;
+
+ TestGnssStatusCallback(int gpsStatusCountToCollect) {
+ mCountDownLatch = new CountDownLatch(gpsStatusCountToCollect);
+ mGpsSatellitePrns = new ArrayList<List<Integer>>();
+ }
+
+ @Override
+ public void onStarted() {
+ }
+
+ @Override
+ public void onStopped() {
+ }
+
+ @Override
+ public void onFirstFix(int ttffMillis) {
+ }
+
+ @Override
+ public void onSatelliteStatusChanged(GnssStatus status) {
+ mCountDownLatch.countDown();
+ }
+
+ /**
+ * Returns the list of PRNs (pseudo-random number) for the satellite.
+ *
+ * @return list of PRNs number
+ */
+ public List<List<Integer>> getGpsSatellitePrns() {
+ return mGpsSatellitePrns;
+ }
+
+ /**
+ * Check if GPS Status is received.
+ *
+ * @return {@code true} if the GPS Status is received and {@code false}
+ * if GPS Status is not received.
+ */
+ public boolean isGpsStatusReceived() {
+ return mGpsStatusReceived;
+ }
+
+ /**
+ * Get GPS Status.
+ *
+ * @return mGpsStatus GPS Status
+ */
+ public GnssStatus getGnssStatus() {
+ return mGnssStatus;
+ }
+
+ /**
+ * See {@link java.util.concurrent.CountDownLatch#await()}.
+ */
+ public boolean await() throws InterruptedException {
+ return mCountDownLatch.await(TIMEOUT_IN_SEC, TimeUnit.SECONDS);
+ }
+}
diff --git a/tests/tests/location/src/android/location/cts/TestLocationManager.java b/tests/tests/location/src/android/location/cts/TestLocationManager.java
index 05f4eba..3ab48dd 100644
--- a/tests/tests/location/src/android/location/cts/TestLocationManager.java
+++ b/tests/tests/location/src/android/location/cts/TestLocationManager.java
@@ -29,7 +29,7 @@
import junit.framework.Assert;
/**
- * A {@code LocationManager} wrapper that logs GPS turn-on and turn-off.
+ * A {@code LocationManager} wrapper that logs GNSS turn-on and turn-off.
*/
public class TestLocationManager {
@@ -58,7 +58,7 @@
* @param callback the listener to add
*/
public void registerGnssMeasurementCallback(GnssMeasurementsEvent.Callback callback) {
- Log.i(TAG, "Add Gps Measurement Callback.");
+ Log.i(TAG, "Add Gnss Measurement Callback.");
boolean measurementListenerAdded =
mLocationManager.registerGnssMeasurementsCallback(callback);
if (!measurementListenerAdded) {
@@ -69,13 +69,31 @@
}
/**
+ * See {@link android.location.LocationManager#registerGnssMeasurementsCallback(GnssMeasurementsEvent.Callback callback)}
+ *
+ * @param callback the listener to add
+ * @param handler the handler that the callback runs at.
+ */
+ public void registerGnssMeasurementCallback(GnssMeasurementsEvent.Callback callback,
+ Handler handler) {
+ Log.i(TAG, "Add Gnss Measurement Callback.");
+ boolean measurementListenerAdded =
+ mLocationManager.registerGnssMeasurementsCallback(callback, handler);
+ if (!measurementListenerAdded) {
+ // Registration of GnssMeasurements listener has failed, this indicates a platform bug.
+ Log.i(TAG, TestMeasurementUtil.REGISTRATION_ERROR_MESSAGE);
+ Assert.fail(TestMeasurementUtil.REGISTRATION_ERROR_MESSAGE);
+ }
+ }
+
+ /**
* See {@link android.location.LocationManager#unregisterGnssMeasurementsCallback
* (GnssMeasurementsEvent.Callback)}.
*
* @param callback the listener to remove
*/
public void unregisterGnssMeasurementCallback(GnssMeasurementsEvent.Callback callback) {
- Log.i(TAG, "Remove Gps Measurement Callback.");
+ Log.i(TAG, "Remove Gnss Measurement Callback.");
mLocationManager.unregisterGnssMeasurementsCallback(callback);
}
@@ -97,7 +115,6 @@
/**
* See {@link android.location.LocationManager#addGpsStatusListener (GpsStatus.Listener)}.
- *
* @param listener the GpsStatus.Listener to add
*/
public void addGpsStatusListener(final GpsStatus.Listener listener) {
@@ -139,23 +156,37 @@
}
/**
- * Add a GPS Navigation Message callback.
+ * Add a GNSS Navigation Message callback.
*
* @param callback a {@link GnssNavigationMessageEvent.Callback} object to register.
* @return {@code true} if the listener was added successfully, {@code false} otherwise.
*/
- public boolean registerGnssNavigationMessageCallback(GnssNavigationMessageEvent.Callback callback) {
- Log.i(TAG, "Add Gps Navigation Message Callback.");
+ public boolean registerGnssNavigationMessageCallback(
+ GnssNavigationMessageEvent.Callback callback) {
+ Log.i(TAG, "Add Gnss Navigation Message Callback.");
return mLocationManager.registerGnssNavigationMessageCallback(callback);
}
/**
- * Removes a GPS Navigation Message callback.
+ * Add a GNSS Navigation Message callback.
+ *
+ * @param callback a {@link GnssNavigationMessageEvent.Callback} object to register.
+ * @param handler the handler that the callback runs at.
+ * @return {@code true} if the listener was added successfully, {@code false} otherwise.
+ */
+ public boolean registerGnssNavigationMessageCallback(
+ GnssNavigationMessageEvent.Callback callback, Handler handler) {
+ Log.i(TAG, "Add Gnss Navigation Message Callback.");
+ return mLocationManager.registerGnssNavigationMessageCallback(callback, handler);
+ }
+
+ /**
+ * Removes a GNSS Navigation Message callback.
*
* @param callback a {@link GnssNavigationMessageEvent.Callback} object to remove.
*/
public void unregisterGnssNavigationMessageCallback(GnssNavigationMessageEvent.Callback callback) {
- Log.i(TAG, "Remove Gps Navigation Message Callback.");
+ Log.i(TAG, "Remove Gnss Navigation Message Callback.");
mLocationManager.unregisterGnssNavigationMessageCallback(callback);
}
diff --git a/tests/tests/media/src/android/media/cts/AudioAttributesTest.java b/tests/tests/media/src/android/media/cts/AudioAttributesTest.java
index 3e42b7e..99ab1ab 100644
--- a/tests/tests/media/src/android/media/cts/AudioAttributesTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioAttributesTest.java
@@ -34,8 +34,8 @@
public void testParcelableDescribeContents() throws Exception {
final AudioAttributes aa = new AudioAttributes.Builder()
.setUsage(AudioAttributes.USAGE_MEDIA).build();
- final int c = aa.describeContents();
assertNotNull("Failure to create the AudioAttributes", aa);
+ assertEquals(0, aa.describeContents());
}
// Test case 2: create an instance, marshall it and create a new instance,
diff --git a/tests/tests/media/src/android/media/cts/AudioFormatTest.java b/tests/tests/media/src/android/media/cts/AudioFormatTest.java
index 3c6a312..100e3b4 100644
--- a/tests/tests/media/src/android/media/cts/AudioFormatTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioFormatTest.java
@@ -18,6 +18,7 @@
import android.cts.util.CtsAndroidTestCase;
import android.media.AudioFormat;
+import android.os.Parcel;
public class AudioFormatTest extends CtsAndroidTestCase {
@@ -138,4 +139,33 @@
assertEquals("New AudioFormat doesn't report expected channel mask",
AudioFormat.CHANNEL_INVALID, copiedFormat.getChannelMask());
}
+
+ // Test case 6: create an instance, marshall it and create a new instance,
+ // check for equality
+ public void testParcel() throws Exception {
+ final int TEST_ENCODING = AudioFormat.ENCODING_PCM_16BIT;
+ final int TEST_SR = 48000;
+ final int TEST_CONF_POS = AudioFormat.CHANNEL_OUT_5POINT1;
+ // 6ch, like in 5.1 above offset by a randomly chosen number
+ final int TEST_CONF_IDX = 0x3F << 3;
+
+ final AudioFormat formatToMarshall = new AudioFormat.Builder()
+ .setEncoding(TEST_ENCODING).setSampleRate(TEST_SR)
+ .setChannelMask(TEST_CONF_POS).setChannelIndexMask(TEST_CONF_IDX).build();
+ assertNotNull("Failure to create the AudioFormat to marshall", formatToMarshall);
+ assertEquals(0, formatToMarshall.describeContents());
+
+ final Parcel srcParcel = Parcel.obtain();
+ final Parcel dstParcel = Parcel.obtain();
+
+ formatToMarshall.writeToParcel(srcParcel, 0 /*no public flags for marshalling*/);
+ final byte[] mbytes = srcParcel.marshall();
+ dstParcel.unmarshall(mbytes, 0, mbytes.length);
+ dstParcel.setDataPosition(0);
+ final AudioFormat unmarshalledFormat = AudioFormat.CREATOR.createFromParcel(dstParcel);
+
+ assertNotNull("Failure to unmarshall AudioFormat", unmarshalledFormat);
+ assertEquals("Source and destination AudioFormat not equal",
+ formatToMarshall, unmarshalledFormat);
+ }
}
diff --git a/tests/tests/media/src/android/media/cts/AudioRecordingConfigurationTest.java b/tests/tests/media/src/android/media/cts/AudioRecordingConfigurationTest.java
index 28d873c..3585c96 100644
--- a/tests/tests/media/src/android/media/cts/AudioRecordingConfigurationTest.java
+++ b/tests/tests/media/src/android/media/cts/AudioRecordingConfigurationTest.java
@@ -25,6 +25,7 @@
import android.media.AudioRecordingConfiguration;
import android.media.MediaRecorder;
import android.os.Looper;
+import android.os.Parcel;
import android.util.Log;
public class AudioRecordingConfigurationTest extends CtsAndroidTestCase {
@@ -157,6 +158,41 @@
mAudioRecord.startRecording();
Thread.sleep(TEST_TIMING_TOLERANCE_MS);
assertFalse("Unregistered callback was called", callback.mCalled);
+
+ // just call the callback once directly so it's marked as tested
+ callback.onRecordConfigChanged(new AudioRecordingConfiguration[0]);
+ }
+
+ public void testParcel() throws Exception {
+ if (!hasMicrophone()) {
+ return;
+ }
+ AudioManager am = new AudioManager(getContext());
+ assertNotNull("Could not create AudioManager", am);
+
+ assertEquals(AudioRecord.STATE_INITIALIZED, mAudioRecord.getState());
+ mAudioRecord.startRecording();
+ assertEquals(AudioRecord.RECORDSTATE_RECORDING, mAudioRecord.getRecordingState());
+ Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+
+ AudioRecordingConfiguration[] configs = am.getActiveRecordingConfigurations();
+ assertTrue("Empty array of record configs during recording", configs.length > 0);
+ assertEquals(0, configs[0].describeContents());
+
+ // marshall a AudioRecordingConfiguration and compare to unmarshalled
+ final Parcel srcParcel = Parcel.obtain();
+ final Parcel dstParcel = Parcel.obtain();
+
+ configs[0].writeToParcel(srcParcel, 0 /*no public flags for marshalling*/);
+ final byte[] mbytes = srcParcel.marshall();
+ dstParcel.unmarshall(mbytes, 0, mbytes.length);
+ dstParcel.setDataPosition(0);
+ final AudioRecordingConfiguration unmarshalledConf =
+ AudioRecordingConfiguration.CREATOR.createFromParcel(dstParcel);
+
+ assertNotNull("Failure to unmarshall AudioRecordingConfiguration", unmarshalledConf);
+ assertEquals("Source and destination AudioRecordingConfiguration not equal",
+ configs[0], unmarshalledConf);
}
class MyAudioRecordingCallback extends AudioManager.AudioRecordingCallback {
diff --git a/tests/tests/media/src/android/media/cts/MediaBrowserTest.java b/tests/tests/media/src/android/media/cts/MediaBrowserTest.java
index 9bf0ec4..399a4e6 100644
--- a/tests/tests/media/src/android/media/cts/MediaBrowserTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaBrowserTest.java
@@ -118,21 +118,6 @@
}
}
- public void testSubscribeInvalidItem() {
- resetCallbacks();
- createMediaBrowser(TEST_BROWSER_SERVICE);
- connectMediaBrowserService();
- mMediaBrowser.subscribe(StubMediaBrowserService.MEDIA_ID_INVALID, mSubscriptionCallback);
- new PollingCheck(TIME_OUT_MS) {
- @Override
- protected boolean check() {
- return mSubscriptionCallback.mLastErrorId != null;
- }
- }.run();
-
- assertEquals(StubMediaBrowserService.MEDIA_ID_INVALID, mSubscriptionCallback.mLastErrorId);
- }
-
public void testSubscribeWithOptions() {
createMediaBrowser(TEST_BROWSER_SERVICE);
connectMediaBrowserService();
@@ -168,6 +153,46 @@
}
}
+ public void testSubscribeInvalidItem() {
+ resetCallbacks();
+ createMediaBrowser(TEST_BROWSER_SERVICE);
+ connectMediaBrowserService();
+ mMediaBrowser.subscribe(StubMediaBrowserService.MEDIA_ID_INVALID, mSubscriptionCallback);
+ new PollingCheck(TIME_OUT_MS) {
+ @Override
+ protected boolean check() {
+ return mSubscriptionCallback.mLastErrorId != null;
+ }
+ }.run();
+
+ assertEquals(StubMediaBrowserService.MEDIA_ID_INVALID, mSubscriptionCallback.mLastErrorId);
+ }
+
+ public void testSubscribeInvalidItemWithOptions() {
+ resetCallbacks();
+ createMediaBrowser(TEST_BROWSER_SERVICE);
+ connectMediaBrowserService();
+
+ final int pageSize = 5;
+ final int page = 2;
+ Bundle options = new Bundle();
+ options.putInt(MediaBrowser.EXTRA_PAGE_SIZE, pageSize);
+ options.putInt(MediaBrowser.EXTRA_PAGE, page);
+ mMediaBrowser.subscribe(StubMediaBrowserService.MEDIA_ID_INVALID, options,
+ mSubscriptionCallback);
+ new PollingCheck(TIME_OUT_MS) {
+ @Override
+ protected boolean check() {
+ return mSubscriptionCallback.mLastErrorId != null;
+ }
+ }.run();
+
+ assertEquals(StubMediaBrowserService.MEDIA_ID_INVALID, mSubscriptionCallback.mLastErrorId);
+ assertEquals(page, mSubscriptionCallback.mLastOptions.getInt(MediaBrowser.EXTRA_PAGE));
+ assertEquals(pageSize,
+ mSubscriptionCallback.mLastOptions.getInt(MediaBrowser.EXTRA_PAGE_SIZE));
+ }
+
public void testGetItem() {
resetCallbacks();
createMediaBrowser(TEST_BROWSER_SERVICE);
@@ -289,7 +314,13 @@
public void onError(String id) {
mLastErrorId = id;
}
- }
+
+ @Override
+ public void onError(String id, Bundle options) {
+ mLastErrorId = id;
+ mLastOptions = options;
+ }
+}
private static class StubItemCallback extends MediaBrowser.ItemCallback {
private volatile MediaBrowser.MediaItem mLastMediaItem;
diff --git a/tests/tests/os/src/android/os/health/cts/HealthStatsTest.java b/tests/tests/os/src/android/os/health/cts/HealthStatsTest.java
new file mode 100644
index 0000000..22abe51
--- /dev/null
+++ b/tests/tests/os/src/android/os/health/cts/HealthStatsTest.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright (C) 2016 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 android.os.health.cts;
+
+import android.os.Parcel;
+import android.os.health.HealthKeys;
+import android.os.health.HealthStats;
+import android.os.health.HealthStatsParceler;
+import android.os.health.HealthStatsWriter;
+import android.os.health.TimerStat;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import java.util.Map;
+
+/**
+ * Provides test cases for android.os.health.HealthStats and HealthStatsWriter.
+ */
+public class HealthStatsTest extends TestCase {
+ @HealthKeys.Constant(type=HealthKeys.TYPE_TIMER)
+ public static final int TIMER_0 = 10;
+
+ @HealthKeys.Constant(type=HealthKeys.TYPE_TIMER)
+ public static final int TIMER_1 = 11;
+
+ @HealthKeys.Constant(type=HealthKeys.TYPE_MEASUREMENT)
+ public static final int MEASUREMENT_0 = 20;
+
+ @HealthKeys.Constant(type=HealthKeys.TYPE_MEASUREMENT)
+ public static final int MEASUREMENT_1 = 21;
+
+ @HealthKeys.Constant(type=HealthKeys.TYPE_MEASUREMENT)
+ public static final int MEASUREMENT_2 = 21;
+
+ @HealthKeys.Constant(type=HealthKeys.TYPE_STATS)
+ public static final int STATS_0 = 30;
+
+ @HealthKeys.Constant(type=HealthKeys.TYPE_TIMERS)
+ public static final int TIMERS_0 = 30;
+
+ @HealthKeys.Constant(type=HealthKeys.TYPE_MEASUREMENTS)
+ public static final int MEASUREMENTS_0 = 40;
+
+ @HealthKeys.Constant(type=HealthKeys.TYPE_MEASUREMENTS)
+ public static final int MEASUREMENTS_1 = 41;
+
+
+ public static final HealthKeys.Constants CONSTANTS
+ = new HealthKeys.Constants(HealthStatsTest.class);
+
+ /**
+ * Check all the fields.
+ */
+ private void checkHealthStats(HealthStats readback) {
+ // Header fields
+ Assert.assertEquals("HealthStatsTest", readback.getDataType());
+
+
+ // TimerStat fields
+ Assert.assertEquals(2, readback.getTimerKeyCount());
+
+ Assert.assertEquals(TIMER_0, readback.getTimerKeyAt(0));
+ Assert.assertTrue(readback.hasTimer(TIMER_0));
+ Assert.assertEquals(1, readback.getTimerCount(TIMER_0));
+ Assert.assertEquals(100, readback.getTimerTime(TIMER_0));
+
+ Assert.assertEquals(TIMER_1, readback.getTimerKeyAt(1));
+ Assert.assertTrue(readback.hasTimer(TIMER_1));
+ Assert.assertEquals(Integer.MAX_VALUE, readback.getTimerCount(TIMER_1));
+ Assert.assertEquals(Long.MAX_VALUE, readback.getTimerTime(TIMER_1));
+
+ Assert.assertEquals(Integer.MAX_VALUE, readback.getTimer(TIMER_1).getCount());
+ Assert.assertEquals(Long.MAX_VALUE, readback.getTimer(TIMER_1).getTime());
+
+
+ // Measurement fields
+ Assert.assertEquals(2, readback.getMeasurementKeyCount());
+
+ Assert.assertEquals(MEASUREMENT_0, readback.getMeasurementKeyAt(0));
+ Assert.assertTrue(readback.hasMeasurement(MEASUREMENT_0));
+ Assert.assertEquals(300, readback.getMeasurement(MEASUREMENT_0));
+
+ Assert.assertEquals(MEASUREMENT_1, readback.getMeasurementKeyAt(1));
+ Assert.assertTrue(readback.hasMeasurement(MEASUREMENT_1));
+ Assert.assertEquals(Long.MAX_VALUE, readback.getMeasurement(MEASUREMENT_1));
+
+
+ // Stats fields
+ Assert.assertEquals(1, readback.getStatsKeyCount());
+
+ Assert.assertEquals(STATS_0, readback.getStatsKeyAt(0));
+ Assert.assertTrue(readback.hasStats(STATS_0));
+
+ final Map<String,HealthStats> stats = readback.getStats(STATS_0);
+ Assert.assertEquals(1, stats.size());
+ final HealthStats child = stats.get("a");
+ Assert.assertEquals(0, child.getTimerKeyCount());
+ Assert.assertEquals(1, child.getMeasurementKeyCount());
+ Assert.assertEquals(Long.MIN_VALUE, child.getMeasurement(MEASUREMENT_2));
+ Assert.assertEquals(0, child.getStatsKeyCount());
+ Assert.assertEquals(0, child.getTimersKeyCount());
+
+
+ // Timers fields
+ Assert.assertEquals(1, readback.getTimersKeyCount());
+
+ Assert.assertEquals(TIMERS_0, readback.getTimersKeyAt(0));
+ Assert.assertTrue(readback.hasTimers(TIMERS_0));
+ final Map<String,TimerStat> timers = readback.getTimers(TIMERS_0);
+ Assert.assertEquals(1, timers.size());
+ Assert.assertEquals(200, timers.get("b").getCount());
+ Assert.assertEquals(400, timers.get("b").getTime());
+
+
+ // Measurements fields
+ Map<String,Long> measurements;
+ Assert.assertEquals(2, readback.getMeasurementsKeyCount());
+
+ Assert.assertEquals(MEASUREMENTS_0, readback.getMeasurementsKeyAt(0));
+ Assert.assertTrue(readback.hasMeasurements(MEASUREMENTS_0));
+ measurements = readback.getMeasurements(MEASUREMENTS_0);
+ Assert.assertEquals(1, measurements.size());
+ Assert.assertEquals(800L, measurements.get("Z").longValue());
+
+ Assert.assertEquals(MEASUREMENTS_1, readback.getMeasurementsKeyAt(1));
+ measurements = readback.getMeasurements(MEASUREMENTS_1);
+ Assert.assertTrue(readback.hasMeasurements(MEASUREMENTS_1));
+ Assert.assertEquals(2, measurements.size());
+ Assert.assertEquals(900L, measurements.get("Y").longValue());
+ Assert.assertEquals(901L, measurements.get("X").longValue());
+ }
+
+ /**
+ * Tests parceling empty HealthStats.
+ */
+ @SmallTest
+ public void testParcelEmpty() throws Exception {
+ final HealthStatsWriter writer = new HealthStatsWriter(CONSTANTS);
+
+ Parcel parcel = Parcel.obtain();
+ writer.flattenToParcel(parcel);
+
+ parcel.setDataPosition(0);
+
+ HealthStats readback = new HealthStats(parcel);
+
+ // Check that there is no more data in the parcel
+ Assert.assertEquals(0, parcel.dataAvail());
+ parcel.recycle();
+
+ Assert.assertEquals(0, readback.getTimerKeyCount());
+ Assert.assertEquals(0, readback.getMeasurementKeyCount());
+ Assert.assertEquals(0, readback.getStatsKeyCount());
+ Assert.assertEquals(0, readback.getTimersKeyCount());
+ Assert.assertEquals(0, readback.getMeasurementsKeyCount());
+ }
+
+
+ /**
+ * Tests parceling HealthStats.
+ */
+ @SmallTest
+ public void testParcelling() throws Exception {
+ final HealthStatsWriter writer = new HealthStatsWriter(CONSTANTS);
+
+ // TimerStat
+ writer.addTimer(TIMER_0, 1, 100);
+ writer.addTimer(TIMER_1, Integer.MAX_VALUE, Long.MAX_VALUE);
+
+ // Measurement
+ writer.addMeasurement(MEASUREMENT_0, 300);
+ writer.addMeasurement(MEASUREMENT_1, Long.MAX_VALUE);
+
+ // Stats
+ HealthStatsWriter writer2 = new HealthStatsWriter(CONSTANTS);
+ writer2.addMeasurement(MEASUREMENT_2, Long.MIN_VALUE);
+ writer.addStats(STATS_0, "a", writer2);
+
+ // Timers
+ writer.addTimers(TIMERS_0, "b", new TimerStat(200, 400));
+
+ // Measurements
+ writer.addMeasurements(MEASUREMENTS_0, "Z", 800);
+ writer.addMeasurements(MEASUREMENTS_1, "Y", 900);
+ writer.addMeasurements(MEASUREMENTS_1, "Z", 901);
+
+
+ // Parcel and unparcel it via HealthStatsWriter.writeToParcel.
+ Parcel parcel = Parcel.obtain();
+ writer.flattenToParcel(parcel);
+ parcel.setDataPosition(0);
+ HealthStats readback = new HealthStats(parcel);
+
+ // Check that there is no more data in the parcel
+ Assert.assertEquals(0, parcel.dataAvail());
+ parcel.recycle();
+
+ checkHealthStats(readback);
+ }
+
+ /**
+ * Tests the HealthStatsParceler.
+ */
+ @SmallTest
+ public void testParceler() throws Exception {
+ final HealthStatsWriter writer = new HealthStatsWriter(CONSTANTS);
+ writer.addMeasurement(MEASUREMENT_0, 300);
+
+ final HealthStatsParceler parceler = new HealthStatsParceler(writer);
+
+ final Parcel parcel = Parcel.obtain();
+ parceler.writeToParcel(parcel, 0);
+ parcel.setDataPosition(0);
+
+ final HealthStatsParceler parceler2 = new HealthStatsParceler(parcel);
+
+ // Check that there is no more data in the parcel
+ Assert.assertEquals(0, parcel.dataAvail());
+ parcel.recycle();
+
+ final HealthStats readback = parceler2.getHealthStats();
+
+ Assert.assertEquals(300, readback.getMeasurement(MEASUREMENT_0));
+
+ // Should fail
+ try {
+ final Parcel parcel2 = Parcel.obtain();
+ parceler2.writeToParcel(parcel2, 0);
+ parcel2.recycle();
+ throw new Exception("Expected IndexOutOfBoundsException");
+ } catch (RuntimeException ex) {
+ // expected
+ }
+ }
+}
+
diff --git a/tests/tests/os/src/android/os/health/cts/SystemHealthManagerTest.java b/tests/tests/os/src/android/os/health/cts/SystemHealthManagerTest.java
new file mode 100644
index 0000000..1ce3086
--- /dev/null
+++ b/tests/tests/os/src/android/os/health/cts/SystemHealthManagerTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2016 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 android.os.health.cts;
+
+import android.content.Context;
+import android.os.Parcel;
+import android.os.Process;
+import android.os.health.SystemHealthManager;
+import android.os.health.HealthStats;
+import android.test.suitebuilder.annotation.SmallTest;
+import android.test.InstrumentationTestCase;
+
+import junit.framework.Assert;
+
+/**
+ * Provides test cases for android.os.health.TimerStat.
+ */
+public class SystemHealthManagerTest extends InstrumentationTestCase {
+ /**
+ * Tests that takeMyUidSnapshot returns a HealthStats object.
+ */
+ @SmallTest
+ public void testTakeMyUidSnapshot() throws Exception {
+ final Context context = getInstrumentation().getTargetContext();
+ final SystemHealthManager healthy = SystemHealthManager.from(context);
+
+ Assert.assertNotNull(healthy.takeMyUidSnapshot());
+ }
+
+ /**
+ * Tests that takeUidSnapshot with this uid returns a HealthStats object.
+ */
+ @SmallTest
+ public void testTakeUidSnapshotWithMe() throws Exception {
+ final Context context = getInstrumentation().getTargetContext();
+ final SystemHealthManager healthy = SystemHealthManager.from(context);
+
+ Assert.assertNotNull(healthy.takeUidSnapshot(Process.myUid()));
+ }
+
+ /**
+ * Tests that takeUidSnapshot on the system process throws a SecurityException.
+ */
+ @SmallTest
+ public void testTakeMyUidSnapshotWithSystem() throws Exception {
+ final Context context = getInstrumentation().getTargetContext();
+ final SystemHealthManager healthy = SystemHealthManager.from(context);
+
+ boolean threw = false;
+ try {
+ healthy.takeUidSnapshot(Process.SYSTEM_UID);
+ } catch (SecurityException ex) {
+ threw = true;
+ }
+
+ Assert.assertTrue(threw);
+ }
+
+ /**
+ * Tests that takeUidSnapshots with an empty array returns an empty array.
+ */
+ @SmallTest
+ public void testTakeUidSnapshotsWithEmptyArray() throws Exception {
+ final Context context = getInstrumentation().getTargetContext();
+ final SystemHealthManager healthy = SystemHealthManager.from(context);
+
+ final HealthStats[] result = healthy.takeUidSnapshots(new int[0]);
+ Assert.assertEquals(0, result.length);
+ }
+
+ /**
+ * Tests that takeUidSnapshots with this uid returns a HealthStats object.
+ */
+ @SmallTest
+ public void testTakeUidSnapshotsWithMe() throws Exception {
+ final Context context = getInstrumentation().getTargetContext();
+ final SystemHealthManager healthy = SystemHealthManager.from(context);
+
+ final HealthStats[] result = healthy.takeUidSnapshots(new int[] {
+ Process.myUid(),
+ Process.myUid(),
+ });
+ Assert.assertEquals(2, result.length);
+ Assert.assertNotNull(result[0]);
+ Assert.assertNotNull(result[1]);
+ }
+
+ /**
+ * Tests that takeUidSnapshot on the system process throws a SecurityException.
+ */
+ @SmallTest
+ public void testTakeMyUidSnapshotsWithSystem() throws Exception {
+ final Context context = getInstrumentation().getTargetContext();
+ final SystemHealthManager healthy = SystemHealthManager.from(context);
+
+ boolean threw = false;
+ try {
+ healthy.takeUidSnapshots(new int[] {
+ Process.myUid(),
+ Process.SYSTEM_UID,
+ });
+ } catch (SecurityException ex) {
+ threw = true;
+ }
+
+ Assert.assertTrue(threw);
+ }
+}
+
diff --git a/tests/tests/os/src/android/os/health/cts/TimerStatTest.java b/tests/tests/os/src/android/os/health/cts/TimerStatTest.java
new file mode 100644
index 0000000..f8e27fe
--- /dev/null
+++ b/tests/tests/os/src/android/os/health/cts/TimerStatTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2016 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 android.os.health.cts;
+
+import android.os.Parcel;
+import android.os.health.TimerStat;
+import android.test.suitebuilder.annotation.SmallTest;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+/**
+ * Provides test cases for android.os.health.TimerStat.
+ */
+public class TimerStatTest extends TestCase {
+ /**
+ * Tests empty constructor and get methods.
+ */
+ @SmallTest
+ public void testEmptyConstructor() throws Exception {
+ TimerStat timer = new TimerStat();
+
+ Assert.assertEquals(0, timer.getCount());
+ Assert.assertEquals(0, timer.getTime());
+ }
+
+ /**
+ * Tests setCount.
+ */
+ @SmallTest
+ public void testSetCount() throws Exception {
+ TimerStat timer = new TimerStat(Integer.MAX_VALUE, Long.MAX_VALUE);
+
+ Assert.assertEquals(Integer.MAX_VALUE, timer.getCount());
+
+ timer.setCount(12);
+
+ Assert.assertEquals(12, timer.getCount());
+ Assert.assertEquals(Long.MAX_VALUE, timer.getTime());
+ }
+
+ /**
+ * Tests setTime.
+ */
+ @SmallTest
+ public void testSetTime() throws Exception {
+ TimerStat timer = new TimerStat(Integer.MAX_VALUE, Long.MAX_VALUE);
+
+ Assert.assertEquals(Integer.MAX_VALUE, timer.getCount());
+
+ timer.setTime(5000);
+
+ Assert.assertEquals(Integer.MAX_VALUE, timer.getCount());
+ Assert.assertEquals(5000, timer.getTime());
+ }
+
+ /**
+ * Tests writeToParcel and reading a parcel.
+ */
+ @SmallTest
+ public void testParceling() throws Exception {
+ TimerStat timer = new TimerStat(Integer.MAX_VALUE, Long.MAX_VALUE);
+
+ Assert.assertEquals(Integer.MAX_VALUE, timer.getCount());
+ Assert.assertEquals(Long.MAX_VALUE, timer.getTime());
+ Assert.assertEquals(0, timer.describeContents());
+
+ Parcel parcel = Parcel.obtain();
+ timer.writeToParcel(parcel, 0);
+
+ parcel.setDataPosition(0);
+
+ TimerStat readback = new TimerStat(parcel);
+
+ Assert.assertEquals(Integer.MAX_VALUE, readback.getCount());
+ Assert.assertEquals(Long.MAX_VALUE, readback.getTime());
+ }
+}
+
diff --git a/tests/tests/text/src/android/text/cts/EmojiTest.java b/tests/tests/text/src/android/text/cts/EmojiTest.java
index 517d06c..4882402 100644
--- a/tests/tests/text/src/android/text/cts/EmojiTest.java
+++ b/tests/tests/text/src/android/text/cts/EmojiTest.java
@@ -53,6 +53,26 @@
}
}
+ private String describeBitmap(final Bitmap bmp) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("[ID:0x" + Integer.toHexString(System.identityHashCode(bmp)));
+ sb.append(" " + Integer.toString(bmp.getWidth()) + "x" + Integer.toString(bmp.getHeight()));
+ sb.append(" Config:");
+ if (bmp.getConfig() == Bitmap.Config.ALPHA_8) {
+ sb.append("ALPHA_8");
+ } else if (bmp.getConfig() == Bitmap.Config.RGB_565) {
+ sb.append("RGB_565");
+ } else if (bmp.getConfig() == Bitmap.Config.ARGB_4444) {
+ sb.append("ARGB_4444");
+ } else if (bmp.getConfig() == Bitmap.Config.ARGB_8888) {
+ sb.append("ARGB_8888");
+ } else {
+ sb.append("UNKNOWN");
+ }
+ sb.append("]");
+ return sb.toString();
+ }
+
/**
* Tests Emoji has different glyph for different meaning characters.
* Test on Canvas, TextView, EditText and WebView
@@ -71,11 +91,15 @@
};
for (int i = 0; i < comparedCodePoints.length; i++) {
+ String baseMessage = "Glyph for U+" + Integer.toHexString(comparedCodePoints[i][0]) +
+ " should be different from glyph for U+" +
+ Integer.toHexString(comparedCodePoints[i][1]) + ". ";
mBitmapA = ccanvas.capture(Character.toChars(comparedCodePoints[i][0]));
mBitmapB = ccanvas.capture(Character.toChars(comparedCodePoints[i][1]));
- assertFalse(mBitmapA.sameAs(mBitmapB));
+ String bmpDiffMessage = describeBitmap(mBitmapA) + "vs" + describeBitmap(mBitmapB);
+ assertFalse(baseMessage + bmpDiffMessage, mBitmapA.sameAs(mBitmapB));
// cannot reuse CaptureTextView as 2nd setText call throws NullPointerException
CaptureTextView cviewA = new CaptureTextView(getInstrumentation().getContext());
@@ -83,14 +107,16 @@
CaptureTextView cviewB = new CaptureTextView(getInstrumentation().getContext());
mBitmapB = cviewB.capture(Character.toChars(comparedCodePoints[i][1]));
- assertFalse(mBitmapA.sameAs(mBitmapB));
+ bmpDiffMessage = describeBitmap(mBitmapA) + "vs" + describeBitmap(mBitmapB);
+ assertFalse(baseMessage + bmpDiffMessage, mBitmapA.sameAs(mBitmapB));
CaptureEditText cedittextA = new CaptureEditText(getInstrumentation().getContext());
mBitmapA = cedittextA.capture(Character.toChars(comparedCodePoints[i][0]));
CaptureEditText cedittextB = new CaptureEditText(getInstrumentation().getContext());
mBitmapB = cedittextB.capture(Character.toChars(comparedCodePoints[i][1]));
- assertFalse(mBitmapA.sameAs(mBitmapB));
+ bmpDiffMessage = describeBitmap(mBitmapA) + "vs" + describeBitmap(mBitmapB);
+ assertFalse(baseMessage + bmpDiffMessage, mBitmapA.sameAs(mBitmapB));
// Trigger activity bringup so we can determine if a WebView is available on this
// device.
@@ -99,7 +125,8 @@
CaptureWebView cwebview = new CaptureWebView(getInstrumentation().getContext());
mBitmapA = cwebview.capture(Character.toChars(comparedCodePoints[i][0]));
mBitmapB = cwebview.capture(Character.toChars(comparedCodePoints[i][1]));
- assertFalse(mBitmapA.sameAs(mBitmapB));
+ bmpDiffMessage = describeBitmap(mBitmapA) + "vs" + describeBitmap(mBitmapB);
+ assertFalse(baseMessage + bmpDiffMessage, mBitmapA.sameAs(mBitmapB));
}
}
}
diff --git a/tests/tests/text/src/android/text/cts/StaticLayoutTest.java b/tests/tests/text/src/android/text/cts/StaticLayoutTest.java
index 17a0fd0..74fb030 100644
--- a/tests/tests/text/src/android/text/cts/StaticLayoutTest.java
+++ b/tests/tests/text/src/android/text/cts/StaticLayoutTest.java
@@ -1004,6 +1004,53 @@
assertEquals(testString.length(), layout.getOffsetForHorizontal(lineCount - 1, width * 2));
}
+ public void testIsRtlCharAt() {
+ {
+ String testString = "ab(\u0623\u0624)c\u0625";
+ StaticLayout layout = new StaticLayout(testString, mDefaultPaint,
+ DEFAULT_OUTER_WIDTH, DEFAULT_ALIGN, SPACE_MULTI, SPACE_ADD, true);
+
+ assertFalse(layout.isRtlCharAt(0));
+ assertFalse(layout.isRtlCharAt(1));
+ assertFalse(layout.isRtlCharAt(2));
+ assertTrue(layout.isRtlCharAt(3));
+ assertTrue(layout.isRtlCharAt(4));
+ assertFalse(layout.isRtlCharAt(5));
+ assertFalse(layout.isRtlCharAt(6));
+ assertTrue(layout.isRtlCharAt(7));
+ }
+ {
+ String testString = "\u0623\u0624(ab)\u0625c";
+ StaticLayout layout = new StaticLayout(testString, mDefaultPaint,
+ DEFAULT_OUTER_WIDTH, DEFAULT_ALIGN, SPACE_MULTI, SPACE_ADD, true);
+
+ assertTrue(layout.isRtlCharAt(0));
+ assertTrue(layout.isRtlCharAt(1));
+ assertTrue(layout.isRtlCharAt(2));
+ assertFalse(layout.isRtlCharAt(3));
+ assertFalse(layout.isRtlCharAt(4));
+ assertTrue(layout.isRtlCharAt(5));
+ assertTrue(layout.isRtlCharAt(6));
+ assertFalse(layout.isRtlCharAt(7));
+ assertFalse(layout.isRtlCharAt(8));
+ }
+ }
+
+ public void testGetHorizontal() {
+ String testString = "abc\u0623\u0624\u0625def";
+ StaticLayout layout = new StaticLayout(testString, mDefaultPaint,
+ DEFAULT_OUTER_WIDTH, DEFAULT_ALIGN, SPACE_MULTI, SPACE_ADD, true);
+
+ assertEquals(layout.getPrimaryHorizontal(0), layout.getSecondaryHorizontal(0));
+ assertTrue(layout.getPrimaryHorizontal(0) < layout.getPrimaryHorizontal(3));
+ assertTrue(layout.getPrimaryHorizontal(3) < layout.getSecondaryHorizontal(3));
+ assertTrue(layout.getPrimaryHorizontal(4) < layout.getSecondaryHorizontal(3));
+ assertEquals(layout.getPrimaryHorizontal(4), layout.getSecondaryHorizontal(4));
+ assertEquals(layout.getPrimaryHorizontal(3), layout.getSecondaryHorizontal(6));
+ assertEquals(layout.getPrimaryHorizontal(6), layout.getSecondaryHorizontal(3));
+ assertEquals(layout.getPrimaryHorizontal(7), layout.getSecondaryHorizontal(7));
+ }
+
public void testVeryLargeString() {
final int MAX_COUNT = 1 << 21;
final int WORD_SIZE = 32;
diff --git a/tests/tests/tv/src/android/media/tv/cts/BundledTvInputServiceTest.java b/tests/tests/tv/src/android/media/tv/cts/BundledTvInputServiceTest.java
index 94e8a01..e8ee222 100644
--- a/tests/tests/tv/src/android/media/tv/cts/BundledTvInputServiceTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/BundledTvInputServiceTest.java
@@ -29,6 +29,8 @@
import android.tv.cts.R;
+import com.android.cts.util.TimeoutReq;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -153,13 +155,17 @@
}
}
+ @TimeoutReq(minutes = 5)
public void testTuneStress() throws Throwable {
if (!Utils.hasTvInputFramework(getActivity())) {
return;
}
- final int STRESS_FACTOR = 100;
+ // On average, the device is expected to have ~ 5 pass-through inputs (HDMI1-4 and
+ // Component) and tuning should be completed within 3 seconds, which gives 15 seconds
+ // for an input. Set 5 minutes of timeout for this test case and try 20 iterations.
+ final int ITERATIONS = 20;
Random random = new Random();
- for (int i = 0; i < mPassthroughInputList.size() * STRESS_FACTOR; ++i) {
+ for (int i = 0; i < mPassthroughInputList.size() * ITERATIONS; ++i) {
final TvInputInfo info =
mPassthroughInputList.get(random.nextInt(mPassthroughInputList.size()));
runTestOnUiThread(new Runnable() {
@@ -170,17 +176,15 @@
}
});
mInstrumentation.waitForIdleSync();
- if (random.nextBoolean()) {
- new PollingCheck(TIME_OUT) {
- @Override
- protected boolean check() {
- Integer reason = mCallback.getVideoUnavailableReason(info.getId());
- return reason != null
- && reason != TvInputManager.VIDEO_UNAVAILABLE_REASON_TUNING
- && reason != TvInputManager.VIDEO_UNAVAILABLE_REASON_BUFFERING;
- }
- }.run();
- }
+ new PollingCheck(TIME_OUT) {
+ @Override
+ protected boolean check() {
+ Integer reason = mCallback.getVideoUnavailableReason(info.getId());
+ return reason != null
+ && reason != TvInputManager.VIDEO_UNAVAILABLE_REASON_TUNING
+ && reason != TvInputManager.VIDEO_UNAVAILABLE_REASON_BUFFERING;
+ }
+ }.run();
}
}
}
diff --git a/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java b/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java
index 693090d..ccbcfee 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java
@@ -23,6 +23,7 @@
import android.media.tv.TvContentRating;
import android.media.tv.TvInputInfo;
import android.media.tv.TvInputManager;
+import android.media.tv.TvInputService;
import android.os.Handler;
import android.test.ActivityInstrumentationTestCase2;
@@ -216,7 +217,7 @@
new ComponentName(getActivity(), StubTunerTvInputService.class))
.setTunerCount(10).setCanRecord(true).build();
- StubTunerTvInputService.updateTvInputInfo(getActivity(), updatedInfo);
+ TvInputService.updateTvInputInfo(getActivity(), updatedInfo);
new PollingCheck(TIME_OUT_MS) {
@Override
protected boolean check() {
@@ -225,7 +226,7 @@
}
}.run();
- StubTunerTvInputService.updateTvInputInfo(getActivity(), defaultInfo);
+ TvInputService.updateTvInputInfo(getActivity(), defaultInfo);
new PollingCheck(TIME_OUT_MS) {
@Override
protected boolean check() {
diff --git a/tests/tests/view/AndroidManifest.xml b/tests/tests/view/AndroidManifest.xml
index 9bd568d..82fca09 100644
--- a/tests/tests/view/AndroidManifest.xml
+++ b/tests/tests/view/AndroidManifest.xml
@@ -183,6 +183,14 @@
</intent-filter>
</activity>
+ <activity android:name="android.view.cts.ViewGroupOverlayCtsActivity"
+ android:label="ViewGroupOverlayCtsActivity">
+ <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.view.cts.SearchEventActivity"
android:label="SearchEventActivity">
<intent-filter>
diff --git a/tests/tests/view/res/layout/viewgroupoverlay_layout.xml b/tests/tests/view/res/layout/viewgroupoverlay_layout.xml
new file mode 100644
index 0000000..39523a9
--- /dev/null
+++ b/tests/tests/view/res/layout/viewgroupoverlay_layout.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2016 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.
+ */
+-->
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <FrameLayout
+ android:id="@+id/viewgroup_with_overlay"
+ android:layout_width="100px"
+ android:layout_height="100px"
+ android:layout_centerInParent="true"
+ android:background="#FFF">
+
+ <RelativeLayout
+ android:id="@+id/level2"
+ android:layout_width="50px"
+ android:layout_height="50px"
+ android:layout_gravity="bottom|right">
+
+ <FrameLayout
+ android:id="@+id/level3"
+ android:layout_width="20px"
+ android:layout_height="30px"
+ android:layout_centerInParent="true" />
+
+ </RelativeLayout>
+
+ </FrameLayout>
+
+</RelativeLayout>
diff --git a/tests/tests/view/src/android/view/cts/ViewGroupOverlayCtsActivity.java b/tests/tests/view/src/android/view/cts/ViewGroupOverlayCtsActivity.java
new file mode 100644
index 0000000..9913692
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/ViewGroupOverlayCtsActivity.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2016 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 android.view.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class ViewGroupOverlayCtsActivity extends Activity {
+ @Override
+ protected void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ setContentView(R.layout.viewgroupoverlay_layout);
+ }
+}
diff --git a/tests/tests/view/src/android/view/cts/ViewGroupOverlayTest.java b/tests/tests/view/src/android/view/cts/ViewGroupOverlayTest.java
new file mode 100644
index 0000000..c4cebb9
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/ViewGroupOverlayTest.java
@@ -0,0 +1,399 @@
+/*
+ * Copyright (C) 2016 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 android.view.cts;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.SystemClock;
+import android.test.ActivityInstrumentationTestCase2;
+import android.test.suitebuilder.annotation.SmallTest;
+import android.util.Pair;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewGroupOverlay;
+import android.view.cts.util.DrawingUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.mockito.Mockito.*;
+
+@SmallTest
+public class ViewGroupOverlayTest extends
+ ActivityInstrumentationTestCase2<ViewGroupOverlayCtsActivity> {
+ private ViewGroup mViewGroupWithOverlay;
+ private ViewGroupOverlay mViewGroupOverlay;
+ private Context mContext;
+
+ public ViewGroupOverlayTest() {
+ super("android.view.cts", ViewGroupOverlayCtsActivity.class);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ mViewGroupWithOverlay = (ViewGroup) getActivity().findViewById(R.id.viewgroup_with_overlay);
+ mViewGroupOverlay = mViewGroupWithOverlay.getOverlay();
+ mContext = getInstrumentation().getTargetContext();
+ }
+
+ public void testBasics() {
+ DrawingUtils.assertAllPixelsOfColor("Default fill", mViewGroupWithOverlay,
+ Color.WHITE, null);
+ assertNotNull("Overlay is not null", mViewGroupOverlay);
+ }
+
+ public void testAddNullView() throws Throwable {
+ try {
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.add((View) null);
+ }
+ });
+ fail("should throw IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ }
+ }
+
+ public void testRemoveNullView() throws Throwable {
+ try {
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.remove((View) null);
+ }
+ });
+ fail("should throw IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ }
+ }
+
+ public void testOverlayWithOneView() throws Throwable {
+ // Add one colored view to the overlay
+ final View redView = new View(mContext);
+ redView.setBackgroundColor(Color.RED);
+ redView.layout(10, 20, 30, 40);
+
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.add(redView);
+ }
+ });
+
+ final List<Pair<Rect, Integer>> colorRectangles = new ArrayList<>();
+ colorRectangles.add(new Pair<>(new Rect(10, 20, 30, 40), Color.RED));
+ DrawingUtils.assertAllPixelsOfColor("Overlay with one red view",
+ mViewGroupWithOverlay, Color.WHITE, colorRectangles);
+
+ // Now remove that view from the overlay and test that we're back to pure white fill
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.remove(redView);
+ }
+ });
+ DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewGroupWithOverlay,
+ Color.WHITE, null);
+ }
+
+ public void testOverlayWithNonOverlappingViews() throws Throwable {
+ // Add three views to the overlay
+ final View redView = new View(mContext);
+ redView.setBackgroundColor(Color.RED);
+ redView.layout(10, 20, 30, 40);
+ final View greenView = new View(mContext);
+ greenView.setBackgroundColor(Color.GREEN);
+ greenView.layout(60, 30, 90, 50);
+ final View blueView = new View(mContext);
+ blueView.setBackgroundColor(Color.BLUE);
+ blueView.layout(40, 60, 80, 90);
+
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.add(redView);
+ mViewGroupOverlay.add(greenView);
+ mViewGroupOverlay.add(blueView);
+ }
+ });
+
+ final List<Pair<Rect, Integer>> colorRectangles = new ArrayList<>();
+ colorRectangles.add(new Pair<>(new Rect(10, 20, 30, 40), Color.RED));
+ colorRectangles.add(new Pair<>(new Rect(60, 30, 90, 50), Color.GREEN));
+ colorRectangles.add(new Pair<>(new Rect(40, 60, 80, 90), Color.BLUE));
+ DrawingUtils.assertAllPixelsOfColor("Overlay with three views", mViewGroupWithOverlay,
+ Color.WHITE, colorRectangles);
+
+ // Remove one of the views from the overlay
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.remove(greenView);
+ }
+ });
+ colorRectangles.clear();
+ colorRectangles.add(new Pair<>(new Rect(10, 20, 30, 40), Color.RED));
+ colorRectangles.add(new Pair<>(new Rect(40, 60, 80, 90), Color.BLUE));
+ DrawingUtils.assertAllPixelsOfColor("Overlay with two views", mViewGroupWithOverlay,
+ Color.WHITE, colorRectangles);
+
+ // Clear all views from the overlay and test that we're back to pure white fill
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.clear();
+ }
+ });
+ DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewGroupWithOverlay,
+ Color.WHITE, null);
+ }
+
+
+ public void testOverlayWithNonOverlappingViewAndDrawable() throws Throwable {
+ // Add one view and one drawable to the overlay
+ final View redView = new View(mContext);
+ redView.setBackgroundColor(Color.RED);
+ redView.layout(10, 20, 30, 40);
+ final Drawable greenDrawable = new ColorDrawable(Color.GREEN);
+ greenDrawable.setBounds(60, 30, 90, 50);
+
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.add(redView);
+ mViewGroupOverlay.add(greenDrawable);
+ }
+ });
+
+ final List<Pair<Rect, Integer>> colorRectangles = new ArrayList<>();
+ colorRectangles.add(new Pair<>(new Rect(10, 20, 30, 40), Color.RED));
+ colorRectangles.add(new Pair<>(new Rect(60, 30, 90, 50), Color.GREEN));
+ DrawingUtils.assertAllPixelsOfColor("Overlay with one view and one drawable",
+ mViewGroupWithOverlay, Color.WHITE, colorRectangles);
+
+ // Remove the view from the overlay
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.remove(redView);
+ }
+ });
+ colorRectangles.clear();
+ colorRectangles.add(new Pair<>(new Rect(60, 30, 90, 50), Color.GREEN));
+ DrawingUtils.assertAllPixelsOfColor("Overlay with one drawable", mViewGroupWithOverlay,
+ Color.WHITE, colorRectangles);
+
+ // Clear everything from the overlay and test that we're back to pure white fill
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.clear();
+ }
+ });
+ DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewGroupWithOverlay,
+ Color.WHITE, null);
+ }
+
+ public void testOverlayWithOverlappingViews() throws Throwable {
+ // Add two overlapping colored views to the overlay
+ final View redView = new View(mContext);
+ redView.setBackgroundColor(Color.RED);
+ redView.layout(10, 20, 60, 40);
+ final View greenView = new View(mContext);
+ greenView.setBackgroundColor(Color.GREEN);
+ greenView.layout(30, 20, 80, 40);
+
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.add(redView);
+ mViewGroupOverlay.add(greenView);
+ }
+ });
+
+ // Our overlay views overlap in horizontal 30-60 range. Here we test that the
+ // second view is the one that is drawn last in that range.
+ final List<Pair<Rect, Integer>> colorRectangles = new ArrayList<>();
+ colorRectangles.add(new Pair<>(new Rect(10, 20, 30, 40), Color.RED));
+ colorRectangles.add(new Pair<>(new Rect(30, 20, 80, 40), Color.GREEN));
+ DrawingUtils.assertAllPixelsOfColor("Overlay with two drawables", mViewGroupWithOverlay,
+ Color.WHITE, colorRectangles);
+
+ // Remove the second view from the overlay
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.remove(greenView);
+ }
+ });
+ colorRectangles.clear();
+ colorRectangles.add(new Pair<>(new Rect(10, 20, 60, 40), Color.RED));
+ DrawingUtils.assertAllPixelsOfColor("Overlay with one drawable", mViewGroupWithOverlay,
+ Color.WHITE, colorRectangles);
+
+ // Clear all views from the overlay and test that we're back to pure white fill
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.clear();
+ }
+ });
+ DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewGroupWithOverlay,
+ Color.WHITE, null);
+ }
+
+ public void testOverlayWithOverlappingViewAndDrawable() throws Throwable {
+ // Add two overlapping colored views to the overlay
+ final Drawable redDrawable = new ColorDrawable(Color.RED);
+ redDrawable.setBounds(10, 20, 60, 40);
+ final View greenView = new View(mContext);
+ greenView.setBackgroundColor(Color.GREEN);
+ greenView.layout(30, 20, 80, 40);
+
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.add(redDrawable);
+ mViewGroupOverlay.add(greenView);
+ }
+ });
+
+ // Our overlay views overlap in horizontal 30-60 range. Even though the green view was
+ // added after the red drawable, *all* overlay drawables are drawn after the overlay views.
+ // So in the overlap range we expect color red
+ final List<Pair<Rect, Integer>> colorRectangles = new ArrayList<>();
+ colorRectangles.add(new Pair<>(new Rect(10, 20, 60, 40), Color.RED));
+ colorRectangles.add(new Pair<>(new Rect(60, 20, 80, 40), Color.GREEN));
+ DrawingUtils.assertAllPixelsOfColor("Overlay with one view and one drawable",
+ mViewGroupWithOverlay, Color.WHITE, colorRectangles);
+
+ // Remove the drawable from the overlay
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.remove(redDrawable);
+ }
+ });
+ colorRectangles.clear();
+ colorRectangles.add(new Pair<>(new Rect(30, 20, 80, 40), Color.GREEN));
+ DrawingUtils.assertAllPixelsOfColor("Overlay with one view", mViewGroupWithOverlay,
+ Color.WHITE, colorRectangles);
+
+ // Clear all views from the overlay and test that we're back to pure white fill
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.clear();
+ }
+ });
+ DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewGroupWithOverlay,
+ Color.WHITE, null);
+ }
+
+ public void testOverlayViewNoClicks() throws Throwable {
+ // Add one colored view with mock click listener to the overlay
+ final View redView = new View(mContext);
+ redView.setBackgroundColor(Color.RED);
+ final View.OnClickListener mockClickListener = mock(View.OnClickListener.class);
+ redView.setOnClickListener(mockClickListener);
+ redView.layout(10, 20, 30, 40);
+
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewGroupOverlay.add(redView);
+ }
+ });
+
+ // If we call performClick or dispatchTouchEvent on the view that we've added to the
+ // overlay, that will invoke the listener that we've registered. But here we need to
+ // test that such a view doesn't get clicks in the regular event processing pipeline
+ // that handles individual events at the screen level. Use Instrumentation to emulate
+ // the high-level sequence of events instead.
+ final int[] viewGroupOnScreenXY = new int[2];
+ mViewGroupWithOverlay.getLocationOnScreen(viewGroupOnScreenXY);
+
+ // Compute the coordinates for emulating a tap in the center of the view we've added
+ // to the overlay.
+ final int emulatedTapX = viewGroupOnScreenXY[0] + redView.getLeft()
+ + redView.getWidth() / 2;
+ final int emulatedTapY = viewGroupOnScreenXY[1] + redView.getTop()
+ + redView.getHeight() / 2;
+ final Instrumentation instrumentation = getInstrumentation();
+
+ // Inject DOWN event
+ long downTime = SystemClock.uptimeMillis();
+ MotionEvent eventDown = MotionEvent.obtain(
+ downTime, downTime, MotionEvent.ACTION_DOWN, emulatedTapX, emulatedTapY, 1);
+ instrumentation.sendPointerSync(eventDown);
+
+ // Inject MOVE event
+ long moveTime = SystemClock.uptimeMillis();
+ MotionEvent eventMove = MotionEvent.obtain(
+ moveTime, moveTime, MotionEvent.ACTION_MOVE, emulatedTapX, emulatedTapY, 1);
+ instrumentation.sendPointerSync(eventMove);
+
+ // Inject UP event
+ long upTime = SystemClock.uptimeMillis();
+ MotionEvent eventUp = MotionEvent.obtain(
+ upTime, upTime, MotionEvent.ACTION_UP, emulatedTapX, emulatedTapY, 1);
+ instrumentation.sendPointerSync(eventUp);
+
+ // Wait for the system to process all events in the queue
+ instrumentation.waitForIdleSync();
+
+ // Verify that our mock listener hasn't been called
+ verify(mockClickListener, never()).onClick(any(View.class));
+ }
+
+ public void testOverlayReparenting() throws Throwable {
+ // Find the view that we're about to add to our overlay
+ final View level2View = mViewGroupWithOverlay.findViewById(R.id.level2);
+ final View level3View = level2View.findViewById(R.id.level3);
+
+ assertTrue(level2View == level3View.getParent());
+
+ // Set the fill of this view to red
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ level3View.setBackgroundColor(Color.RED);
+ mViewGroupOverlay.add(level3View);
+ }
+ });
+
+ // At this point we expect the view that was added to the overlay to have been removed
+ // from its original parent
+ assertFalse(level2View == level3View.getParent());
+
+ // Check the expected visual appearance of our view group. We expect that the view that
+ // was added to the overlay to maintain its relative location inside the activity.
+ final List<Pair<Rect, Integer>> colorRectangles = new ArrayList<>();
+ colorRectangles.add(new Pair<>(new Rect(65, 60, 85, 90), Color.RED));
+ DrawingUtils.assertAllPixelsOfColor("Empty overlay before adding grandchild",
+ mViewGroupWithOverlay, Color.WHITE, colorRectangles);
+
+ }
+}
\ No newline at end of file
diff --git a/tests/tests/view/src/android/view/cts/ViewOverlayTest.java b/tests/tests/view/src/android/view/cts/ViewOverlayTest.java
index 9e4631e..5e7f764 100644
--- a/tests/tests/view/src/android/view/cts/ViewOverlayTest.java
+++ b/tests/tests/view/src/android/view/cts/ViewOverlayTest.java
@@ -21,6 +21,7 @@
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.test.ActivityInstrumentationTestCase2;
+import android.test.suitebuilder.annotation.SmallTest;
import android.util.Pair;
import android.view.View;
import android.view.ViewOverlay;
@@ -29,6 +30,7 @@
import java.util.ArrayList;
import java.util.List;
+@SmallTest
public class ViewOverlayTest extends ActivityInstrumentationTestCase2<ViewOverlayCtsActivity> {
private View mViewWithOverlay;
private ViewOverlay mViewOverlay;
@@ -51,6 +53,32 @@
assertNotNull("Overlay is not null", mViewOverlay);
}
+ public void testAddNullDrawable() throws Throwable {
+ try {
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewOverlay.add(null);
+ }
+ });
+ fail("should throw IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ }
+ }
+
+ public void testRemoveNullDrawable() throws Throwable {
+ try {
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewOverlay.remove(null);
+ }
+ });
+ fail("should throw IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ }
+ }
+
public void testOverlayWithOneDrawable() throws Throwable {
// Add one colored drawable to the overlay
final Drawable redDrawable = new ColorDrawable(Color.RED);
@@ -78,6 +106,63 @@
Color.WHITE, null);
}
+ public void testAddTheSameDrawableTwice() throws Throwable {
+ final Drawable redDrawable = new ColorDrawable(Color.RED);
+ redDrawable.setBounds(20, 30, 40, 50);
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ // Add the same drawable twice
+ mViewOverlay.add(redDrawable);
+ mViewOverlay.add(redDrawable);
+ }
+ });
+
+ final List<Pair<Rect, Integer>> colorRectangles = new ArrayList<>();
+ colorRectangles.add(new Pair<>(new Rect(20, 30, 40, 50), Color.RED));
+ DrawingUtils.assertAllPixelsOfColor("Overlay with one red drawable", mViewWithOverlay,
+ Color.WHITE, colorRectangles);
+
+ // Now remove that drawable from the overlay and test that we're back to pure white fill
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewOverlay.remove(redDrawable);
+ }
+ });
+ DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewWithOverlay,
+ Color.WHITE, null);
+ }
+
+ public void testRemoveTheSameDrawableTwice() throws Throwable {
+ // Add one colored drawable to the overlay
+ final Drawable redDrawable = new ColorDrawable(Color.RED);
+ redDrawable.setBounds(20, 30, 40, 50);
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ mViewOverlay.add(redDrawable);
+ }
+ });
+
+ final List<Pair<Rect, Integer>> colorRectangles = new ArrayList<>();
+ colorRectangles.add(new Pair<>(new Rect(20, 30, 40, 50), Color.RED));
+ DrawingUtils.assertAllPixelsOfColor("Overlay with one red drawable", mViewWithOverlay,
+ Color.WHITE, colorRectangles);
+
+ // Now remove that drawable from the overlay and test that we're back to pure white fill
+ runTestOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ // Remove the drawable twice. The second should be a no-op
+ mViewOverlay.remove(redDrawable);
+ mViewOverlay.remove(redDrawable);
+ }
+ });
+ DrawingUtils.assertAllPixelsOfColor("Back to default fill", mViewWithOverlay,
+ Color.WHITE, null);
+ }
+
public void testOverlayWithNonOverlappingDrawables() throws Throwable {
// Add three color drawables to the overlay
final Drawable redDrawable = new ColorDrawable(Color.RED);
diff --git a/tests/tests/view/src/android/view/inputmethod/cts/InputMethodInfoTest.java b/tests/tests/view/src/android/view/inputmethod/cts/InputMethodInfoTest.java
index 2b02324..dd7de51 100644
--- a/tests/tests/view/src/android/view/inputmethod/cts/InputMethodInfoTest.java
+++ b/tests/tests/view/src/android/view/inputmethod/cts/InputMethodInfoTest.java
@@ -244,7 +244,7 @@
return;
}
- if (!StorageManager.isFileBasedEncryptionEnabled()) {
+ if (!StorageManager.isFileEncryptedNativeOrEmulated()) {
return;
}
diff --git a/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiClass.java b/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiClass.java
index 73cea67..2d24931 100644
--- a/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiClass.java
+++ b/tools/cts-api-coverage/src/com/android/cts/apicoverage/ApiClass.java
@@ -197,6 +197,13 @@
}
/**
+ * @return true iff the parameter is a var arg parameter.
+ */
+ private static boolean isVarArg(String parameter) {
+ return parameter.endsWith("...");
+ }
+
+ /**
* Compare class types.
* @param apiType The type as reported by the api
* @param testType The type as found used in a test
@@ -206,7 +213,9 @@
private static boolean compareType(String apiType, String testType) {
return apiType.equals(testType) ||
isGenericType(apiType) && !testType.equals(VOID) ||
- isGenericArrayType(apiType) && isArrayType(testType) ;
+ isGenericArrayType(apiType) && isArrayType(testType) ||
+ isVarArg(apiType) && isArrayType(testType) &&
+ apiType.startsWith(testType.substring(0, testType.indexOf("[")));
}
/**
