commit 6b504911a9944bd78ffed093b7d3d806172751d2
author Earl Ou <shunhsingou@google.com> Fri Aug 03 12:28:17 2012 +0800
committer Earl Ou <shunhsingou@google.com> Mon Aug 06 16:32:13 2012 +0800
tree a8488c2c2969f21b521b361395963b3ec8510fb0
parent f2fb2500bb07f756050e5e211e02b94d73633a97

Check number of exif tag in test

Change-Id: Ic84c7c004fe0ab5fcea9a0cc6e7f9d86db61abd8

tests/src/com/android/gallery3d/exif/ExifParserTest.java

diff --git a/tests/src/com/android/gallery3d/exif/ExifParserTest.java b/tests/src/com/android/gallery3d/exif/ExifParserTest.java
index f89b1a2..3c9d276 100644
--- a/tests/src/com/android/gallery3d/exif/ExifParserTest.java
+++ b/tests/src/com/android/gallery3d/exif/ExifParserTest.java
@@ -115,6 +115,7 @@
     private void parseIfd0(IfdParser ifdParser) throws IOException,
             ExifInvalidFormatException {
         int type = ifdParser.next();
+        int tagNumber=0;
         while (type != IfdParser.TYPE_END) {
             switch (type) {
                 case IfdParser.TYPE_NEW_TAG:
@@ -123,6 +124,7 @@
                         ifdParser.waitValueOfTag(tag);
                     } else {
                         checkTag(tag, ifdParser, IFD0_VALUE);
+                        tagNumber++;
                     }
                     break;
                 case IfdParser.TYPE_NEXT_IFD:
@@ -135,15 +137,18 @@
                     break;
                 case IfdParser.TYPE_VALUE_OF_PREV_TAG:
                     checkTag(ifdParser.getCorrespodingExifTag(), ifdParser, IFD0_VALUE);
+                    tagNumber++;
                     break;
             }
             type = ifdParser.next();
         }
+        assertEquals(IFD0_VALUE.size(), tagNumber);
     }
 
     private void parseIfd1(IfdParser ifdParser) throws IOException,
             ExifInvalidFormatException {
         int type = ifdParser.next();
+        int tagNumber = 0;
         while (type != IfdParser.TYPE_END) {
             switch (type) {
                 case IfdParser.TYPE_NEW_TAG:
@@ -152,6 +157,7 @@
                         ifdParser.waitValueOfTag(tag);
                     } else {
                         checkTag(tag, ifdParser, IFD1_VALUE);
+                        tagNumber++;
                     }
                     break;
                 case IfdParser.TYPE_NEXT_IFD:
@@ -162,15 +168,18 @@
                     break;
                 case IfdParser.TYPE_VALUE_OF_PREV_TAG:
                     checkTag(ifdParser.getCorrespodingExifTag(), ifdParser, IFD1_VALUE);
+                    tagNumber++;
                     break;
             }
             type = ifdParser.next();
         }
+        assertEquals(IFD1_VALUE.size(), tagNumber);
     }
 
     private void parseExifIfd(IfdParser ifdParser) throws IOException,
             ExifInvalidFormatException {
         int type = ifdParser.next();
+        int tagNumber = 0;
         while (type != IfdParser.TYPE_END) {
             switch (type) {
                 case IfdParser.TYPE_NEW_TAG:
@@ -179,6 +188,7 @@
                         ifdParser.waitValueOfTag(tag);
                     } else {
                         checkTag(tag, ifdParser, EXIF_IFD_VALUE);
+                        tagNumber++;
                     }
                     break;
                 case IfdParser.TYPE_NEXT_IFD:
@@ -189,10 +199,12 @@
                     break;
                 case IfdParser.TYPE_VALUE_OF_PREV_TAG:
                     checkTag(ifdParser.getCorrespodingExifTag(), ifdParser, EXIF_IFD_VALUE);
+                    tagNumber++;
                     break;
             }
             type = ifdParser.next();
         }
+        assertEquals(EXIF_IFD_VALUE.size(), tagNumber);
     }
 
     private void checkTag(ExifTag tag, IfdParser ifdParser, HashMap<Short, String> truth)