summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorEarl Ou <shunhsingou@google.com>2012-08-30 16:07:08 +0800
committerEarl Ou <shunhsingou@google.com>2012-09-19 19:02:57 +0800
commitb5b30a05b575cac7b00e5f793004900307c3cbc6 (patch)
tree06933de5f7d8fb516ec9b5da6aca0f2ae836131f /tests
parenta7f4e15ea94735e31739dd1122ed97018a552dfd (diff)
downloadandroid_packages_apps_Snap-b5b30a05b575cac7b00e5f793004900307c3cbc6.tar.gz
android_packages_apps_Snap-b5b30a05b575cac7b00e5f793004900307c3cbc6.tar.bz2
android_packages_apps_Snap-b5b30a05b575cac7b00e5f793004900307c3cbc6.zip
Simplify the usage of ExifData
Bug:7192363 Change-Id: I2c6ab9974f4472f63483a4de814728584944535e
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/gallery3d/exif/ExifParserTest.java2
-rw-r--r--tests/src/com/android/gallery3d/exif/ExifReaderTest.java6
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/src/com/android/gallery3d/exif/ExifParserTest.java b/tests/src/com/android/gallery3d/exif/ExifParserTest.java
index 1af106f3b..549fb0681 100644
--- a/tests/src/com/android/gallery3d/exif/ExifParserTest.java
+++ b/tests/src/com/android/gallery3d/exif/ExifParserTest.java
@@ -103,7 +103,7 @@ public class ExifParserTest extends InstrumentationTestCase {
}
String truthString = truth.get(tag.getTagId());
- String dataString = tag.valueToString();
+ String dataString = tag.valueToString().trim();
if (truthString == null) {
fail(String.format("Unknown Tag %02x", tag.getTagId()));
}
diff --git a/tests/src/com/android/gallery3d/exif/ExifReaderTest.java b/tests/src/com/android/gallery3d/exif/ExifReaderTest.java
index 236c0aea2..74b8bd3d8 100644
--- a/tests/src/com/android/gallery3d/exif/ExifReaderTest.java
+++ b/tests/src/com/android/gallery3d/exif/ExifReaderTest.java
@@ -105,7 +105,7 @@ public class ExifReaderTest extends InstrumentationTestCase {
assertEquals(byteCountTag.getUnsignedShort(i), exifData.getStrip(i).length);
} else {
assertEquals(
- byteCountTag.getUnsignedInt(i), exifData.getStrip(i).length);
+ byteCountTag.getUnsignedLong(i), exifData.getStrip(i).length);
}
}
}
@@ -116,7 +116,7 @@ public class ExifReaderTest extends InstrumentationTestCase {
if (tag.getDataType() == ExifTag.TYPE_UNSIGNED_SHORT) {
return tag.getUnsignedShort(0);
} else {
- return (int) tag.getUnsignedInt(0);
+ return (int) tag.getUnsignedLong(0);
}
}
@@ -127,7 +127,7 @@ public class ExifReaderTest extends InstrumentationTestCase {
}
ExifTag[] tags = ifd.getAllTags();
for (ExifTag tag : tags) {
- assertEquals(ifdValue.get(tag.getTagId()), tag.valueToString());
+ assertEquals(ifdValue.get(tag.getTagId()), tag.valueToString().trim());
}
assertEquals(ifdValue.size(), tags.length);
}