Merge "Fix CTS transition tests for Android Wear devices." into stage-aosp-oc-cts-dev
diff --git a/tests/tests/transition/Android.mk b/tests/tests/transition/Android.mk
index a80f43c..7a072ee 100644
--- a/tests/tests/transition/Android.mk
+++ b/tests/tests/transition/Android.mk
@@ -27,6 +27,7 @@
LOCAL_STATIC_JAVA_LIBRARIES += \
android-support-test \
mockito-target-minus-junit4 \
+ hamcrest-library \
android-common \
compatibility-device-util \
ctstestrunner \
diff --git a/tests/tests/transition/AndroidManifest.xml b/tests/tests/transition/AndroidManifest.xml
index 1fb4f0e..671958f 100644
--- a/tests/tests/transition/AndroidManifest.xml
+++ b/tests/tests/transition/AndroidManifest.xml
@@ -18,7 +18,7 @@
package="android.transition.cts">
<uses-permission android:name="android.permission.INJECT_EVENTS" />
<uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
- <application>
+ <application android:theme="@style/Theme_NoSwipeDismiss">
<activity android:name="android.transition.cts.TransitionActivity"
android:label="TransitionActivity"/>
<activity android:name="android.transition.cts.TargetActivity"
diff --git a/tests/tests/transition/res/layout/scene13.xml b/tests/tests/transition/res/layout/scene13.xml
index b7c783f..e6a4caf 100644
--- a/tests/tests/transition/res/layout/scene13.xml
+++ b/tests/tests/transition/res/layout/scene13.xml
@@ -25,15 +25,21 @@
android:layout_width="10dp"
android:layout_height="10dp"
android:background="#F00"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
+ android:layout_centerInParent="true"
android:transitionName="redSquare"
android:id="@+id/redSquare"/>
<View
android:layout_width="10dp"
android:layout_height="10dp"
+ android:background="#000"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentTop="true"
+ android:id="@+id/blackSquare"/>
+ <View
+ android:layout_width="10dp"
+ android:layout_height="10dp"
android:background="#0F0"
- android:layout_toRightOf="@id/redSquare"
+ android:layout_toRightOf="@id/blackSquare"
android:id="@+id/greenSquare"/>
<View
android:layout_width="10dp"
diff --git a/tests/tests/transition/res/values/styles.xml b/tests/tests/transition/res/values/styles.xml
new file mode 100644
index 0000000..00303c9
--- /dev/null
+++ b/tests/tests/transition/res/values/styles.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2017 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <style name="Theme_NoSwipeDismiss">
+ <item name="android:windowSwipeToDismiss">false</item>
+ </style>
+</resources>
diff --git a/tests/tests/transition/src/android/transition/cts/ActivityTransitionTest.java b/tests/tests/transition/src/android/transition/cts/ActivityTransitionTest.java
index 895a10a..889dc59 100644
--- a/tests/tests/transition/src/android/transition/cts/ActivityTransitionTest.java
+++ b/tests/tests/transition/src/android/transition/cts/ActivityTransitionTest.java
@@ -298,6 +298,7 @@
@Test
public void testAnimationQuery() throws Throwable {
+ enterScene(R.layout.scene1);
assertFalse(mActivity.isActivityTransitionRunning());
mActivityRule.runOnUiThread(() -> {
mActivity.getWindow().setExitTransition(new Fade());
diff --git a/tests/tests/transition/src/android/transition/cts/TransitionTest.java b/tests/tests/transition/src/android/transition/cts/TransitionTest.java
index cc13eda..9ba201a 100644
--- a/tests/tests/transition/src/android/transition/cts/TransitionTest.java
+++ b/tests/tests/transition/src/android/transition/cts/TransitionTest.java
@@ -17,12 +17,17 @@
import static com.android.compatibility.common.util.CtsMockitoUtils.within;
+import static org.hamcrest.CoreMatchers.allOf;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.lessThan;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
@@ -44,6 +49,7 @@
import android.transition.Transition;
import android.transition.Transition.EpicenterCallback;
import android.transition.Transition.TransitionListener;
+import android.transition.TransitionListenerAdapter;
import android.transition.TransitionManager;
import android.transition.TransitionPropagation;
import android.transition.TransitionValues;
@@ -408,12 +414,12 @@
enterScene(R.layout.scene1);
mTransition.setDuration(500);
assertEquals(500, mTransition.getDuration());
+ DurationListener durationListener = new DurationListener();
+ mTransition.addListener(durationListener);
startTransition(R.layout.scene3);
- long startTime = SystemClock.uptimeMillis();
waitForEnd(800);
- long endTime = SystemClock.uptimeMillis();
- long duration = endTime - startTime;
- assertTrue(duration >= 500 && duration < 900);
+ assertThat(durationListener.getDuration(),
+ allOf(greaterThanOrEqualTo(500L), lessThan(900L)));
}
@Test
@@ -722,5 +728,27 @@
return null;
}
}
-}
+ private static class DurationListener extends TransitionListenerAdapter {
+
+ private long mUptimeMillisStart = -1;
+ private long mDuration = -1;
+
+ @Override
+ public void onTransitionStart(Transition transition) {
+ mUptimeMillisStart = SystemClock.uptimeMillis();
+ }
+
+ @Override
+ public void onTransitionEnd(Transition transition) {
+ mDuration = SystemClock.uptimeMillis() - mUptimeMillisStart;
+ }
+
+ public long getDuration() {
+ if (mDuration < 0) {
+ fail("Requested duration measurement of an incomplete transition.");
+ }
+ return mDuration;
+ }
+ }
+}