diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-10 16:09:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-10 16:09:52 -0700 |
| commit | 6429cc09b7fdb7c7a67af20b89e2d7c8079d8ae4 (patch) | |
| tree | 9f3876f99e06cc25348c6c150c805b89614b5c03 /tests | |
| parent | 8944541fd2096d621222422f05ae1cbc71515bf7 (diff) | |
| parent | 87d2b41e2b1c4de07ea1cc7b23800058cffd233f (diff) | |
| download | LegacyCamera-6429cc09b7fdb7c7a67af20b89e2d7c8079d8ae4.zip LegacyCamera-6429cc09b7fdb7c7a67af20b89e2d7c8079d8ae4.tar.gz LegacyCamera-6429cc09b7fdb7c7a67af20b89e2d7c8079d8ae4.tar.bz2 | |
Merge change 3377 into donut
* changes:
Fix the unittests due to the change of code.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/android/camera/gallery/ImageListUberUnitTests.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tests/src/com/android/camera/gallery/ImageListUberUnitTests.java b/tests/src/com/android/camera/gallery/ImageListUberUnitTests.java index a123d05..457dbe4 100644 --- a/tests/src/com/android/camera/gallery/ImageListUberUnitTests.java +++ b/tests/src/com/android/camera/gallery/ImageListUberUnitTests.java @@ -14,16 +14,20 @@ public class ImageListUberUnitTests extends AndroidTestCase { listB.addImage(new MockImage(1, 1)); ImageListUber uber = new ImageListUber( new IImageList[] {listA, listB}, ImageManager.SORT_DESCENDING); + uber.open(getContext().getContentResolver()); assertEquals(2, uber.getImageAt(0).fullSizeImageId()); assertEquals(1, uber.getImageAt(1).fullSizeImageId()); assertEquals(0, uber.getImageAt(2).fullSizeImageId()); + uber.close(); uber = new ImageListUber( new IImageList[] {listA, listB}, ImageManager.SORT_DESCENDING); + uber.open(getContext().getContentResolver()); assertEquals(2, uber.getImageAt(0).fullSizeImageId()); assertEquals(1, uber.getImageAt(1).fullSizeImageId()); assertEquals(0, uber.getImageAt(2).fullSizeImageId()); + uber.close(); } public void testTheOrderOfGetImageAtCaseTwo() { @@ -35,17 +39,20 @@ public class ImageListUberUnitTests extends AndroidTestCase { ImageListUber uber = new ImageListUber( new IImageList[] {listB, listA}, ImageManager.SORT_DESCENDING); + uber.open(getContext().getContentResolver()); assertEquals(2, uber.getImageAt(0).fullSizeImageId()); assertEquals(1, uber.getImageAt(1).fullSizeImageId()); assertEquals(0, uber.getImageAt(2).fullSizeImageId()); + uber.close(); uber = new ImageListUber( new IImageList[] {listA, listB}, ImageManager.SORT_DESCENDING); + uber.open(getContext().getContentResolver()); assertEquals(2, uber.getImageAt(0).fullSizeImageId()); assertEquals(1, uber.getImageAt(1).fullSizeImageId()); assertEquals(0, uber.getImageAt(2).fullSizeImageId()); - + uber.close(); } public void testRemoveImage() { @@ -57,12 +64,14 @@ public class ImageListUberUnitTests extends AndroidTestCase { listB.addImage(target); ImageListUber uber = new ImageListUber( new IImageList[] {listB, listA}, ImageManager.SORT_DESCENDING); + uber.open(getContext().getContentResolver()); uber.removeImage(target); assertEquals(2, uber.getImageAt(0).fullSizeImageId()); assertEquals(0, uber.getImageAt(1).fullSizeImageId()); assertEquals(0, uber.getImageIndex(uber.getImageAt(0))); assertEquals(1, uber.getImageIndex(uber.getImageAt(1))); + uber.close(); } public void testRemoveImageAt() { @@ -74,11 +83,13 @@ public class ImageListUberUnitTests extends AndroidTestCase { listB.addImage(target); ImageListUber uber = new ImageListUber( new IImageList[] {listB, listA}, ImageManager.SORT_DESCENDING); + uber.open(getContext().getContentResolver()); uber.removeImageAt(1); assertEquals(2, uber.getImageAt(0).fullSizeImageId()); assertEquals(0, uber.getImageAt(1).fullSizeImageId()); assertEquals(0, uber.getImageIndex(uber.getImageAt(0))); assertEquals(1, uber.getImageIndex(uber.getImageAt(1))); + uber.close(); } } |