Merge "Remove SYM isPrintingKey False Check" into eclair
diff --git a/tests/tests/view/src/android/view/cts/View_AnimationTest.java b/tests/tests/view/src/android/view/cts/View_AnimationTest.java
index 7a22a3b..d071781a 100644
--- a/tests/tests/view/src/android/view/cts/View_AnimationTest.java
+++ b/tests/tests/view/src/android/view/cts/View_AnimationTest.java
@@ -65,7 +65,7 @@
)
})
public void testAnimation() throws Throwable {
- final View view = mActivity.findViewById(R.id.fit_windows);
+ final View view = mActivity.findViewById(R.id.mock_view);
// set null animation
view.setAnimation(null);
assertNull(view.getAnimation());
@@ -89,7 +89,7 @@
})
@ToBeFixed(bug = "1695243", explanation = "Android API javadocs are incomplete")
public void testStartAnimation() throws Throwable {
- final View view = mActivity.findViewById(R.id.fit_windows);
+ final View view = mActivity.findViewById(R.id.mock_view);
// start null animation
try {
view.startAnimation(null);
@@ -120,7 +120,7 @@
)
})
public void testClearBeforeAnimation() throws Throwable {
- final View view = mActivity.findViewById(R.id.fit_windows);
+ final View view = mActivity.findViewById(R.id.mock_view);
assertFalse(mAnimation.hasStarted());
view.setAnimation(mAnimation);
@@ -147,10 +147,11 @@
)
})
public void testClearDuringAnimation() throws Throwable {
- final View view = mActivity.findViewById(R.id.fit_windows);
+ final View view = mActivity.findViewById(R.id.mock_view);
runTestOnUiThread(new Runnable() {
public void run() {
view.startAnimation(mAnimation);
+ assertNotNull(view.getAnimation());
}
});
@@ -164,6 +165,7 @@
view.clearAnimation();
Thread.sleep(TIME_OUT);
assertTrue(mAnimation.hasStarted());
- assertFalse(mAnimation.hasEnded());
+ assertTrue(mAnimation.hasEnded());
+ assertNull(view.getAnimation());
}
}