Fix MovieTest#testGetMovieProperties
Issue 2663463
Drawable#getIntrinsicWidth() returns scaled pixels, but
Drawable#width() does not. Scale the return values from width() and
height(). Most of the time the API returns pixels, but it seems
that getIntrinsicWidth has returned scaled dimensions even from
Donut.
Change-Id: Iab1d22b2b3df84771777e0b2c247a193c01589dc
diff --git a/tests/tests/graphics/src/android/graphics/cts/MovieTest.java b/tests/tests/graphics/src/android/graphics/cts/MovieTest.java
index c377d5e..5621212 100644
--- a/tests/tests/graphics/src/android/graphics/cts/MovieTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/MovieTest.java
@@ -28,6 +28,8 @@
import android.graphics.Movie;
import android.graphics.Paint;
import android.test.ActivityInstrumentationTestCase2;
+import android.widget.cts.WidgetTestUtils;
+
import dalvik.annotation.TestTargets;
import dalvik.annotation.TestLevel;
import dalvik.annotation.TestTargetNew;
@@ -199,11 +201,14 @@
public void testGetMovieProperties() {
assertEquals(1000, mMovie.duration());
assertFalse(mMovie.isOpaque());
- int expectedHeight = getActivity().getResources().getDrawable(MOVIE)
- .getIntrinsicHeight();
- assertEquals(expectedHeight, mMovie.height());
- int expectedWidth = getActivity().getResources().getDrawable(MOVIE)
- .getIntrinsicWidth();
- assertEquals(expectedWidth, mMovie.width());
+
+ int expectedHeight = getActivity().getResources().getDrawable(MOVIE).getIntrinsicHeight();
+ int scaledHeight = WidgetTestUtils.convertDipToPixels(getActivity(), mMovie.height());
+ assertEquals(expectedHeight, scaledHeight);
+
+ int expectedWidth = getActivity().getResources().getDrawable(MOVIE).getIntrinsicWidth();
+ int scaledWidth = WidgetTestUtils.convertDipToPixels(getActivity(), mMovie.width());
+ assertEquals(expectedWidth, scaledWidth);
+
}
}
\ No newline at end of file
