diff options
Diffstat (limited to 'tests/src/com/android/gallery3d/exif/ExifParserTest.java')
| -rw-r--r-- | tests/src/com/android/gallery3d/exif/ExifParserTest.java | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/tests/src/com/android/gallery3d/exif/ExifParserTest.java b/tests/src/com/android/gallery3d/exif/ExifParserTest.java index c93e09a4c..eb5a5742a 100644 --- a/tests/src/com/android/gallery3d/exif/ExifParserTest.java +++ b/tests/src/com/android/gallery3d/exif/ExifParserTest.java @@ -76,20 +76,15 @@ public class ExifParserTest extends ExifXmlDataTestCase { } private void checkTag(ExifTag tag) { - // Ignore offset tags since the ground-truth from exiftool doesn't have it. - // We can verify it by examining the sub-IFD or thumbnail itself. - if (ExifTag.isSubIfdOffsetTag(tag.getTagId())) return; - - // TODO: Test MakerNote and UserComment - if (tag.getTagId() == ExifTag.TAG_MAKER_NOTE - || tag.getTagId() == ExifTag.TAG_USER_COMMENT) return; - Set<String> truth = mGroundTruth.get(tag.getIfd()).get(tag.getTagId()); if (truth == null) { fail(String.format("Unknown Tag %02x", tag.getTagId()) + ", " + getImageTitle()); } + // No value from exiftool. + if (truth.contains(null)) return; + String dataString = tag.valueToString().trim(); assertTrue(String.format("Tag %02x", tag.getTagId()) + ", " + getImageTitle() + ": " + dataString, @@ -109,9 +104,7 @@ public class ExifParserTest extends ExifXmlDataTestCase { break; case ExifParser.EVENT_NEW_TAG: ExifTag tag = parser.getTag(); - // The exiftool doesn't provide MakerNote tag - if (!ExifTag.isSubIfdOffsetTag(tag.getTagId()) - && tag.getTagId() != ExifTag.TAG_MAKER_NOTE) numOfTag++; + numOfTag++; if (tag.hasValue()) { checkTag(tag); } else { |