Try to fix Java execution errors on Travis.

gomoob · Aug 9, 2016 · 1465db9 · 1465db9
1 parent 9054dc7
commit 1465db9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 30 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,6 +18,7 @@ install:
   - composer install
 
 script:
+  - java -classpath '/home/travis/build/gomoob/php-metadata-extractor/src/main/resources/jars/*' com.drew.imaging.ImageMetadataReader '/home/travis/build/gomoob/php-metadata-extractor/src/test/resources/elephant.jpg'
   - grunt
 
 after_script:

diff --git a/src/main/php/Gomoob/BinaryDriver/DebugListener.php b/src/main/php/Gomoob/BinaryDriver/DebugListener.php
diff --git a/src/main/php/Gomoob/MetadataExtractor/Imaging/ImageMetadataReader.php b/src/main/php/Gomoob/MetadataExtractor/Imaging/ImageMetadataReader.php
@@ -129,7 +129,7 @@ private static function addTagToDirectory(Directory $directory, $tagLine)
             // var_dump($nameAndDescription[0]);
             // var_dump($nameAndDescription[1]);
 
-            switch ($nameAndDescription[1]) {
+            switch ($nameAndDescription[0]) {
                 case 'Interoperability Index':
                     break;
                 case 'Interoperability Version':

diff --git a/src/main/php/Gomoob/MetadataExtractor/Metadata/Directory.php b/src/main/php/Gomoob/MetadataExtractor/Metadata/Directory.php
@@ -9,6 +9,7 @@
 namespace Gomoob\MetadataExtractor\Metadata;
 
 use Gomoob\Java\Lang\NullPointerException;
+use Gomoob\MetadataExtractor\Lang\Rational;
 
 /**
  * Abstract base class for all directory implementations, having methods for getting and setting tag values of various
@@ -163,10 +164,21 @@ public function setObject($tagType, $value)
         if (!array_key_exists($tagType, $this->tagMap)) {
             $this->definedTagList[$tagType] = new Tag($tagType, $this);
         }
-
+        
         $this->tagMap[$tagType] = $value;
     }
 
+    /**
+     * Sets a <code>Rational</code> value for the specified tag.
+     *
+     * @param tagType  the tag's value as an int
+     * @param rational rational number
+     */
+    public function setRational($tagType, Rational $rational)
+    {
+        $this->setObject($tagType, $rational);
+    }
+
     /**
      * Provides the map of tag names, hashed by tag type identifier.
      *

diff --git a/src/test/php/Gomoob/MetadataExtractor/Imaging/ImageMetadataReader/NikonE990Test.php b/src/test/php/Gomoob/MetadataExtractor/Imaging/ImageMetadataReader/NikonE990Test.php
@@ -26,8 +26,9 @@ public function testReadMetadata()
         $metadata = ImageMetadataReader::readMetadata(realpath(TEST_RESOURCES_DIRECTORY . '/Nikon E990.jpg'));
 
         // Checks 'Exif IFD0' directory
-        $directory = $metadata->getDirectories()[0];
-
+        $directory = $metadata->getDirectories()[1];
+        $this->assertInstanceOf(ExifIFD0Directory::class, $directory);
+
         $tag = $directory->getTagName(ExifIFD0Directory::TAG_X_RESOLUTION);
         var_dump($tag);