diff options
Diffstat (limited to 'tests/src')
-rw-r--r-- | tests/src/com/android/gallery3d/data/LocalDataTest.java | 6 | ||||
-rw-r--r-- | tests/src/com/android/gallery3d/data/MockSet.java | 9 | ||||
-rw-r--r-- | tests/src/com/android/gallery3d/data/RealDataTest.java | 6 |
3 files changed, 13 insertions, 8 deletions
diff --git a/tests/src/com/android/gallery3d/data/LocalDataTest.java b/tests/src/com/android/gallery3d/data/LocalDataTest.java index 8f6a46b8e..67fc97ac3 100644 --- a/tests/src/com/android/gallery3d/data/LocalDataTest.java +++ b/tests/src/com/android/gallery3d/data/LocalDataTest.java @@ -66,7 +66,7 @@ public class LocalDataTest extends AndroidTestCase { Path path = Path.fromString( mIsImage ? "/local/image" : "/local/video"); mAlbumSet = new LocalAlbumSet(path, mApp); - mAlbumSet.reload(); + mAlbumSet.loadIfDirty(); verifyResult(); } @@ -200,7 +200,7 @@ public class LocalDataTest extends AndroidTestCase { sub.delete(); mAlbumSet.fakeChange(); latch.isOnContentDirtyBeCalled(DEFAULT_TIMEOUT); - mAlbumSet.reload(); + mAlbumSet.loadIfDirty(); assertEquals(1, mAlbumSet.getSubMediaSetCount()); } } @@ -220,7 +220,7 @@ public class LocalDataTest extends AndroidTestCase { assertEquals(1, sub.getMediaItemCount()); assertTrue((sub.getSupportedOperations() & MediaSet.SUPPORT_DELETE) != 0); sub.delete(); - sub.reload(); + sub.loadIfDirty(); assertEquals(0, sub.getMediaItemCount()); } } diff --git a/tests/src/com/android/gallery3d/data/MockSet.java b/tests/src/com/android/gallery3d/data/MockSet.java index fa83c796f..42f874bdc 100644 --- a/tests/src/com/android/gallery3d/data/MockSet.java +++ b/tests/src/com/android/gallery3d/data/MockSet.java @@ -82,7 +82,12 @@ public class MockSet extends MediaSet { } @Override - public long reload() { - return 0; + protected boolean isDirtyLocked() { + return false; } + + @Override + protected void load() throws InterruptedException { + } + } diff --git a/tests/src/com/android/gallery3d/data/RealDataTest.java b/tests/src/com/android/gallery3d/data/RealDataTest.java index 526cfe357..7a984ef93 100644 --- a/tests/src/com/android/gallery3d/data/RealDataTest.java +++ b/tests/src/com/android/gallery3d/data/RealDataTest.java @@ -53,7 +53,7 @@ public class RealDataTest extends AndroidTestCase { class TestLocalImage { public void run() { MediaSet set = mDataManager.getMediaSet("/local/image"); - set.reload(); + set.loadIfDirty(); Log.v(TAG, "LocalAlbumSet (Image)"); dumpMediaSet(set, ""); } @@ -62,7 +62,7 @@ public class RealDataTest extends AndroidTestCase { class TestLocalVideo { public void run() { MediaSet set = mDataManager.getMediaSet("/local/video"); - set.reload(); + set.loadIfDirty(); Log.v(TAG, "LocalAlbumSet (Video)"); dumpMediaSet(set, ""); } @@ -71,7 +71,7 @@ public class RealDataTest extends AndroidTestCase { class TestPicasa implements Runnable { public void run() { MediaSet set = mDataManager.getMediaSet("/picasa"); - set.reload(); + set.loadIfDirty(); Log.v(TAG, "PicasaAlbumSet"); dumpMediaSet(set, ""); } |