|
|
|
@ -28,8 +28,8 @@ class OutputTagExtract(metaclass=system_tests.CaseMeta):
|
|
|
|
|
tmp = line.split()
|
|
|
|
|
|
|
|
|
|
exif, image, tag = tmp[0].split('.')
|
|
|
|
|
self.assertEquals(exif, "Exif")
|
|
|
|
|
self.assertEquals(image, "Image")
|
|
|
|
|
self.assertEqual(exif, "Exif")
|
|
|
|
|
self.assertEqual(image, "Image")
|
|
|
|
|
|
|
|
|
|
data.append({
|
|
|
|
|
"tag": tag,
|
|
|
|
@ -87,13 +87,13 @@ class OutputTagExtract(metaclass=system_tests.CaseMeta):
|
|
|
|
|
"""
|
|
|
|
|
for pa_elem, pS_elem in zip(self.pa_data, self.pS_data):
|
|
|
|
|
for key in ["tag", "type", "len"]:
|
|
|
|
|
self.assertEquals(pa_elem[key], pS_elem[key])
|
|
|
|
|
self.assertEqual(pa_elem[key], pS_elem[key])
|
|
|
|
|
|
|
|
|
|
if pa_elem["tag"] in [
|
|
|
|
|
"ImageWidth", "ImageLength", "BitsPerSample",
|
|
|
|
|
"DocumentName", "ImageDescription", "StripOffsets",
|
|
|
|
|
"SamplesPerPixel", "StripByteCounts"]:
|
|
|
|
|
self.assertEquals(pa_elem["val"], pS_elem["val"])
|
|
|
|
|
self.assertEqual(pa_elem["val"], pS_elem["val"])
|
|
|
|
|
|
|
|
|
|
def compare_stdout(self, i, command, got_stdout, expected_stdout):
|
|
|
|
|
super().compare_stdout(i, command, got_stdout, expected_stdout)
|
|
|
|
|