commit 4bd07a687f0c20879b3894c6949febd30ae59a96
author Ray Chen <raychen@google.com> Wed May 05 18:23:19 2010 -0700
committer Ray Chen <raychen@google.com> Fri May 07 15:58:56 2010 -0700
tree feeb7681be498333b86ebb12b060b64db2e19845
parent d46dcc34acdf869f2c089de14483ce341a8e0a46

Fix issue 2586129: CTS test fails for testQueryExternalMiniThumbnails.

Change-Id: Ifada9dd6d570da6ec3e1b3a1ee24de2e2c9f79af
http://b/2586129

tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java

diff --git a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
index 593de97..98ad62e 100644
--- a/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/MediaStore_Images_ThumbnailsTest.java
@@ -35,6 +35,7 @@
 import android.provider.MediaStore.Images.Media;
 import android.provider.MediaStore.Images.Thumbnails;
 import android.test.InstrumentationTestCase;
+import android.util.Log;
 
 import java.util.ArrayList;
 
@@ -160,14 +161,14 @@
         c = Thumbnails.queryMiniThumbnail(mContentResolver, imageId, Thumbnails.MINI_KIND,
                 sizeProjection);
         assertEquals(1, c.getCount());
-        c.moveToFirst();
-        assertEquals(320, c.getLong(c.getColumnIndex(Thumbnails.WIDTH)));
-        assertEquals(240, c.getLong(c.getColumnIndex(Thumbnails.HEIGHT)));
+        assertTrue(c.moveToFirst());
+        assertTrue(c.getLong(c.getColumnIndex(Thumbnails.WIDTH)) >= Math.min(src.getWidth(), 240));
+        assertTrue(c.getLong(c.getColumnIndex(Thumbnails.HEIGHT)) >= Math.min(src.getHeight(), 240));
         c.close();
         c = Thumbnails.queryMiniThumbnail(mContentResolver, imageId, Thumbnails.MICRO_KIND,
                 sizeProjection);
         assertEquals(1, c.getCount());
-        c.moveToFirst();
+        assertTrue(c.moveToFirst());
         assertEquals(50, c.getLong(c.getColumnIndex(Thumbnails.WIDTH)));
         assertEquals(50, c.getLong(c.getColumnIndex(Thumbnails.HEIGHT)));
         c.close();