Try to fix unit tests on Travis.

gomoob · Aug 9, 2016 · 469dc34 · 469dc34
1 parent ede7715
commit 469dc34
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 35 deletions.
diff --git a/src/main/php/Gomoob/MetadataExtractor/Imaging/ImageMetadataReader.php b/src/main/php/Gomoob/MetadataExtractor/Imaging/ImageMetadataReader.php
@@ -32,7 +32,6 @@
 use Gomoob\MetadataExtractor\Metadata\Exif\GpsDirectory;
 use Gomoob\MetadataExtractor\Lang\Rational;
 use Gomoob\MetadataExtractor\Metadata\Png\PngDirectory;
-use Gomoob\MetadataExtractor\Imaging\Png\PngChunkType;
 
 /**
  * Reads metadata from any supported file format.

diff --git a/src/test/php/Gomoob/BinaryDriver/JavaDriverTest.php b/src/test/php/Gomoob/BinaryDriver/JavaDriverTest.php
@@ -24,43 +24,19 @@ class JavaDriverTest extends TestCase
      */
     public function testCreate()
     {
-        $logger = new Logger('JavaDriver');
-        $logger->pushHandler(new StreamHandler('php://output'));
-
-        $listener = new DebugListener();
-
         // Calls the method to be tested
-        $javaDriver = JavaDriver::create($logger);
-        $javaDriver->listen($listener);
-
-        $javaDriver->on('debug', function ($line) {
-            echo $line;
-        });
-
-        // TODO: To be deleted
-        $output = $javaDriver->command(['-version']);
-        var_dump($output);
+        $javaDriver = JavaDriver::create();
 
         // Makes a simple call to ensure it works
-        try {
-            $output = $javaDriver->command(
-                [
-                    '-classpath',
-                    str_replace('\\', '/', MAIN_RESOURCES_DIRECTORY . '/jars/*'),
-                    'com.drew.imaging.ImageMetadataReader',
-                    realpath(TEST_RESOURCES_DIRECTORY . '/elephant.jpg')
-                ]
-            );
-
-            var_dump($output);
-        } catch (ExecutionFailureException $efex) {
-            $curEx = $efex;
-
-            while ($curEx) {
-                var_dump($curEx->getMessage());
-                $curEx = $efex->getPrevious();
-            }
-        }
+        $output = $javaDriver->command(
+            [
+                '-classpath',
+                str_replace('\\', '/', MAIN_RESOURCES_DIRECTORY . '/jars/*'),
+                'com.drew.imaging.ImageMetadataReader',
+                realpath(TEST_RESOURCES_DIRECTORY . '/elephant.jpg')
+            ]
+        );
+
         $this->assertContains('[JPEG] Compression Type = Baseline', $output);
         $this->assertContains('[JPEG] Data Precision = 8 bits', $output);
         $this->assertContains('[JPEG] Image Height = 1280 pixels', $output);
@@ -88,17 +64,27 @@ public function testCreate()
         $this->assertContains('[Exif IFD0] Model = Canon EOS 70D', $output);
         $this->assertContains('[Exif IFD0] Exposure Time = 1/250 sec', $output);
         $this->assertContains('[Exif SubIFD] Exposure Time = 1/250 sec', $output);
+
+        // Under Windows and with French local floating numbers use ',' but under Unix its '.'
         $this->assertTrue(
             strstr($output, '[Exif SubIFD] F-Number = f/8,0') !== false  ||
             strstr($output, '[Exif SubIFD] F-Number = f/8.0') !== false
         );
+
         $this->assertContains('[Exif SubIFD] ISO Speed Ratings = null', $output);
         $this->assertContains('[Exif SubIFD] Date/Time Original = 2016:07:17 10:35:28', $output);
         $this->assertContains('[Exif SubIFD] Flash = null', $output);
         $this->assertContains('[Exif SubIFD] Focal Length = 51 mm', $output);
         $this->assertContains('[Exif SubIFD] Lens Model = EF-S17-55mm f/2.8 IS USM', $output);
         $this->assertContains('[File] File Name = elephant.jpg', $output);
         $this->assertContains('[File] File Size = 830001 bytes', $output);
+
+        // Under Windows the number of bytes computed is not the same as Unix
+        $this->assertTrue(
+            strstr($output, '[File] File Size = 829992 bytes') !== false  ||
+            strstr($output, '[File] File Size = 830001 bytes') !== false
+        );
+
         $this->assertContains('[File] File Modified Date = ', $output);
     }
 }