Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 72da3a46: am c404ed2b: Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.

Browse Source 
Merge commit '72da3a467e46453e87549492ccec47e1feda6fe2' into eclair-mr2-plus-aosp

* commit '72da3a467e46453e87549492ccec47e1feda6fe2':
  Fix failing unit test; the test was using a deprecated API making it fail on WVGA devices.
This commit is contained in:
Romain Guy
2009-10-06 19:28:01 -07:00
committed by Android Git Automerger
parent 84a379cc06 72da3a467e
commit dba9981588
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/FrameworkTest/tests/src/com/android/frameworktest/view/BigCacheTest.java
View File

@@ -55,14 +55,14 @@ public class BigCacheTest extends ActivityInstrumentationTestCase<BigCache> {
@MediumTest @MediumTest
public void testDrawingCacheBelowMaximumSize() throws Exception { public void testDrawingCacheBelowMaximumSize() throws Exception {
final int max = ViewConfiguration.getMaximumDrawingCacheSize(); final int max = ViewConfiguration.get(getActivity()).getScaledMaximumDrawingCacheSize();
assertTrue(mTiny.getWidth() * mTiny.getHeight() * 2 < max); assertTrue(mTiny.getWidth() * mTiny.getHeight() * 2 < max);
assertNotNull(createCacheForView(mTiny)); assertNotNull(createCacheForView(mTiny));
} }
@MediumTest @MediumTest
public void testDrawingCacheAboveMaximumSize() throws Exception { public void testDrawingCacheAboveMaximumSize() throws Exception {
final int max = ViewConfiguration.getMaximumDrawingCacheSize(); final int max = ViewConfiguration.get(getActivity()).getScaledMaximumDrawingCacheSize();
assertTrue(mLarge.getWidth() * mLarge.getHeight() * 2 > max); assertTrue(mLarge.getWidth() * mLarge.getHeight() * 2 > max);
assertNull(createCacheForView(mLarge)); assertNull(createCacheForView(mLarge));
} }