From a91468565ff600e082c29aec6433c51a19f26b07 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 3 Oct 2014 03:29:08 +0200 Subject: use iterator interface exclusively in ParcelableFileCache --- .../keychain/util/ParcelableFileCacheTest.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'OpenKeychain-Test') diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/ParcelableFileCacheTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/ParcelableFileCacheTest.java index ba9ba7369..7f473c345 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/ParcelableFileCacheTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/util/ParcelableFileCacheTest.java @@ -29,6 +29,7 @@ import org.robolectric.RobolectricTestRunner; import org.robolectric.shadows.ShadowLog; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; @RunWith(RobolectricTestRunner.class) @@ -55,16 +56,19 @@ public class ParcelableFileCacheTest { } // write to cache file - cache.writeCache(list); + cache.writeCache(list.size(), list.iterator()); // read back - List last = cache.readCacheIntoList(); + Iterator it = cache.readCache(); - for (int i = 0; i < list.size(); i++) { + Assert.assertEquals("number of entries must be correct", list.size(), cache.getNumEntries()); + + while (it.hasNext()) { + Bundle b = it.next(); Assert.assertEquals("input values should be equal to output values", - list.get(i).getInt("key1"), last.get(i).getInt("key1")); + b.getInt("key1"), b.getInt("key1")); Assert.assertEquals("input values should be equal to output values", - list.get(i).getString("key2"), last.get(i).getString("key2")); + b.getString("key2"), b.getString("key2")); } } -- cgit v1.2.3