Rework adapter tests namespaces to be consistent

flow-php · Oct 15, 2023 · 1bf1c03 · 1bf1c03
1 parent 37d509d
commit 1bf1c03
Show file tree

Hide file tree

Showing 23 changed files with 46 additions and 43 deletions.
diff --git a/infection.json b/infection.json
@@ -3,14 +3,15 @@
     "directories": [
         "src/core/etl/src",
         "src/adapter/etl-adapter-avro/src",
-        "src/adapter/etl-adapter-csv/src",
         "src/adapter/etl-adapter-chartjs/src",
+        "src/adapter/etl-adapter-csv/src",
         "src/adapter/etl-adapter-doctrine/src",
         "src/adapter/etl-adapter-elasticsearch/src",
         "src/adapter/etl-adapter-google-sheet/src",
         "src/adapter/etl-adapter-http/src",
         "src/adapter/etl-adapter-json/src",
         "src/adapter/etl-adapter-logger/src",
+        "src/adapter/etl-adapter-meilisearch/src",
         "src/adapter/etl-adapter-parquet/src",
         "src/adapter/etl-adapter-text/src",
         "src/adapter/etl-adapter-xml/src",

diff --git a/phpunit.xml b/phpunit.xml
@@ -7,6 +7,7 @@
         cacheResultFile="./var/phpunit/phpunit.cache"
         displayDetailsOnTestsThatTriggerWarnings="true"
         displayDetailsOnTestsThatTriggerErrors="true"
+        executionOrder="random"
 >
   <coverage cacheDirectory="./var/phpunit/">
     <report>
@@ -25,40 +26,40 @@
   </php>
   <testsuites>
     <testsuite name="unit">
+      <directory>src/adapter/etl-adapter-amphp/tests/Flow/ETL/Adapter/AMPHP/Tests/Unit</directory>
+      <directory>src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/Tests/Unit</directory>
+      <directory>src/adapter/etl-adapter-chartjs/tests/Flow/ETL/Adapter/ChartJS/Tests/Unit</directory>
+      <directory>src/adapter/etl-adapter-doctrine/tests/Flow/ETL/Adapter/Doctrine/Tests/Unit</directory>
+      <directory>src/adapter/etl-adapter-google-sheet/tests/Flow/ETL/Adapter/GoogleSheet/Tests/Unit</directory>
+      <directory>src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Unit</directory>
+      <directory>src/adapter/etl-adapter-logger/tests/Flow/ETL/Adapter/Logger/Tests/Unit</directory>
+      <directory>src/adapter/etl-adapter-parquet/tests/Flow/ETL/Adapter/Parquet/Tests/Unit</directory>
+      <directory>src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Adapter/ReactPHP/Tests/Unit</directory>
       <directory>src/core/etl/tests/Flow/ETL/Tests/Unit</directory>
       <directory>src/lib/array-dot/tests/Flow/ArrayDot/Tests/Unit</directory>
       <directory>src/lib/doctrine-dbal-bulk/tests/Flow/Doctrine/Bulk/Tests/Unit</directory>
       <directory>src/lib/dremel/tests/Flow/Dremel/Tests/Unit</directory>
       <directory>src/lib/parquet/tests/Flow/Parquet/Tests/Unit</directory>
-      <directory>src/adapter/etl-adapter-amphp/tests/Flow/ETL/Async/Tests/Unit</directory>
-      <directory>src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/FlixTech/Tests/Unit</directory>
-      <directory>src/adapter/etl-adapter-chartjs/tests/Flow/ETL/Adapter/ChartJS/Tests/Unit</directory>
-      <directory>src/adapter/etl-adapter-doctrine/tests/Flow/ETL/Adapter/Doctrine/Tests/Unit</directory>
-      <directory>src/adapter/etl-adapter-google-sheet/tests/Flow/ETL/Adapter/GoogleSheet/Tests/Unit</directory>
-      <directory>src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/Unit</directory>
-      <directory>src/adapter/etl-adapter-logger/tests/Flow/ETL/Tests/Unit</directory>
-      <directory>src/adapter/etl-adapter-parquet/tests/Flow/ETL/Adapter/Parquet/Tests/Unit</directory>
-      <directory>src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Async/Tests/Unit</directory>
     </testsuite>
     <testsuite name="integration-io">
-      <directory>src/core/etl/tests/Flow/ETL/Tests/Integration</directory>
-      <directory>src/adapter/etl-adapter-amphp/tests/Flow/ETL/Async/Tests/Integration</directory>
-      <directory>src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/FlixTech/Tests/Integration</directory>
+      <directory>src/adapter/etl-adapter-amphp/tests/Flow/ETL/Adapter/AMPHP/Tests/Integration</directory>
+      <directory>src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/Tests/Integration</directory>
       <directory>src/adapter/etl-adapter-chartjs/tests/Flow/ETL/Adapter/ChartJS/Tests/Integration</directory>
       <directory>src/adapter/etl-adapter-csv/tests/Flow/ETL/Adapter/CSV/Tests/Integration</directory>
-      <directory>src/adapter/etl-adapter-json/tests/Flow/ETL/Tests/Integration</directory>
+      <directory>src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Integration</directory>
+      <directory>src/adapter/etl-adapter-json/tests/Flow/ETL/Adapter/JSON/Tests/Integration</directory>
       <directory>src/adapter/etl-adapter-parquet/tests/Flow/ETL/Adapter/Parquet/Tests/Integration</directory>
-      <directory>src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Async/Tests/Integration</directory>
+      <directory>src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Adapter/ReactPHP/Tests/Integration</directory>
       <directory>src/adapter/etl-adapter-text/tests/Flow/ETL/Adapter/Text/Tests/Integration</directory>
-      <directory>src/adapter/etl-adapter-xml/tests/Flow/ETL/Tests/Integration</directory>
-      <directory>src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/Integration</directory>
+      <directory>src/adapter/etl-adapter-xml/tests/Flow/ETL/Adapter/XML/Tests/Integration</directory>
+      <directory>src/core/etl/tests/Flow/ETL/Tests/Integration</directory>
       <directory>src/lib/parquet/tests/Flow/Parquet/Tests/Integration</directory>
     </testsuite>
     <testsuite name="integration-services">
-      <directory>src/lib/doctrine-dbal-bulk/tests/Flow/Doctrine/Bulk/Tests/Integration</directory>
       <directory>src/adapter/etl-adapter-doctrine/tests/Flow/ETL/Adapter/Doctrine/Tests/Integration</directory>
       <directory>src/adapter/etl-adapter-elasticsearch/tests/Flow/ETL/Adapter/Elasticsearch/Tests/Integration</directory>
       <directory>src/adapter/etl-adapter-meilisearch/tests/Flow/ETL/Adapter/Meilisearch/Tests/Integration</directory>
+      <directory>src/lib/doctrine-dbal-bulk/tests/Flow/Doctrine/Bulk/Tests/Integration</directory>
     </testsuite>
   </testsuites>
   <source>

diff --git a/...gration/Server/SocketServerClientTest.php → ...gration/Server/SocketServerClientTest.php b/...gration/Server/SocketServerClientTest.php → ...gration/Server/SocketServerClientTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Async\Tests\Integration\Server;
+namespace Flow\ETL\Adapter\AMPHP\Tests\Integration\Server;
 
 use const Amp\Process\IS_WINDOWS;
 use function Amp\async;

diff --git a/...nc/Tests/Unit/Server/SocketServerTest.php → ...HP/Tests/Unit/Server/SocketServerTest.php b/...nc/Tests/Unit/Server/SocketServerTest.php → ...HP/Tests/Unit/Server/SocketServerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Async\Tests\Unit\Server;
+namespace Flow\ETL\Adapter\AMPHP\Tests\Unit\Server;
 
 use Flow\ETL\Async\Amp\Server\SocketServer;
 use Flow\ETL\Async\Socket\Server\ServerProtocol;

diff --git a/...o/FlixTech/Tests/Integration/AvroTest.php → ...apter/Avro/Tests/Integration/AvroTest.php b/...o/FlixTech/Tests/Integration/AvroTest.php → ...apter/Avro/Tests/Integration/AvroTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Adapter\Avro\FlixTech\Tests\Integration;
+namespace Flow\ETL\Adapter\Avro\Tests\Integration;
 
 use Flow\ETL\Config;
 use Flow\ETL\DSL\Avro;

diff --git a/...lixTech/Tests/Unit/ValueConverterTest.php → ...er/Avro/Tests/Unit/ValueConverterTest.php b/...lixTech/Tests/Unit/ValueConverterTest.php → ...er/Avro/Tests/Unit/ValueConverterTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Adapter\Avro\FlixTech\Tests\Unit;
+namespace Flow\ETL\Adapter\Avro\Tests\Unit;
 
 use Flow\ETL\Adapter\Avro\FlixTech\ValueConverter;
 use Flow\ETL\Exception\InvalidArgumentException;

diff --git a/...p/tests/Flow/ETL/Tests/json/flow-php.json → ...Adapter/HTTP/Tests/Fixtures/flow-php.json b/...p/tests/Flow/ETL/Tests/json/flow-php.json → ...Adapter/HTTP/Tests/Fixtures/flow-php.json
diff --git a/...ests/Flow/ETL/Tests/json/norberttech.json → ...pter/HTTP/Tests/Fixtures/norberttech.json b/...ests/Flow/ETL/Tests/json/norberttech.json → ...pter/HTTP/Tests/Fixtures/norberttech.json
diff --git a/...tests/Flow/ETL/Tests/json/tomaszhanc.json → ...apter/HTTP/Tests/Fixtures/tomaszhanc.json b/...tests/Flow/ETL/Tests/json/tomaszhanc.json → ...apter/HTTP/Tests/Fixtures/tomaszhanc.json
diff --git a/...ion/PsrHttpClientDynamicExtractorTest.php → ...ion/PsrHttpClientDynamicExtractorTest.php b/...ion/PsrHttpClientDynamicExtractorTest.php → ...ion/PsrHttpClientDynamicExtractorTest.php
@@ -2,12 +2,13 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Tests\Integration;
+namespace Flow\ETL\Adapter\HTTP\Tests\Integration;
 
 use Flow\ETL\Adapter\Http\DynamicExtractor\NextRequestFactory;
 use Flow\ETL\Adapter\Http\PsrHttpClientDynamicExtractor;
 use Flow\ETL\Config;
 use Flow\ETL\FlowContext;
+use Http\Mock\Client;
 use Nyholm\Psr7\Factory\Psr17Factory;
 use Nyholm\Psr7\Response;
 use PHPUnit\Framework\TestCase;
@@ -19,12 +20,12 @@ final class PsrHttpClientDynamicExtractorTest extends TestCase
     public function test_http_extractor() : void
     {
         $psr17Factory = new Psr17Factory();
-        $psr18Client = new \Http\Mock\Client($psr17Factory);
+        $psr18Client = new Client($psr17Factory);
 
         $psr18Client->addResponse(
             new Response(200, [
                 'Server' => 'GitHub.com',
-            ], \file_get_contents(__DIR__ . '/../json/flow-php.json')),
+            ], \file_get_contents(__DIR__ . '/../Fixtures/flow-php.json')),
         );
 
         $extractor = new PsrHttpClientDynamicExtractor($psr18Client, new class implements NextRequestFactory {

diff --git a/...tion/PsrHttpClientStaticExtractorTest.php → ...tion/PsrHttpClientStaticExtractorTest.php b/...tion/PsrHttpClientStaticExtractorTest.php → ...tion/PsrHttpClientStaticExtractorTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Tests\Integration;
+namespace Flow\ETL\Adapter\HTTP\Tests\Integration;
 
 use Flow\ETL\Adapter\Http\PsrHttpClientStaticExtractor;
 use Flow\ETL\Config;
@@ -21,10 +21,10 @@ public function test_http_extractor() : void
         $psr17Factory = new Psr17Factory();
         $psr18Client = new Client($psr17Factory);
         $psr18Client->addResponse(
-            new Response(200, [], \file_get_contents(__DIR__ . '/../json/norberttech.json')),
+            new Response(200, [], \file_get_contents(__DIR__ . '/../Fixtures/norberttech.json')),
         );
         $psr18Client->addResponse(
-            new Response(200, [], \file_get_contents(__DIR__ . '/../json/tomaszhanc.json')),
+            new Response(200, [], \file_get_contents(__DIR__ . '/../Fixtures/tomaszhanc.json')),
         );
 
         $requests = static function () use ($psr17Factory) : \Generator {

diff --git a/.../Tests/Unit/RequestEntriesFactoryTest.php → .../Tests/Unit/RequestEntriesFactoryTest.php b/.../Tests/Unit/RequestEntriesFactoryTest.php → .../Tests/Unit/RequestEntriesFactoryTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Tests\Unit;
+namespace Flow\ETL\Adapter\HTTP\Tests\Unit;
 
 use Flow\ETL\Adapter\Http\RequestEntriesFactory;
 use Flow\ETL\Row\Entry\JsonEntry;

diff --git a/...apter/JSON/Fixtures/nested_timezones.json → ...JSON/Tests/Fixtures/nested_timezones.json b/...apter/JSON/Fixtures/nested_timezones.json → ...JSON/Tests/Fixtures/nested_timezones.json
diff --git a/...tion/Adapter/JSON/Fixtures/timezones.json → ...dapter/JSON/Tests/Fixtures/timezones.json b/...tion/Adapter/JSON/Fixtures/timezones.json → ...dapter/JSON/Tests/Fixtures/timezones.json
diff --git a/...er/JSON/JSONMachine/JsonExtractorTest.php → ...gration/JSONMachine/JsonExtractorTest.php b/...er/JSON/JSONMachine/JsonExtractorTest.php → ...gration/JSONMachine/JsonExtractorTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Tests\Integration\Adapter\JSON\JSONMachine;
+namespace Flow\ETL\Adapter\JSON\Tests\Integration\JSONMachine;
 
 use Flow\ETL\Adapter\JSON\JSONMachine\JsonExtractor;
 use Flow\ETL\Config;
@@ -19,7 +19,7 @@ final class JsonExtractorTest extends TestCase
     public function test_extracting_json_from_local_file_stream() : void
     {
         $rows = (new Flow(Config::builder()->putInputIntoRows()))
-            ->read(Json::from(__DIR__ . '/../Fixtures/timezones.json', 5))
+            ->read(Json::from(__DIR__ . '/../../Fixtures/timezones.json', 5))
             ->fetch();
 
         foreach ($rows as $row) {
@@ -42,7 +42,7 @@ public function test_extracting_json_from_local_file_stream() : void
     public function test_extracting_json_from_local_file_stream_using_pointer() : void
     {
         $rows = (new Flow())
-            ->read(Json::from(__DIR__ . '/../Fixtures/nested_timezones.json', 5, pointer: '/timezones'))
+            ->read(Json::from(__DIR__ . '/../../Fixtures/nested_timezones.json', 5, pointer: '/timezones'))
             ->fetch();
 
         foreach ($rows as $row) {
@@ -64,7 +64,7 @@ public function test_extracting_json_from_local_file_stream_using_pointer() : vo
 
     public function test_extracting_json_from_local_file_string_uri() : void
     {
-        $extractor = new JsonExtractor(Path::realpath(__DIR__ . '/../Fixtures/timezones.json'), 5);
+        $extractor = new JsonExtractor(Path::realpath(__DIR__ . '/../../Fixtures/timezones.json'), 5);
 
         $total = 0;
 

diff --git a/...tegration/Adapter/JSON/JsonLoaderTest.php → ...JSON/Tests/Integration/JsonLoaderTest.php b/...tegration/Adapter/JSON/JsonLoaderTest.php → ...JSON/Tests/Integration/JsonLoaderTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Tests\Integration\Adapter\JSON;
+namespace Flow\ETL\Adapter\JSON\Tests\Integration;
 
 use Flow\ETL\Adapter\JSON\JsonLoader;
 use Flow\ETL\Config;

diff --git a/.../Adapter/Logger/Logger/DumpLoggerTest.php → ...gger/Tests/Unit/Logger/DumpLoggerTest.php b/.../Adapter/Logger/Logger/DumpLoggerTest.php → ...gger/Tests/Unit/Logger/DumpLoggerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Tests\Unit\Adapter\Logger\Logger;
+namespace Flow\ETL\Adapter\Logger\Tests\Unit\Logger;
 
 use Flow\ETL\Adapter\Logger\Logger\DumpLogger;
 use PHPUnit\Framework\TestCase;

diff --git a/...it/Adapter/Logger/PsrLoggerLoaderTest.php → ...Logger/Tests/Unit/PsrLoggerLoaderTest.php b/...it/Adapter/Logger/PsrLoggerLoaderTest.php → ...Logger/Tests/Unit/PsrLoggerLoaderTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Tests\Unit\Adapter\Logger;
+namespace Flow\ETL\Adapter\Logger\Tests\Unit;
 
 use Flow\ETL\Adapter\Logger\PsrLoggerLoader;
 use Flow\ETL\Config;

diff --git a/...eactPHP/Server/SocketServerClientTest.php → ...gration/Server/SocketServerClientTest.php b/...eactPHP/Server/SocketServerClientTest.php → ...gration/Server/SocketServerClientTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Async\Tests\Integration\ReactPHP\Server;
+namespace Flow\ETL\Adapter\ReactPHP\Tests\Integration\Server;
 
 use function Flow\ETL\DSL\lit;
 use Flow\ETL\Async\ReactPHP\Server\SocketServer;

diff --git a/...Unit/ReactPHP/Server/SocketServerTest.php → ...HP/Tests/Unit/Server/SocketServerTest.php b/...Unit/ReactPHP/Server/SocketServerTest.php → ...HP/Tests/Unit/Server/SocketServerTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Async\Tests\Unit\ReactPHP\Server;
+namespace Flow\ETL\Adapter\ReactPHP\Tests\Unit\Server;
 
 use Flow\ETL\Async\ReactPHP\Server\SocketServer;
 use Flow\ETL\Exception\InvalidArgumentException;

diff --git a/...egration/Adapter/XML/xml/simple_items.xml → ...apter/XML/Tests/Fixtures/simple_items.xml b/...egration/Adapter/XML/xml/simple_items.xml → ...apter/XML/Tests/Fixtures/simple_items.xml
diff --git a/...ion/Adapter/XML/xml/simple_items_flat.xml → .../XML/Tests/Fixtures/simple_items_flat.xml b/...ion/Adapter/XML/xml/simple_items_flat.xml → .../XML/Tests/Fixtures/simple_items_flat.xml
diff --git a/...on/Adapter/XML/XMLReaderExtractorTest.php → ...ts/Integration/XMLReaderExtractorTest.php b/...on/Adapter/XML/XMLReaderExtractorTest.php → ...ts/Integration/XMLReaderExtractorTest.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Flow\ETL\Tests\Integration\Adapter\XML;
+namespace Flow\ETL\Adapter\XML\Tests\Integration;
 
 use Flow\ETL\DSL\Entry;
 use Flow\ETL\DSL\XML;
@@ -16,12 +16,12 @@ final class XMLReaderExtractorTest extends TestCase
     public function test_reading_xml() : void
     {
         $xml = new \DOMDocument();
-        $xml->load(__DIR__ . '/xml/simple_items.xml');
+        $xml->load(__DIR__ . '/../Fixtures/simple_items.xml');
 
         $this->assertEquals(
             (new Rows(Row::create(Entry::xml('node', $xml)))),
             (new Flow())
-                ->read(XML::from(__DIR__ . '/xml/simple_items.xml'))
+                ->read(XML::from(__DIR__ . '/../Fixtures/simple_items.xml'))
                 ->fetch()
         );
     }
@@ -37,7 +37,7 @@ public function test_reading_xml_each_collection_item() : void
                 Row::create(Entry::xml('node', '<item item_attribute_01="5"><id id_attribute_01="5">5</id></item>')),
             ),
             (new Flow())
-                ->read(XML::from(__DIR__ . '/xml/simple_items_flat.xml', 'root/items/item'))
+                ->read(XML::from(__DIR__ . '/../Fixtures/simple_items_flat.xml', 'root/items/item'))
                 ->fetch()
         );
     }
@@ -69,7 +69,7 @@ public function test_reading_xml_from_path() : void
         $this->assertEquals(
             new Rows(Row::create(Entry::xml('node', $xml))),
             (new Flow())
-                ->read(XML::from(__DIR__ . '/xml/simple_items.xml', 'root/items'))
+                ->read(XML::from(__DIR__ . '/../Fixtures/simple_items.xml', 'root/items'))
                 ->fetch()
         );
     }