summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Ou <shunhsingou@google.com>2012-08-01 02:21:55 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-01 02:21:56 -0700
commit1819ed3baf83be8476ba82f7854f5c2d17c0fcf0 (patch)
tree4ce252de79d0d35a21fdd3502083078690fda8d1
parent6b2598542c0650fe9acd94df29fb09a7ba10264a (diff)
parentdbbfed236dc1bb81826ea87e9e2cd09aa141cb8d (diff)
downloadandroid_packages_apps_Snap-1819ed3baf83be8476ba82f7854f5c2d17c0fcf0.tar.gz
android_packages_apps_Snap-1819ed3baf83be8476ba82f7854f5c2d17c0fcf0.tar.bz2
android_packages_apps_Snap-1819ed3baf83be8476ba82f7854f5c2d17c0fcf0.zip
Merge "Test skip to next ifd in ExifParserTest" into gb-ub-photos-arches
-rw-r--r--tests/src/com/android/gallery3d/exif/ExifParserTest.java25
1 files changed, 25 insertions, 0 deletions
diff --git a/tests/src/com/android/gallery3d/exif/ExifParserTest.java b/tests/src/com/android/gallery3d/exif/ExifParserTest.java
index 91e1d37aa..0c160f21a 100644
--- a/tests/src/com/android/gallery3d/exif/ExifParserTest.java
+++ b/tests/src/com/android/gallery3d/exif/ExifParserTest.java
@@ -260,6 +260,31 @@ public class ExifParserTest extends ActivityTestCase {
return sbuilder.toString();
}
+ public void testSkipToNextIfd() throws ExifInvalidFormatException, IOException {
+ ExifParser exifParser = new ExifParser();
+ IfdParser ifdParser = exifParser.parse(mImageInputStream);
+ int type = ifdParser.next();
+ while (type != IfdParser.TYPE_END) {
+ switch (type) {
+ case IfdParser.TYPE_NEW_TAG:
+ // Do nothing, we don't care
+ break;
+ case IfdParser.TYPE_NEXT_IFD:
+ parseIfd1(ifdParser.parseIfdBlock());
+ break;
+ case IfdParser.TYPE_SUB_IFD:
+ // We won't get this since to skip everything
+ assertTrue(false);
+ break;
+ case IfdParser.TYPE_VALUE_OF_PREV_TAG:
+ // We won't get this since to skip everything
+ assertTrue(false);
+ break;
+ }
+ type = ifdParser.next();
+ }
+ }
+
@Override
protected void tearDown() throws IOException {
mImageInputStream.close();