diff --git a/infection.json b/infection.json index 064aa91f3..1fd9281c0 100644 --- 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 index d0a570fa7..073979ff1 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,6 +7,7 @@ cacheResultFile="./var/phpunit/phpunit.cache" displayDetailsOnTestsThatTriggerWarnings="true" displayDetailsOnTestsThatTriggerErrors="true" + executionOrder="random" > @@ -25,40 +26,40 @@ + src/adapter/etl-adapter-amphp/tests/Flow/ETL/Adapter/AMPHP/Tests/Unit + src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/Tests/Unit + src/adapter/etl-adapter-chartjs/tests/Flow/ETL/Adapter/ChartJS/Tests/Unit + src/adapter/etl-adapter-doctrine/tests/Flow/ETL/Adapter/Doctrine/Tests/Unit + src/adapter/etl-adapter-google-sheet/tests/Flow/ETL/Adapter/GoogleSheet/Tests/Unit + src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Unit + src/adapter/etl-adapter-logger/tests/Flow/ETL/Adapter/Logger/Tests/Unit + src/adapter/etl-adapter-parquet/tests/Flow/ETL/Adapter/Parquet/Tests/Unit + src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Adapter/ReactPHP/Tests/Unit src/core/etl/tests/Flow/ETL/Tests/Unit src/lib/array-dot/tests/Flow/ArrayDot/Tests/Unit src/lib/doctrine-dbal-bulk/tests/Flow/Doctrine/Bulk/Tests/Unit src/lib/dremel/tests/Flow/Dremel/Tests/Unit src/lib/parquet/tests/Flow/Parquet/Tests/Unit - src/adapter/etl-adapter-amphp/tests/Flow/ETL/Async/Tests/Unit - src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/FlixTech/Tests/Unit - src/adapter/etl-adapter-chartjs/tests/Flow/ETL/Adapter/ChartJS/Tests/Unit - src/adapter/etl-adapter-doctrine/tests/Flow/ETL/Adapter/Doctrine/Tests/Unit - src/adapter/etl-adapter-google-sheet/tests/Flow/ETL/Adapter/GoogleSheet/Tests/Unit - src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/Unit - src/adapter/etl-adapter-logger/tests/Flow/ETL/Tests/Unit - src/adapter/etl-adapter-parquet/tests/Flow/ETL/Adapter/Parquet/Tests/Unit - src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Async/Tests/Unit - src/core/etl/tests/Flow/ETL/Tests/Integration - src/adapter/etl-adapter-amphp/tests/Flow/ETL/Async/Tests/Integration - src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/FlixTech/Tests/Integration + src/adapter/etl-adapter-amphp/tests/Flow/ETL/Adapter/AMPHP/Tests/Integration + src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/Tests/Integration src/adapter/etl-adapter-chartjs/tests/Flow/ETL/Adapter/ChartJS/Tests/Integration src/adapter/etl-adapter-csv/tests/Flow/ETL/Adapter/CSV/Tests/Integration - src/adapter/etl-adapter-json/tests/Flow/ETL/Tests/Integration + src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Integration + src/adapter/etl-adapter-json/tests/Flow/ETL/Adapter/JSON/Tests/Integration src/adapter/etl-adapter-parquet/tests/Flow/ETL/Adapter/Parquet/Tests/Integration - src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Async/Tests/Integration + src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Adapter/ReactPHP/Tests/Integration src/adapter/etl-adapter-text/tests/Flow/ETL/Adapter/Text/Tests/Integration - src/adapter/etl-adapter-xml/tests/Flow/ETL/Tests/Integration - src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/Integration + src/adapter/etl-adapter-xml/tests/Flow/ETL/Adapter/XML/Tests/Integration + src/core/etl/tests/Flow/ETL/Tests/Integration src/lib/parquet/tests/Flow/Parquet/Tests/Integration - src/lib/doctrine-dbal-bulk/tests/Flow/Doctrine/Bulk/Tests/Integration src/adapter/etl-adapter-doctrine/tests/Flow/ETL/Adapter/Doctrine/Tests/Integration src/adapter/etl-adapter-elasticsearch/tests/Flow/ETL/Adapter/Elasticsearch/Tests/Integration src/adapter/etl-adapter-meilisearch/tests/Flow/ETL/Adapter/Meilisearch/Tests/Integration + src/lib/doctrine-dbal-bulk/tests/Flow/Doctrine/Bulk/Tests/Integration diff --git a/src/adapter/etl-adapter-amphp/tests/Flow/ETL/Async/Tests/Integration/Server/SocketServerClientTest.php b/src/adapter/etl-adapter-amphp/tests/Flow/ETL/Adapter/AMPHP/Tests/Integration/Server/SocketServerClientTest.php similarity index 98% rename from src/adapter/etl-adapter-amphp/tests/Flow/ETL/Async/Tests/Integration/Server/SocketServerClientTest.php rename to src/adapter/etl-adapter-amphp/tests/Flow/ETL/Adapter/AMPHP/Tests/Integration/Server/SocketServerClientTest.php index 73b66167d..923093934 100644 --- a/src/adapter/etl-adapter-amphp/tests/Flow/ETL/Async/Tests/Integration/Server/SocketServerClientTest.php +++ b/src/adapter/etl-adapter-amphp/tests/Flow/ETL/Adapter/AMPHP/Tests/Integration/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/src/adapter/etl-adapter-amphp/tests/Flow/ETL/Async/Tests/Unit/Server/SocketServerTest.php b/src/adapter/etl-adapter-amphp/tests/Flow/ETL/Adapter/AMPHP/Tests/Unit/Server/SocketServerTest.php similarity index 97% rename from src/adapter/etl-adapter-amphp/tests/Flow/ETL/Async/Tests/Unit/Server/SocketServerTest.php rename to src/adapter/etl-adapter-amphp/tests/Flow/ETL/Adapter/AMPHP/Tests/Unit/Server/SocketServerTest.php index 5edcf7c8b..dd71fb5a3 100644 --- a/src/adapter/etl-adapter-amphp/tests/Flow/ETL/Async/Tests/Unit/Server/SocketServerTest.php +++ b/src/adapter/etl-adapter-amphp/tests/Flow/ETL/Adapter/AMPHP/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/src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/FlixTech/Tests/Integration/AvroTest.php b/src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/Tests/Integration/AvroTest.php similarity index 99% rename from src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/FlixTech/Tests/Integration/AvroTest.php rename to src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/Tests/Integration/AvroTest.php index aa368cdef..0a782fdb9 100644 --- a/src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/FlixTech/Tests/Integration/AvroTest.php +++ b/src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/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/src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/FlixTech/Tests/Unit/ValueConverterTest.php b/src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/Tests/Unit/ValueConverterTest.php similarity index 98% rename from src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/FlixTech/Tests/Unit/ValueConverterTest.php rename to src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/Tests/Unit/ValueConverterTest.php index 795f71919..ea431c080 100644 --- a/src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/Avro/FlixTech/Tests/Unit/ValueConverterTest.php +++ b/src/adapter/etl-adapter-avro/tests/Flow/ETL/Adapter/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/src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/json/flow-php.json b/src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Fixtures/flow-php.json similarity index 100% rename from src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/json/flow-php.json rename to src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Fixtures/flow-php.json diff --git a/src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/json/norberttech.json b/src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Fixtures/norberttech.json similarity index 100% rename from src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/json/norberttech.json rename to src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Fixtures/norberttech.json diff --git a/src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/json/tomaszhanc.json b/src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Fixtures/tomaszhanc.json similarity index 100% rename from src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/json/tomaszhanc.json rename to src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Fixtures/tomaszhanc.json diff --git a/src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/Integration/PsrHttpClientDynamicExtractorTest.php b/src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Integration/PsrHttpClientDynamicExtractorTest.php similarity index 92% rename from src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/Integration/PsrHttpClientDynamicExtractorTest.php rename to src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Integration/PsrHttpClientDynamicExtractorTest.php index e41c584e2..87ea24509 100644 --- a/src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/Integration/PsrHttpClientDynamicExtractorTest.php +++ b/src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Integration/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/src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/Integration/PsrHttpClientStaticExtractorTest.php b/src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Integration/PsrHttpClientStaticExtractorTest.php similarity index 94% rename from src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/Integration/PsrHttpClientStaticExtractorTest.php rename to src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Integration/PsrHttpClientStaticExtractorTest.php index da52dc98f..74ee33292 100644 --- a/src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/Integration/PsrHttpClientStaticExtractorTest.php +++ b/src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Integration/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/src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/Unit/RequestEntriesFactoryTest.php b/src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Unit/RequestEntriesFactoryTest.php similarity index 97% rename from src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/Unit/RequestEntriesFactoryTest.php rename to src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/Tests/Unit/RequestEntriesFactoryTest.php index 5d035e585..09d782561 100644 --- a/src/adapter/etl-adapter-http/tests/Flow/ETL/Tests/Unit/RequestEntriesFactoryTest.php +++ b/src/adapter/etl-adapter-http/tests/Flow/ETL/Adapter/HTTP/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/src/adapter/etl-adapter-json/tests/Flow/ETL/Tests/Integration/Adapter/JSON/Fixtures/nested_timezones.json b/src/adapter/etl-adapter-json/tests/Flow/ETL/Adapter/JSON/Tests/Fixtures/nested_timezones.json similarity index 100% rename from src/adapter/etl-adapter-json/tests/Flow/ETL/Tests/Integration/Adapter/JSON/Fixtures/nested_timezones.json rename to src/adapter/etl-adapter-json/tests/Flow/ETL/Adapter/JSON/Tests/Fixtures/nested_timezones.json diff --git a/src/adapter/etl-adapter-json/tests/Flow/ETL/Tests/Integration/Adapter/JSON/Fixtures/timezones.json b/src/adapter/etl-adapter-json/tests/Flow/ETL/Adapter/JSON/Tests/Fixtures/timezones.json similarity index 100% rename from src/adapter/etl-adapter-json/tests/Flow/ETL/Tests/Integration/Adapter/JSON/Fixtures/timezones.json rename to src/adapter/etl-adapter-json/tests/Flow/ETL/Adapter/JSON/Tests/Fixtures/timezones.json diff --git a/src/adapter/etl-adapter-json/tests/Flow/ETL/Tests/Integration/Adapter/JSON/JSONMachine/JsonExtractorTest.php b/src/adapter/etl-adapter-json/tests/Flow/ETL/Adapter/JSON/Tests/Integration/JSONMachine/JsonExtractorTest.php similarity index 89% rename from src/adapter/etl-adapter-json/tests/Flow/ETL/Tests/Integration/Adapter/JSON/JSONMachine/JsonExtractorTest.php rename to src/adapter/etl-adapter-json/tests/Flow/ETL/Adapter/JSON/Tests/Integration/JSONMachine/JsonExtractorTest.php index f4bb29c33..109fda135 100644 --- a/src/adapter/etl-adapter-json/tests/Flow/ETL/Tests/Integration/Adapter/JSON/JSONMachine/JsonExtractorTest.php +++ b/src/adapter/etl-adapter-json/tests/Flow/ETL/Adapter/JSON/Tests/Integration/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/src/adapter/etl-adapter-json/tests/Flow/ETL/Tests/Integration/Adapter/JSON/JsonLoaderTest.php b/src/adapter/etl-adapter-json/tests/Flow/ETL/Adapter/JSON/Tests/Integration/JsonLoaderTest.php similarity index 99% rename from src/adapter/etl-adapter-json/tests/Flow/ETL/Tests/Integration/Adapter/JSON/JsonLoaderTest.php rename to src/adapter/etl-adapter-json/tests/Flow/ETL/Adapter/JSON/Tests/Integration/JsonLoaderTest.php index 1c2b34409..16c168600 100644 --- a/src/adapter/etl-adapter-json/tests/Flow/ETL/Tests/Integration/Adapter/JSON/JsonLoaderTest.php +++ b/src/adapter/etl-adapter-json/tests/Flow/ETL/Adapter/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/src/adapter/etl-adapter-logger/tests/Flow/ETL/Tests/Unit/Adapter/Logger/Logger/DumpLoggerTest.php b/src/adapter/etl-adapter-logger/tests/Flow/ETL/Adapter/Logger/Tests/Unit/Logger/DumpLoggerTest.php similarity index 91% rename from src/adapter/etl-adapter-logger/tests/Flow/ETL/Tests/Unit/Adapter/Logger/Logger/DumpLoggerTest.php rename to src/adapter/etl-adapter-logger/tests/Flow/ETL/Adapter/Logger/Tests/Unit/Logger/DumpLoggerTest.php index a39e4d14b..0f0d640c0 100644 --- a/src/adapter/etl-adapter-logger/tests/Flow/ETL/Tests/Unit/Adapter/Logger/Logger/DumpLoggerTest.php +++ b/src/adapter/etl-adapter-logger/tests/Flow/ETL/Adapter/Logger/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/src/adapter/etl-adapter-logger/tests/Flow/ETL/Tests/Unit/Adapter/Logger/PsrLoggerLoaderTest.php b/src/adapter/etl-adapter-logger/tests/Flow/ETL/Adapter/Logger/Tests/Unit/PsrLoggerLoaderTest.php similarity index 96% rename from src/adapter/etl-adapter-logger/tests/Flow/ETL/Tests/Unit/Adapter/Logger/PsrLoggerLoaderTest.php rename to src/adapter/etl-adapter-logger/tests/Flow/ETL/Adapter/Logger/Tests/Unit/PsrLoggerLoaderTest.php index e16c394c9..3f759bb2f 100644 --- a/src/adapter/etl-adapter-logger/tests/Flow/ETL/Tests/Unit/Adapter/Logger/PsrLoggerLoaderTest.php +++ b/src/adapter/etl-adapter-logger/tests/Flow/ETL/Adapter/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/src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Async/Tests/Integration/ReactPHP/Server/SocketServerClientTest.php b/src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Adapter/ReactPHP/Tests/Integration/Server/SocketServerClientTest.php similarity index 98% rename from src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Async/Tests/Integration/ReactPHP/Server/SocketServerClientTest.php rename to src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Adapter/ReactPHP/Tests/Integration/Server/SocketServerClientTest.php index ff7dc0220..bf063dbb6 100644 --- a/src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Async/Tests/Integration/ReactPHP/Server/SocketServerClientTest.php +++ b/src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Adapter/ReactPHP/Tests/Integration/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/src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Async/Tests/Unit/ReactPHP/Server/SocketServerTest.php b/src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Adapter/ReactPHP/Tests/Unit/Server/SocketServerTest.php similarity index 94% rename from src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Async/Tests/Unit/ReactPHP/Server/SocketServerTest.php rename to src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Adapter/ReactPHP/Tests/Unit/Server/SocketServerTest.php index b3ab02f5f..cdd397b67 100644 --- a/src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Async/Tests/Unit/ReactPHP/Server/SocketServerTest.php +++ b/src/adapter/etl-adapter-reactphp/tests/Flow/ETL/Adapter/ReactPHP/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/src/adapter/etl-adapter-xml/tests/Flow/ETL/Tests/Integration/Adapter/XML/xml/simple_items.xml b/src/adapter/etl-adapter-xml/tests/Flow/ETL/Adapter/XML/Tests/Fixtures/simple_items.xml similarity index 100% rename from src/adapter/etl-adapter-xml/tests/Flow/ETL/Tests/Integration/Adapter/XML/xml/simple_items.xml rename to src/adapter/etl-adapter-xml/tests/Flow/ETL/Adapter/XML/Tests/Fixtures/simple_items.xml diff --git a/src/adapter/etl-adapter-xml/tests/Flow/ETL/Tests/Integration/Adapter/XML/xml/simple_items_flat.xml b/src/adapter/etl-adapter-xml/tests/Flow/ETL/Adapter/XML/Tests/Fixtures/simple_items_flat.xml similarity index 100% rename from src/adapter/etl-adapter-xml/tests/Flow/ETL/Tests/Integration/Adapter/XML/xml/simple_items_flat.xml rename to src/adapter/etl-adapter-xml/tests/Flow/ETL/Adapter/XML/Tests/Fixtures/simple_items_flat.xml diff --git a/src/adapter/etl-adapter-xml/tests/Flow/ETL/Tests/Integration/Adapter/XML/XMLReaderExtractorTest.php b/src/adapter/etl-adapter-xml/tests/Flow/ETL/Adapter/XML/Tests/Integration/XMLReaderExtractorTest.php similarity index 84% rename from src/adapter/etl-adapter-xml/tests/Flow/ETL/Tests/Integration/Adapter/XML/XMLReaderExtractorTest.php rename to src/adapter/etl-adapter-xml/tests/Flow/ETL/Adapter/XML/Tests/Integration/XMLReaderExtractorTest.php index 59740d686..18fa28e2a 100644 --- a/src/adapter/etl-adapter-xml/tests/Flow/ETL/Tests/Integration/Adapter/XML/XMLReaderExtractorTest.php +++ b/src/adapter/etl-adapter-xml/tests/Flow/ETL/Adapter/XML/Tests/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', '5')), ), (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() ); }