Updated tests

Author: Marek Szymczuk

tests/PHPExif/Mapper/ExiftoolMapperTest.php

@@ -138,12 +138,19 @@ public function testMapRawDataCorrectlyIgnoresIncorrectCreationDate()
     public function testMapRawDataCorrectlyFormatsExposureTime()
     {
         $rawData = array(
-            \PHPExif\Mapper\Exiftool::EXPOSURETIME => 1/400,
+            '1/30'  => 10/300,
+            '1/400' => 2/800,
+            '1/400' => 1/400,
+            '0'     => 0,
         );
 
-        $mapped = $this->mapper->mapRawData($rawData);
+        foreach ($rawData as $expected => $value) {
+            $mapped = $this->mapper->mapRawData(array(
+                \PHPExif\Mapper\Exiftool::EXPOSURETIME => $value,
+            ));
 
-        $this->assertEquals('1/400', reset($mapped));
+            $this->assertEquals($expected, reset($mapped));
+        }
     }
 
     /**

tests/PHPExif/Mapper/NativeMapperTest.php

@@ -108,12 +108,19 @@ public function testMapRawDataCorrectlyIgnoresIncorrectDateTimeOriginal()
     public function testMapRawDataCorrectlyFormatsExposureTime()
     {
         $rawData = array(
-            \PHPExif\Mapper\Native::EXPOSURETIME => '2/800',
+            '1/30'  => 10/300,
+            '1/400' => 2/800,
+            '1/400' => 1/400,
+            '0'     => 0,
         );
 
-        $mapped = $this->mapper->mapRawData($rawData);
+        foreach ($rawData as $expected => $value) {
+            $mapped = $this->mapper->mapRawData(array(
+                \PHPExif\Mapper\Native::EXPOSURETIME => $value,
+            ));
 
-        $this->assertEquals('1/400', reset($mapped));
+            $this->assertEquals($expected, reset($mapped));
+        }
     }
 
     /**
@@ -251,4 +258,27 @@ public function testMapRawDataCorrectlyIgnoresInvalidCreateDate()
             $result
         );
     }
+
+    /**
+     * @group mapper
+     * @covers \PHPExif\Mapper\Native::normalizeComponent
+     */
+    public function testNormalizeComponentCorrectly()
+    {
+        $reflMethod = new \ReflectionMethod('\PHPExif\Mapper\Native', 'normalizeComponent');
+        $reflMethod->setAccessible(true);
+
+        $rawData = array(
+            '2/800' => 0.0025,
+            '1/400' => 0.0025,
+            '0/1'   => 0,
+            '0'     => 0,
+        );
+
+        foreach ($rawData as $value => $expected) {
+            $normalized = $reflMethod->invoke($this->mapper, $value);
+
+            $this->assertEquals($expected, $normalized);
+        }
+    }
 }