diff options
Diffstat (limited to 'tests/src/com/android/gallery3d/exif/ExifReaderTest.java')
-rw-r--r-- | tests/src/com/android/gallery3d/exif/ExifReaderTest.java | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/tests/src/com/android/gallery3d/exif/ExifReaderTest.java b/tests/src/com/android/gallery3d/exif/ExifReaderTest.java index 40d269ef6..82dcdc7b1 100644 --- a/tests/src/com/android/gallery3d/exif/ExifReaderTest.java +++ b/tests/src/com/android/gallery3d/exif/ExifReaderTest.java @@ -111,18 +111,13 @@ public class ExifReaderTest extends ExifXmlDataTestCase { return; } ExifTag[] tags = ifd.getAllTags(); - int size = 0; for (ExifTag tag : tags) { - if (ExifTag.isSubIfdOffsetTag(tag.getTagId()) - || tag.getTagId() == ExifTag.TAG_MAKER_NOTE) continue; - if (tag.getTagId() != ExifTag.TAG_USER_COMMENT) { - Set<String> truth = ifdValue.get(tag.getTagId()); - assertNotNull(String.format("Tag %x, ", tag.getTagId()) + getImageTitle(), truth); - assertTrue(String.format("Tag %x, ", tag.getTagId()) + getImageTitle(), - truth.contains(tag.valueToString().trim())); - } - size++; + Set<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(), + truth.contains(tag.valueToString().trim())); } - assertEquals(getImageTitle(), ifdValue.size(), size); + assertEquals(getImageTitle(), ifdValue.size(), tags.length); } } |