diff --git a/Tests/Data/nikonD610.jpg.app1.0 b/Tests/Data/nikonD610.jpg.app1.0 deleted file mode 100644 index ae0cdc9a6..000000000 Binary files a/Tests/Data/nikonD610.jpg.app1.0 and /dev/null differ diff --git a/Tests/Data/nikonD750.jpg.app1.0 b/Tests/Data/nikonD750.jpg.app1.0 deleted file mode 100644 index 3c91f354a..000000000 Binary files a/Tests/Data/nikonD750.jpg.app1.0 and /dev/null differ diff --git a/Tests/com/drew/metadata/exif/NikonType2MakernoteTest2.java b/Tests/com/drew/metadata/exif/NikonType2MakernoteTest2.java index 1e94c9117..80ef6c576 100644 --- a/Tests/com/drew/metadata/exif/NikonType2MakernoteTest2.java +++ b/Tests/com/drew/metadata/exif/NikonType2MakernoteTest2.java @@ -59,29 +59,6 @@ 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)