summaryrefslogtreecommitdiffstats
path: root/tests/src/com/android
diff options
context:
space:
mode:
authorAngus Kong <shkong@google.com>2012-12-18 22:52:34 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-12-18 22:52:35 -0800
commit74898c35335554397b0cf37a54f5786e97706186 (patch)
tree72e3036ba0a0e8366e0f857311d9b6d80453ec12 /tests/src/com/android
parent2df5f8e5197ef6091877a2c13217ecd823738785 (diff)
parentcf6255422bf2751d160c1384895ddae3eeea66b4 (diff)
downloadandroid_packages_apps_Snap-74898c35335554397b0cf37a54f5786e97706186.zip
android_packages_apps_Snap-74898c35335554397b0cf37a54f5786e97706186.tar.gz
android_packages_apps_Snap-74898c35335554397b0cf37a54f5786e97706186.tar.bz2
Merge "ExifModifier" into gb-ub-photos-bryce
Diffstat (limited to 'tests/src/com/android')
-rw-r--r--tests/src/com/android/gallery3d/exif/ExifModifierTest.java172
-rw-r--r--tests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java3
-rw-r--r--tests/src/com/android/gallery3d/exif/ExifTestRunner.java1
3 files changed, 175 insertions, 1 deletions
diff --git a/tests/src/com/android/gallery3d/exif/ExifModifierTest.java b/tests/src/com/android/gallery3d/exif/ExifModifierTest.java
new file mode 100644
index 0000000..14e956f
--- /dev/null
+++ b/tests/src/com/android/gallery3d/exif/ExifModifierTest.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.gallery3d.exif;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel.MapMode;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class ExifModifierTest extends ExifXmlDataTestCase {
+
+ private File mTmpFile;
+ private List<Map<Short, List<String>>> mGroundTruth;
+
+ // TYPE_UNDEFINED with 4 components
+ private static final ExifTag sVersionTag = ExifTag.buildTag(ExifTag.TAG_EXIF_VERSION);
+ // TYPE_UNSIGNED_BYTE with 4 components
+ private static final ExifTag sGpsVersionTag = ExifTag.buildTag(ExifTag.TAG_GPS_VERSION_ID);
+ // TYPE ASCII with arbitary length
+ private static final ExifTag sModelTag = ExifTag.buildTag(ExifTag.TAG_MODEL);
+ // TYPE_ASCII with 20 components
+ private static final ExifTag sDateTimeTag = ExifTag.buildTag(ExifTag.TAG_DATE_TIME);
+ // TYPE_UNSIGNED_SHORT with 1 components
+ private static final ExifTag sCompressionTag = ExifTag.buildTag(ExifTag.TAG_COMPRESSION);
+ // TYPE_UNSIGNED_LONG with 1 components
+ private static final ExifTag sThumbnailFormatTag =
+ ExifTag.buildTag(ExifTag.TAG_JPEG_INTERCHANGE_FORMAT);
+ // TYPE_UNSIGNED_RATIONAL with 3 components
+ private static final ExifTag sLongitudeTag = ExifTag.buildTag(ExifTag.TAG_GPS_LONGITUDE);
+ // TYPE_RATIONAL with 1 components
+ private static final ExifTag sShutterTag = ExifTag.buildTag(ExifTag.TAG_SHUTTER_SPEED_VALUE);
+
+ private static final Map<Short, ExifTag> sTestTags = new HashMap<Short, ExifTag>();
+
+ static {
+ sVersionTag.setValue(new byte[] {1, 2, 3, 4});
+ sGpsVersionTag.setValue(new byte[] {4, 3, 2, 1});
+ sModelTag.setValue("end-of-the-world");
+ sDateTimeTag.setValue("2012:12:31 23:59:59");
+ sCompressionTag.setValue(100);
+ sThumbnailFormatTag.setValue(100);
+ sLongitudeTag.setValue(new Rational[] {new Rational(1, 1), new Rational(10, 10),
+ new Rational(100, 100)});
+ sShutterTag.setValue(new Rational(1, 1));
+
+ sTestTags.put(sVersionTag.getTagId(), sVersionTag);
+ sTestTags.put(sGpsVersionTag.getTagId(), sGpsVersionTag);
+ sTestTags.put(sModelTag.getTagId(), sModelTag);
+ sTestTags.put(sDateTimeTag.getTagId(), sDateTimeTag);
+ sTestTags.put(sCompressionTag.getTagId(), sCompressionTag);
+ sTestTags.put(sThumbnailFormatTag.getTagId(), sThumbnailFormatTag);
+ sTestTags.put(sLongitudeTag.getTagId(), sLongitudeTag);
+ sTestTags.put(sShutterTag.getTagId(), sShutterTag);
+ }
+
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ mGroundTruth = ExifXmlReader.readXml(getXmlParser());
+ mTmpFile = File.createTempFile("exif_test", ".jpg");
+ FileOutputStream os = null;
+ InputStream is = getImageInputStream();
+ try {
+ os = new FileOutputStream(mTmpFile);
+ byte[] buf = new byte[1024];
+ int n;
+ while ((n = is.read(buf)) > 0) {
+ os.write(buf, 0, n);
+ }
+ } finally {
+ Util.closeSilently(os);
+ }
+ }
+
+ public ExifModifierTest(int imageRes, int xmlRes) {
+ super(imageRes, xmlRes);
+ }
+
+ public ExifModifierTest(String imagePath, String xmlPath) {
+ super(imagePath, xmlPath);
+ }
+
+ public void testModify() throws Exception {
+ Map<Short, Boolean> results = new HashMap<Short, Boolean>();
+
+ RandomAccessFile file = null;
+ try {
+ file = new RandomAccessFile(mTmpFile, "rw");
+ MappedByteBuffer buf = file.getChannel().map(MapMode.READ_WRITE, 0, file.length());
+ for (ExifTag tag: sTestTags.values()) {
+ ExifModifier modifier = new ExifModifier(buf);
+ modifier.modifyTag(tag);
+ boolean result = modifier.commit();
+ results.put(tag.getTagId(), result);
+ buf.force();
+ buf.position(0);
+
+ if (!result) {
+ List<String> value = mGroundTruth.get(tag.getIfd()).get(tag.getTagId());
+ assertTrue (String.format("Tag %x, ", tag.getTagId()) + getImageTitle(),
+ value == null || tag.getTagId() == ExifTag.TAG_MODEL);
+ }
+ }
+ } finally {
+ Util.closeSilently(file);
+ }
+
+ // Parse the new file and check the result
+ InputStream is = null;
+ try {
+ is = new FileInputStream(mTmpFile);
+ ExifData data = new ExifReader().read(is);
+ for (int i = 0; i < IfdId.TYPE_IFD_COUNT; i++) {
+ checkIfd(data.getIfdData(i), mGroundTruth.get(i), results);
+ }
+ } finally {
+ Util.closeSilently(is);
+ }
+
+ }
+
+
+ private void checkIfd(IfdData ifd, Map<Short, List<String>> ifdValue,
+ Map<Short, Boolean> results) {
+ if (ifd == null) {
+ assertEquals(getImageTitle(), 0 ,ifdValue.size());
+ return;
+ }
+ ExifTag[] tags = ifd.getAllTags();
+ for (ExifTag tag : tags) {
+ List<String> truth = ifdValue.get(tag.getTagId());
+ assertNotNull(String.format("Tag %x, ", tag.getTagId()) + getImageTitle(), truth);
+ if (truth.contains(null)) continue;
+
+ ExifTag newTag = sTestTags.get(tag.getTagId());
+ if (newTag != null
+ && results.get(tag.getTagId())) {
+ assertEquals(String.format("Tag %x, ", tag.getTagId()) + getImageTitle(),
+ Util.tagValueToString(newTag), Util.tagValueToString(tag));
+ } else {
+ assertTrue(String.format("Tag %x, ", tag.getTagId()) + getImageTitle(),
+ truth.contains(Util.tagValueToString(tag).trim()));
+ }
+ }
+ assertEquals(getImageTitle(), ifdValue.size(), tags.length);
+ }
+
+ @Override
+ public void tearDown() throws Exception {
+ super.tearDown();
+ mTmpFile.delete();
+ }
+}
diff --git a/tests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java b/tests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
index 8c98fa0..789fd35 100644
--- a/tests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
+++ b/tests/src/com/android/gallery3d/exif/ExifOutputStreamTest.java
@@ -103,7 +103,8 @@ public class ExifOutputStreamTest extends ExifXmlDataTestCase {
}
@Override
- public void tearDown() {
+ public void tearDown() throws Exception {
+ super.tearDown();
mTmpFile.delete();
}
}
diff --git a/tests/src/com/android/gallery3d/exif/ExifTestRunner.java b/tests/src/com/android/gallery3d/exif/ExifTestRunner.java
index 519e871..b094263 100644
--- a/tests/src/com/android/gallery3d/exif/ExifTestRunner.java
+++ b/tests/src/com/android/gallery3d/exif/ExifTestRunner.java
@@ -56,6 +56,7 @@ public class ExifTestRunner extends InstrumentationTestRunner {
addAllTestsFromExifTestCase(ExifParserTest.class, suite);
addAllTestsFromExifTestCase(ExifReaderTest.class, suite);
addAllTestsFromExifTestCase(ExifOutputStreamTest.class, suite);
+ addAllTestsFromExifTestCase(ExifModifierTest.class, suite);
return suite;
}