Added recursive metadata support to CLI client

Author: vaites

scripts/branch.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+rm -rf composer.lock
 rm -rf vendor
 git checkout $1
 composer install

tests/BaseTest.php

@@ -216,6 +216,72 @@ public function testDocumentMetadataKeywords($file)
         }
     }
 
+    /**
+     * Recursive text metadata test
+     *
+     * @dataProvider    ocrProvider
+     *
+     * @param   string $file
+     * @throws  \Exception
+     */
+    public function testTextRecursiveMetadata($file)
+    {
+        if(version_compare(self::$version, '1.11') < 0)
+        {
+            $this->markTestSkipped('Apache Tika ' . self::$version . ' lacks recursive metadata extraction');
+        }
+        else
+        {
+            $metadata = self::$client->getRecursiveMetadata($file, 'text');
+
+            $this->assertContains('Sed do eiusmod tempor incididunt', $metadata->content);
+        }
+    }
+
+    /**
+     * Recursive HTML metadata test
+     *
+     * @dataProvider    ocrProvider
+     *
+     * @param   string $file
+     * @throws  \Exception
+     */
+    public function testHtmlRecursiveMetadata($file)
+    {
+        if(version_compare(self::$version, '1.11') < 0)
+        {
+            $this->markTestSkipped('Apache Tika ' . self::$version . ' lacks recursive metadata extraction');
+        }
+        else
+        {
+            $metadata = self::$client->getMetadata($file, 'html');
+
+            $this->assertContains('Sed do eiusmod tempor incididunt', $metadata->content);
+        }
+    }
+
+    /**
+     * Recursive ignore metadata test
+     *
+     * @dataProvider    ocrProvider
+     *
+     * @param   string $file
+     * @throws  \Exception
+     */
+    public function testIgnoreRecursiveMetadata($file)
+    {
+        if(version_compare(self::$version, '1.11') < 0)
+        {
+            $this->markTestSkipped('Apache Tika ' . self::$version . ' lacks recursive metadata extraction');
+        }
+        else
+        {
+            $metadata = self::$client->getMetadata($file, 'ignore');
+
+            $this->assertNull($metadata->content);
+        }
+    }
+
     /**
      * Language test
      *

tests/ErrorTest.php

@@ -195,26 +195,6 @@ public function testUnsupportedMedia()
         }
     }
 
-    /**
-     * Test unsupported command line recursive metadata
-     */
-    public function testUnsupportedCLIRecursiveMetadata()
-    {
-        $path = self::getPathForVersion(self::$version);
-
-        try
-        {
-            $client = Client::make($path);
-            $client->getMetadata('example.doc', 'html');
-
-            $this->fail();
-        }
-        catch(Exception $exception)
-        {
-            $this->assertContains('Recursive metadata is not supported', $exception->getMessage());
-        }
-    }
-
     /**
      * Test unknown recursive metadata type
      */

tests/WebTest.php

@@ -116,72 +116,6 @@ public function testSetRetries()
         $this->assertEquals(5, $client->getRetries());
     }
 
-    /**
-     * Recursive text metadata test
-     *
-     * @dataProvider    ocrProvider
-     *
-     * @param   string $file
-     * @throws  \Exception
-     */
-    public function testTextRecursiveMetadata($file)
-    {
-        if(version_compare(self::$version, '1.11') < 0)
-        {
-            $this->markTestSkipped('Apache Tika ' . self::$version . ' lacks recursive metadata extraction');
-        }
-        else
-        {
-            $metadata = self::$client->getRecursiveMetadata($file, 'text');
-
-            $this->assertContains('Sed do eiusmod tempor incididunt', $metadata->content);
-        }
-    }
-
-    /**
-     * Recursive HTML metadata test
-     *
-     * @dataProvider    ocrProvider
-     *
-     * @param   string $file
-     * @throws  \Exception
-     */
-    public function testHtmlRecursiveMetadata($file)
-    {
-        if(version_compare(self::$version, '1.11') < 0)
-        {
-            $this->markTestSkipped('Apache Tika ' . self::$version . ' lacks recursive metadata extraction');
-        }
-        else
-        {
-            $metadata = self::$client->getMetadata($file, 'html');
-
-            $this->assertContains('Sed do eiusmod tempor incididunt', $metadata->content);
-        }
-    }
-
-    /**
-     * Recursive ignore metadata test
-     *
-     * @dataProvider    ocrProvider
-     *
-     * @param   string $file
-     * @throws  \Exception
-     */
-    public function testIgnoreRecursiveMetadata($file)
-    {
-        if(version_compare(self::$version, '1.11') < 0)
-        {
-            $this->markTestSkipped('Apache Tika ' . self::$version . ' lacks recursive metadata extraction');
-        }
-        else
-        {
-            $metadata = self::$client->getMetadata($file, 'ignore');
-
-            $this->assertNull($metadata->content);
-        }
-    }
-
     /**
      * Test delayed check
      */