DO NOT MERGE Remove useless AnimationDrawable test, fix test for default one-shot
The testInflateMissingAttributes() test was broken and wasn't really
testing any functionality that wasn't already covered by other tests.
BUG: 18784598
Change-Id: Ia3e92cf0f6799f2f3c06ca85e11b7b7bda72b618
(cherry picked from commit 72cdd8ea759d0681042361faad31ed6a5ac3fbe7)
diff --git a/tests/tests/graphics/res/xml/anim_list_missing_list_attrs.xml b/tests/tests/graphics/res/xml/anim_list_missing_list_attrs.xml
deleted file mode 100644
index 25d2dfe..0000000
--- a/tests/tests/graphics/res/xml/anim_list_missing_list_attrs.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2008 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.
- */
--->
-
-<animation-list xmlns:android="http://schemas.android.com/apk/res/android" >
- <item android:drawable="@drawable/testimage"
- android:duration="2000" />
-</animation-list>
-
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 46f74dc..28a3c6b 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimationDrawableTest.java
@@ -76,7 +76,7 @@
// Check the values set in the constructor
assertNotNull(mAnimationDrawable.getConstantState());
assertFalse(mAnimationDrawable.isRunning());
- assertTrue(mAnimationDrawable.isOneShot());
+ assertFalse(mAnimationDrawable.isOneShot());
}
public void testSetVisible() throws Throwable {
@@ -295,26 +295,6 @@
assertSame(dr.getFrame(0), dr.getCurrent());
}
- public void testInflateMissingAttributes() throws XmlPullParserException, IOException {
- XmlResourceParser parser = getResourceParser(R.xml.anim_list_missing_list_attrs);
- AnimationDrawable dr = new AnimationDrawable();
- dr.inflate(mResources, parser, Xml.asAttributeSet(parser));
- // use default visibility
- assertTrue(dr.isVisible());
- // default value of android:oneShot is false
- assertFalse(dr.isOneShot());
- // default value of android:variablePadding is false
- // TODO: its not clear what the value of constant padding should be when variablePadding
- // is false
- //assertNotNull(drawableContainerState.getConstantPadding());
- // add a new frame from xml
- assertEquals(3, dr.getNumberOfFrames());
- assertEquals(2000, dr.getDuration(0));
- assertEquals(1000, dr.getDuration(1));
- assertEquals(2000, dr.getDuration(2));
- assertSame(dr.getFrame(0), dr.getCurrent());
- }
-
public void testInflateMissingDrawable() throws XmlPullParserException, IOException {
XmlResourceParser parser = getResourceParser(R.xml.anim_list_missing_item_drawable);
AnimationDrawable dr = new AnimationDrawable();
