Fixed test for Native adapter

Author: Tom Van Herreweghe

lib/PHPExif/Reader/Adapter/Native.php

@@ -168,7 +168,7 @@ public function getExifFromFile($file)
         $data = @exif_read_data(
             $file,
             $sections,
-            $this->getSectionsAsArrays(),
+            $this->getSectionsAsArray(),
             $this->getIncludeThumbnail()
         );
 

tests/PHPExif/ExifTest.php

@@ -8,8 +8,8 @@ class ExifTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->reader   = new \PHPExif\Reader();
-        $file           = PHPEXIF_TEST_ROOT . '/files/morning_glory_pool.jpg';
+        $this->reader   = \PHPExif\Reader::factory(\PHPExif\Reader::TYPE_NATIVE);
+        $file           = PHPEXIF_TEST_ROOT . '/files/morning_glory_pool_500.jpg';
         $this->exif     = $this->reader->getExifFromFile($file);
     }
 
@@ -65,13 +65,13 @@ public function testGetFocusDistance()
 
     public function testGetWidth()
     {
-        $expected = 4288;
+        $expected = 500;
         $this->assertEquals($expected, $this->exif->getWidth());
     }
 
     public function testGetHeight()
     {
-        $expected = 2848;
+        $expected = 332;
         $this->assertEquals($expected, $this->exif->getHeight());
     }
 

tests/PHPExif/ReaderTest.php renamed to tests/PHPExif/Reader/Adapter/NativeTest.php

@@ -1,82 +1,82 @@
 <?php
-class ReaderTest extends \PHPUnit_Framework_TestCase
+class NativeTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \PHPExif\Reader
+     * @var \PHPExif\Reader\Adapter\Native
      */
-    protected $reader;
+    protected $adapter;
 
     public function setUp()
     {
-        $this->reader = new \PHPExif\Reader();
+        $this->adapter = new \PHPExif\Reader\Adapter\Native();
     }
 
     public function testSetIncludeThumbnail()
     {
-        $reflProperty = new \ReflectionProperty('\PHPExif\Reader', 'includeThumbnail');
+        $reflProperty = new \ReflectionProperty('\PHPExif\Reader\Adapter\Native', 'includeThumbnail');
         $reflProperty->setAccessible(true);
 
-        $this->assertEquals(\PHPExif\Reader::NO_THUMBNAIL, $reflProperty->getValue($this->reader));
+        $this->assertEquals(\PHPExif\Reader\Adapter\Native::NO_THUMBNAIL, $reflProperty->getValue($this->adapter));
 
-        $this->reader->setIncludeThumbnail(\PHPExif\Reader::INCLUDE_THUMBNAIL);
+        $this->adapter->setIncludeThumbnail(\PHPExif\Reader\Adapter\Native::INCLUDE_THUMBNAIL);
 
-        $this->assertEquals(\PHPExif\Reader::INCLUDE_THUMBNAIL, $reflProperty->getValue($this->reader));
+        $this->assertEquals(\PHPExif\Reader\Adapter\Native::INCLUDE_THUMBNAIL, $reflProperty->getValue($this->adapter));
     }
 
     public function testGetRequiredSections()
     {
-        $reflProperty = new \ReflectionProperty('\PHPExif\Reader', 'sections');
+        $reflProperty = new \ReflectionProperty('\PHPExif\Reader\Adapter\Native', 'sections');
         $reflProperty->setAccessible(true);
 
-        $this->assertEquals($reflProperty->getValue($this->reader), $this->reader->getRequiredSections());
+        $this->assertEquals($reflProperty->getValue($this->adapter), $this->adapter->getRequiredSections());
     }
 
     public function testSetRequiredSections()
     {
-        $reflProperty = new \ReflectionProperty('\PHPExif\Reader', 'sections');
+        $reflProperty = new \ReflectionProperty('\PHPExif\Reader\Adapter\Native', 'sections');
         $reflProperty->setAccessible(true);
 
         $testData = array('foo', 'bar', 'baz');
 
-        $returnValue = $this->reader->setRequiredSections($testData);
+        $returnValue = $this->adapter->setRequiredSections($testData);
 
-        $this->assertEquals($testData, $reflProperty->getValue($this->reader));
-        $this->assertEquals($this->reader, $returnValue);
+        $this->assertEquals($testData, $reflProperty->getValue($this->adapter));
+        $this->assertEquals($this->adapter, $returnValue);
     }
 
     public function testAddRequiredSection()
     {
-        $reflProperty = new \ReflectionProperty('\PHPExif\Reader', 'sections');
+        $reflProperty = new \ReflectionProperty('\PHPExif\Reader\Adapter\Native', 'sections');
         $reflProperty->setAccessible(true);
 
         $testData = array('foo', 'bar', 'baz');
-        $this->reader->setRequiredSections($testData);
+        $this->adapter->setRequiredSections($testData);
 
-        $returnValue = $this->reader->addRequiredSection('test');
+        $returnValue = $this->adapter->addRequiredSection('test');
         array_push($testData, 'test');
 
-        $this->assertEquals($testData, $reflProperty->getValue($this->reader));
-        $this->assertEquals($this->reader, $returnValue);
+        $this->assertEquals($testData, $reflProperty->getValue($this->adapter));
+        $this->assertEquals($this->adapter, $returnValue);
     }
 
     public function testGetExifFromFileNoData()
     {
         $file = PHPEXIF_TEST_ROOT . '/files/empty.jpg';
         $this->setExpectedException('RuntimeException');
-        $result = $this->reader->getExifFromFile($file);
+        $result = $this->adapter->getExifFromFile($file);
     }
 
     public function testGetExifFromFileHasData()
     {
-        $file = PHPEXIF_TEST_ROOT . '/files/morning_glory_pool.jpg';
-        $result = $this->reader->getExifFromFile($file);
+        $file = PHPEXIF_TEST_ROOT . '/files/morning_glory_pool_500.jpg';
+        $result = $this->adapter->getExifFromFile($file);
         $this->assertInstanceOf('\PHPExif\Exif', $result);
     }
 
     public function testGetIptcData()
     {
-        $file = PHPEXIF_TEST_ROOT . '/files/morning_glory_pool_smaller.jpg';
-        $result = $this->reader->getIptcData($file);
+        $file = PHPEXIF_TEST_ROOT . '/files/morning_glory_pool_500.jpg';
+        $result = $this->adapter->getIptcData($file);
         $expected = array(
             'title' => 'Morning Glory Pool',
             'keywords'  => array(

tests/bootstrap.php

@@ -1,12 +1,11 @@
 <?php
-
 error_reporting(-1);
 ini_set('display_errors', 1);
 ini_set('display_startup_errors', 1);
 
 date_default_timezone_set('Europe/Brussels');
 
-if (!is_file($autoloadFile = __DIR__ . '/../vendor/autoload.php')) {
+if (!is_file($autoloadFile = __DIR__ . '/../../../autoload.php')) {
     echo 'Could not find "vendor/autoload.php". Did you forget to run "composer install --dev"?' . PHP_EOL;
     exit(1);
 }