Cleanup of tests

pel · weberhofer · Nov 18, 2017 · Nov 15, 2017 · Nov 17, 2017 · Nov 17, 2017
commit cbed3e86338cc0304e364102def1a387e6857b9d
diff --git a/src/PelIfd.php b/src/PelIfd.php
@@ -344,11 +344,11 @@ public function load(PelDataWindow $d, $offset)
                     }
 
                     if ($starting_offset != $o) {
-                        $this->sub[$type] = new PelIfd($type);
+                        $ifd = new PelIfd($type);
                         try {
-                            $this->sub[$type]->load($d, $o);
+                            $ifd->load($d, $o);
+                            $this->sub[$type] = $ifd;
                         } catch (PelDataWindowOffsetException $e) {
-                            unset($this->sub[$type]);
                             Pel::maybeThrow(new PelIfdException($e->getMessage()));
                         }
                     } else {

diff --git a/test/Bug1730993Test.php → test/BrokenImagesTest.php b/test/Bug1730993Test.php → test/BrokenImagesTest.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * PEL: PHP Exif Library.
  * A library with support for reading and
@@ -26,17 +25,20 @@
 use lsolesen\pel\PelJpeg;
 use PHPUnit\Framework\TestCase;
 
-class Bug1730993Test extends TestCase
+class BrokenImagesTest extends TestCase
 {
-    function testWindowWindowExceptionIsCaught()
+    public function testWindowWindowExceptionIsCaught()
+    {
+        new PelJpeg(dirname(__FILE__) . '/broken_images/gh-10-a.jpg');
+    }
+
+    public function testWindowOffsetExceptionIsCaught()
     {
-        $tmpfile = dirname(__FILE__) . '/images/bug1730993_tmp.jpg';
-        $jpeg = new PelJpeg($tmpfile);
+        new PelJpeg(dirname(__FILE__) . '/broken_images/gh-10-b.jpg');
     }
 
-    function testWindowOffsetExceptionIsCaught()
+    public function testParsingNotFailingOnRecursingIfd()
     {
-        $tmpfile = dirname(__FILE__) . '/images/27303092-d9d72838-54f6-11e7-943c-78933f9c9fbe.jpg';
-        $jpeg = new PelJpeg($tmpfile);
+        new PelJpeg(dirname(__FILE__) . '/broken_images/gh-11.jpg');
     }
 }
diff --git a/test/Bug2979466Test.php b/test/Bug2979466Test.php
diff --git a/test/images/bug1730993_tmp.jpg → test/broken_images/gh-10-a.jpg b/test/images/bug1730993_tmp.jpg → test/broken_images/gh-10-a.jpg
diff --git a/...-d9d72838-54f6-11e7-943c-78933f9c9fbe.jpg → test/broken_images/gh-10-b.jpg b/...-d9d72838-54f6-11e7-943c-78933f9c9fbe.jpg → test/broken_images/gh-10-b.jpg
diff --git a/test/images/bug2979466.jpg → test/broken_images/gh-11.jpg b/test/images/bug2979466.jpg → test/broken_images/gh-11.jpg