diff options
| author | Earl Ou <shunhsingou@google.com> | 2012-10-18 17:08:21 +0800 |
|---|---|---|
| committer | Earl Ou <shunhsingou@google.com> | 2012-10-24 11:13:21 +0800 |
| commit | 08b5e19052a9e5ee7c53ebf5911f86ffbe8f1f4c (patch) | |
| tree | bbb9dfbb734c285d0d1050b3f00b75b87dcacce3 /tests/src/com/android/gallery3d/exif/ExifReaderTest.java | |
| parent | b44cda6719c265fc9108090efe2b4f7b302c7874 (diff) | |
| download | android_packages_apps_Gallery2-08b5e19052a9e5ee7c53ebf5911f86ffbe8f1f4c.tar.gz android_packages_apps_Gallery2-08b5e19052a9e5ee7c53ebf5911f86ffbe8f1f4c.tar.bz2 android_packages_apps_Gallery2-08b5e19052a9e5ee7c53ebf5911f86ffbe8f1f4c.zip | |
Use List to store duplicated exif tag
Use List so the number of tags can be calculated.
Change-Id: I5dfb085fccadab4f0febf2944b64d4dfe9ecbd63
Diffstat (limited to 'tests/src/com/android/gallery3d/exif/ExifReaderTest.java')
| -rw-r--r-- | tests/src/com/android/gallery3d/exif/ExifReaderTest.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/src/com/android/gallery3d/exif/ExifReaderTest.java b/tests/src/com/android/gallery3d/exif/ExifReaderTest.java index 82dcdc7b1..404946252 100644 --- a/tests/src/com/android/gallery3d/exif/ExifReaderTest.java +++ b/tests/src/com/android/gallery3d/exif/ExifReaderTest.java @@ -20,7 +20,6 @@ import android.graphics.BitmapFactory; import java.util.List; import java.util.Map; -import java.util.Set; public class ExifReaderTest extends ExifXmlDataTestCase { private static final String TAG = "ExifReaderTest"; @@ -37,7 +36,7 @@ public class ExifReaderTest extends ExifXmlDataTestCase { try { ExifReader reader = new ExifReader(); ExifData exifData = reader.read(getImageInputStream()); - List<Map<Short, Set<String>>> groundTruth = ExifXmlReader.readXml(getXmlParser()); + List<Map<Short, List<String>>> groundTruth = ExifXmlReader.readXml(getXmlParser()); for (int i = 0; i < IfdId.TYPE_IFD_COUNT; i++) { checkIfd(exifData.getIfdData(i), groundTruth.get(i)); } @@ -105,14 +104,14 @@ public class ExifReaderTest extends ExifXmlDataTestCase { } } - private void checkIfd(IfdData ifd, Map<Short, Set<String>> ifdValue) { + private void checkIfd(IfdData ifd, Map<Short, List<String>> ifdValue) { if (ifd == null) { assertEquals(getImageTitle(), 0 ,ifdValue.size()); return; } ExifTag[] tags = ifd.getAllTags(); for (ExifTag tag : tags) { - Set<String> truth = ifdValue.get(tag.getTagId()); + List<String> truth = ifdValue.get(tag.getTagId()); assertNotNull(String.format("Tag %x, ", tag.getTagId()) + getImageTitle(), truth); if (truth.contains(null)) continue; assertTrue(String.format("Tag %x, ", tag.getTagId()) + getImageTitle(), |