added back tests with APP1 segment

drewnoakes · Nov 14, 2023 · 526eef0 · 526eef0
1 parent 9a671dc
commit 526eef0
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/Tests/Data/nikonD610.jpg.app1.0 b/Tests/Data/nikonD610.jpg.app1.0
diff --git a/Tests/Data/nikonD750.jpg.app1.0 b/Tests/Data/nikonD750.jpg.app1.0
diff --git a/Tests/com/drew/metadata/exif/NikonType2MakernoteTest2.java b/Tests/com/drew/metadata/exif/NikonType2MakernoteTest2.java
@@ -21,7 +21,10 @@
 package com.drew.metadata.exif;
 
 import com.drew.lang.Rational;
+import com.drew.metadata.Directory;
 import com.drew.metadata.Metadata;
+import com.drew.metadata.exif.makernotes.NikonPictureControl1Directory;
+import com.drew.metadata.exif.makernotes.NikonPictureControl2Directory;
 import com.drew.metadata.exif.makernotes.NikonType2MakernoteDirectory;
 import org.junit.Before;
 import org.junit.Test;
@@ -56,6 +59,29 @@ public void setUp() throws Exception
         assertNotNull(_exifSubIFDDirectory);
     }
 
+
+    @Test
+    public void testNikonPictureControl1Directory() throws Exception {
+        Metadata metadata =   ExifReaderTest.processBytes("Tests/Data/nikonD610.jpg.app1.0");
+
+        Directory directory = metadata.getFirstDirectoryOfType(NikonPictureControl1Directory.class);
+        assertNotNull(directory);
+        assertEquals( "0100", directory.getDescription(NikonPictureControl1Directory.TAG_PICTURE_CONTROL_VERSION));
+        assertEquals( "STANDARD", directory.getDescription(NikonPictureControl1Directory.TAG_PICTURE_CONTROL_NAME));
+        assertEquals( "STANDARD", directory.getDescription(NikonPictureControl1Directory.TAG_PICTURE_CONTROL_BASE));
+        assertEquals( "Default Settings", directory.getDescription(NikonPictureControl1Directory.TAG_PICTURE_CONTROL_ADJUST));
+    }
+    @Test
+    public void testNikonPictureControl2Directory() throws Exception {
+        Metadata metadata =  ExifReaderTest.processBytes("Tests/Data/nikonD750.jpg.app1.0");
+        Directory directory = metadata.getFirstDirectoryOfType(NikonPictureControl2Directory.class);
+        assertNotNull(directory);
+        assertEquals( "0200", directory.getDescription(NikonPictureControl2Directory.TAG_PICTURE_CONTROL_VERSION));
+        assertEquals( "STANDARD", directory.getDescription(NikonPictureControl2Directory.TAG_PICTURE_CONTROL_NAME));
+        assertEquals( "STANDARD", directory.getDescription(NikonPictureControl2Directory.TAG_PICTURE_CONTROL_BASE));
+        assertEquals( "Default Settings", directory.getDescription(NikonPictureControl2Directory.TAG_PICTURE_CONTROL_ADJUST));
+    }
+
     /*
         [Nikon Makernote] Makernote Unknown 1 =
         [Nikon Makernote] ISO Setting = Unknown (0 0)