commit 0a006b8ed35c78a3d615b67af5bc92cf4b271ca4
author John Spurlock <jspurlock@google.com> Mon Nov 11 18:02:30 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 11 18:02:30 2013 +0000
tree 5f5ea9247dacf583ed76df7e43f2552d3302620f
parent 0d95f5db56446ddccf3a43607f30d2d374e642e4
parent c773cba558e718217cfdd508ea016cb0766a9fbc

Merge "Update WallpaperManager CTS test." into klp-dev

tests/tests/app/src/android/app/cts/WallpaperManagerTest.java

diff --git a/tests/tests/app/src/android/app/cts/WallpaperManagerTest.java b/tests/tests/app/src/android/app/cts/WallpaperManagerTest.java
index 62e00e9..e27c83f 100644
--- a/tests/tests/app/src/android/app/cts/WallpaperManagerTest.java
+++ b/tests/tests/app/src/android/app/cts/WallpaperManagerTest.java
@@ -17,7 +17,10 @@
 package android.app.cts;
 
 import android.app.WallpaperManager;
+import android.content.Context;
 import android.test.AndroidTestCase;
+import android.view.Display;
+import android.view.WindowManager;
 
 public class WallpaperManagerTest extends AndroidTestCase {
 
@@ -30,10 +33,30 @@
     }
 
     public void testSuggestDesiredDimensions() {
-        mWallpaperManager.suggestDesiredDimensions(320, 480);
-        int desiredMinimumWidth = mWallpaperManager.getDesiredMinimumWidth();
-        int desiredMinimumHeight = mWallpaperManager.getDesiredMinimumHeight();
-        assertEquals(320, desiredMinimumWidth);
-        assertEquals(480, desiredMinimumHeight);
+        int max = getMaximumSizeDimension();
+        int w = max * 3;
+        int h = max * 2;
+
+        mWallpaperManager.suggestDesiredDimensions(max / 2, max / 2);
+        assertEquals(max, mWallpaperManager.getDesiredMinimumWidth());
+        assertEquals(max, mWallpaperManager.getDesiredMinimumHeight());
+
+        mWallpaperManager.suggestDesiredDimensions(w, h);
+        assertEquals(w, mWallpaperManager.getDesiredMinimumWidth());
+        assertEquals(h, mWallpaperManager.getDesiredMinimumHeight());
+
+        mWallpaperManager.suggestDesiredDimensions(max / 2, h);
+        assertEquals(max, mWallpaperManager.getDesiredMinimumWidth());
+        assertEquals(h, mWallpaperManager.getDesiredMinimumHeight());
+
+        mWallpaperManager.suggestDesiredDimensions(w, max / 2);
+        assertEquals(w, mWallpaperManager.getDesiredMinimumWidth());
+        assertEquals(max, mWallpaperManager.getDesiredMinimumHeight());
+    }
+
+    private int getMaximumSizeDimension() {
+        WindowManager wm = (WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE);
+        Display d = wm.getDefaultDisplay();
+        return d.getMaximumSizeDimension();
     }
 }