From 4bca99dbacfa4754f70911fd0d83f93504dc8b09 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 24 Sep 2023 14:19:20 +0000 Subject: [PATCH] fix tests --- .github/workflows/main.yml | 2 +- tests/Controller/ApiControllerTest.php | 302 ++++++++++++------------- 2 files changed, 152 insertions(+), 152 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e12c33f..3281bdf 100755 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,7 +42,7 @@ jobs: run: composer install - name: Autoformat run: | - vendor/bin/php-cs-fixer fix ./ --rules=''{"array_syntax": {"syntax": "short"}, "blank_line_after_namespace": true, "global_namespace_import": {"import_classes": false, "import_constants": false, "import_functions": false}, "binary_operator_spaces": {"operators": {"=": "align", ".=": "align", "+=": "align", "-=": "align", "*=": "align", "/=": "align", "|=": "align", "&=": "align", "=>": "align", "??=": "align", ">>=": "align", "<<=": "align"}}, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": {"const": "one", "method": "one", "property": "one"} }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "declare_equal_normalize": {"space": "none"}, "elseif": true, "encoding": true, "explicit_indirect_variable": true, "explicit_string_variable": true, "function_to_constant": true, "implode_call": true, "increment_style": {"style": "pre"}, "is_null": true, "yoda_style": {"equal": false, "identical": false, "less_and_greater": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "constant_case": {"case": "lower"}, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": {"include": ["@all"]}, "new_with_braces": true, "no_extra_blank_lines": {"tokens": ["break", "case", "continue", "curly_brace_block", "extra", "return", "switch", "throw", "use"]}, "no_spaces_after_function_name": true, "no_alias_functions": true, "no_closing_tag": true, "no_empty_comment": true, "no_empty_phpdoc": true, "no_empty_statement": true, "no_homoglyph_names": true, "no_mixed_echo_print": {"use": "echo"}, "no_php4_constructor": true, "no_singleline_whitespace_before_semicolons": true, "no_spaces_inside_parenthesis": true, "no_trailing_whitespace": true, "no_unneeded_final_method": true, "no_unused_imports": true, "no_useless_return": true, "no_whitespace_before_comma_in_array": true, "no_whitespace_in_blank_line": true, "non_printable_character": true, "normalize_index_brace": true, "ordered_imports": {"sort_algorithm": "alpha"}, "ordered_interfaces": {"order": "alpha"}, "php_unit_construct": true, "php_unit_internal_class": true, "php_unit_set_up_tear_down_visibility": true, "phpdoc_indent": true, "phpdoc_align": {"align": "vertical"}, "phpdoc_annotation_without_dot": true, "phpdoc_scalar": true, "phpdoc_return_self_reference": {"replacements": {"this": "self"}}, "phpdoc_trim": true, "phpdoc_trim_consecutive_blank_line_separation": true, "random_api_migration": true, "self_accessor": true, "return_type_declaration": {"space_before": "one"}, "semicolon_after_instruction": true, "set_type_to_cast": true, "short_scalar_cast": true, "single_blank_line_at_eof": true, "single_line_after_imports": true, "standardize_increment": true, "trailing_comma_in_multiline": true, "trim_array_spaces": true, "visibility_required": true, "void_return": true}'' --allow-risky=yes + vendor/bin/php-cs-fixer fix ./ --rules='{"array_syntax": {"syntax": "short"}, "blank_line_after_namespace": true, "global_namespace_import": {"import_classes": false, "import_constants": false, "import_functions": false}, "binary_operator_spaces": {"operators": {"=": "align", ".=": "align", "+=": "align", "-=": "align", "*=": "align", "/=": "align", "|=": "align", "&=": "align", "=>": "align", "??=": "align", ">>=": "align", "<<=": "align"}}, "cast_spaces": {"space": "single"}, "class_attributes_separation": { "elements": {"const": "one", "method": "one", "property": "one"} }, "combine_consecutive_issets": true, "compact_nullable_typehint": true, "declare_strict_types": true, "declare_equal_normalize": {"space": "none"}, "elseif": true, "encoding": true, "explicit_indirect_variable": true, "explicit_string_variable": true, "function_to_constant": true, "implode_call": true, "increment_style": {"style": "pre"}, "is_null": true, "yoda_style": {"equal": false, "identical": false, "less_and_greater": false}, "line_ending": true, "logical_operators": true, "lowercase_cast": true, "constant_case": {"case": "lower"}, "lowercase_keywords": true, "modernize_types_casting": true, "native_constant_invocation": true, "native_function_casing": true, "native_function_invocation": {"include": ["@all"]}, "new_with_braces": true, "no_extra_blank_lines": {"tokens": ["break", "case", "continue", "curly_brace_block", "extra", "return", "switch", "throw", "use"]}, "no_spaces_after_function_name": true, "no_alias_functions": true, "no_closing_tag": true, "no_empty_comment": true, "no_empty_phpdoc": true, "no_empty_statement": true, "no_homoglyph_names": true, "no_mixed_echo_print": {"use": "echo"}, "no_php4_constructor": true, "no_singleline_whitespace_before_semicolons": true, "no_spaces_inside_parenthesis": true, "no_trailing_whitespace": true, "no_unneeded_final_method": true, "no_unused_imports": true, "no_useless_return": true, "no_whitespace_before_comma_in_array": true, "no_whitespace_in_blank_line": true, "non_printable_character": true, "normalize_index_brace": true, "ordered_imports": {"sort_algorithm": "alpha"}, "ordered_interfaces": {"order": "alpha"}, "php_unit_construct": true, "php_unit_internal_class": true, "php_unit_set_up_tear_down_visibility": true, "phpdoc_indent": true, "phpdoc_align": {"align": "vertical"}, "phpdoc_annotation_without_dot": true, "phpdoc_scalar": true, "phpdoc_return_self_reference": {"replacements": {"this": "self"}}, "phpdoc_trim": true, "phpdoc_trim_consecutive_blank_line_separation": true, "random_api_migration": true, "self_accessor": true, "return_type_declaration": {"space_before": "one"}, "semicolon_after_instruction": true, "set_type_to_cast": true, "short_scalar_cast": true, "single_blank_line_at_eof": true, "single_line_after_imports": true, "standardize_increment": true, "trailing_comma_in_multiline": true, "trim_array_spaces": true, "visibility_required": true, "void_return": true}' --allow-risky=yes vendor/bin/phpcbf --standard=Build/Config/phpcs.xml ./ - name: Check for modified files id: git-check diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 9d909ed..83bd1f7 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -92,187 +92,187 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase TestUtils::setMember($this->module, 'app', $this->app); } - // /** - // * @covers Modules\Exchange\Controller\ApiController - // * @group module - // */ - // public function testInterfaceInstall() : void - // { - // $exchanges = \scandir(__DIR__ . '/../Interfaces'); + /** + * @covers Modules\Exchange\Controller\ApiController + * @group module + */ + public function testInterfaceInstall() : void + { + $exchanges = \scandir(__DIR__ . '/../Interfaces'); - // if (!\is_dir(__DIR__ . '/temp')) { - // \mkdir(__DIR__ . '/temp'); - // } + if (!\is_dir(__DIR__ . '/temp')) { + \mkdir(__DIR__ . '/temp'); + } - // foreach ($exchanges as $exchange) { - // if (!\is_dir(__DIR__ . '/../Interfaces/' . $exchange) || $exchange === '..' || $exchange === '.') { - // continue; - // } + foreach ($exchanges as $exchange) { + if (!\is_dir(__DIR__ . '/../Interfaces/' . $exchange) || $exchange === '..' || $exchange === '.') { + continue; + } - // $data = \json_decode(\file_get_contents(__DIR__ . '/../Interfaces/' . $exchange . '/interface.json'), true); + $data = \json_decode(\file_get_contents(__DIR__ . '/../Interfaces/' . $exchange . '/interface.json'), true); - // $response = new HttpResponse(); - // $request = new HttpRequest(new HttpUri('')); + $response = new HttpResponse(); + $request = new HttpRequest(new HttpUri('')); - // $request->header->account = 1; - // $request->setData('title', $data['name']); - // $request->setData('export', (bool) $data['export']); - // $request->setData('import', (bool) $data['import']); - // $request->setData('website', $data['website']); + $request->header->account = 1; + $request->setData('title', $data['name']); + $request->setData('export', (bool) $data['export']); + $request->setData('import', (bool) $data['import']); + $request->setData('website', $data['website']); - // $files = []; + $files = []; - // $exchangeFiles = \scandir(__DIR__ . '/../Interfaces/' . $exchange); - // foreach ($exchangeFiles as $filePath) { - // if ($filePath === '..' || $filePath === '.') { - // continue; - // } + $exchangeFiles = \scandir(__DIR__ . '/../Interfaces/' . $exchange); + foreach ($exchangeFiles as $filePath) { + if ($filePath === '..' || $filePath === '.') { + continue; + } - // if (\is_dir(__DIR__ . '/../Interfaces/' . $exchange . '/' . $filePath)) { - // $subdir = \scandir(__DIR__ . '/../Interfaces/' . $exchange . '/' . $filePath); - // foreach ($subdir as $subPath) { - // if (!\is_file(__DIR__ . '/../Interfaces/' . $exchange . '/' . $filePath . '/' . $subPath)) { - // continue; - // } + if (\is_dir(__DIR__ . '/../Interfaces/' . $exchange . '/' . $filePath)) { + $subdir = \scandir(__DIR__ . '/../Interfaces/' . $exchange . '/' . $filePath); + foreach ($subdir as $subPath) { + if (!\is_file(__DIR__ . '/../Interfaces/' . $exchange . '/' . $filePath . '/' . $subPath)) { + continue; + } - // \copy( - // __DIR__ . '/../Interfaces/' . $exchange . '/' . $filePath . '/' . $subPath, - // __DIR__ . '/temp/' . $subPath - // ); + \copy( + __DIR__ . '/../Interfaces/' . $exchange . '/' . $filePath . '/' . $subPath, + __DIR__ . '/temp/' . $subPath + ); - // $files[] = [ - // 'error' => \UPLOAD_ERR_OK, - // 'type' => \substr($subPath, \strrpos($subPath, '.') + 1), - // 'name' => $filePath . '/' . $subPath, - // 'tmp_name' => __DIR__ . '/temp/' . $subPath, - // 'size' => \filesize(__DIR__ . '/temp/' . $subPath), - // ]; - // } - // } else { - // if (!\is_file(__DIR__ . '/../Interfaces/' . $exchange . '/' . $filePath)) { - // continue; - // } + $files[] = [ + 'error' => \UPLOAD_ERR_OK, + 'type' => \substr($subPath, \strrpos($subPath, '.') + 1), + 'name' => $filePath . '/' . $subPath, + 'tmp_name' => __DIR__ . '/temp/' . $subPath, + 'size' => \filesize(__DIR__ . '/temp/' . $subPath), + ]; + } + } else { + if (!\is_file(__DIR__ . '/../Interfaces/' . $exchange . '/' . $filePath)) { + continue; + } - // \copy(__DIR__ . '/../Interfaces/' . $exchange . '/' . $filePath, __DIR__ . '/temp/' . $filePath); + \copy(__DIR__ . '/../Interfaces/' . $exchange . '/' . $filePath, __DIR__ . '/temp/' . $filePath); - // $files[] = [ - // 'error' => \UPLOAD_ERR_OK, - // 'type' => \substr($filePath, \strrpos($filePath, '.') + 1), - // 'name' => $filePath, - // 'tmp_name' => __DIR__ . '/temp/' . $filePath, - // 'size' => \filesize(__DIR__ . '/temp/' . $filePath), - // ]; - // } - // } + $files[] = [ + 'error' => \UPLOAD_ERR_OK, + 'type' => \substr($filePath, \strrpos($filePath, '.') + 1), + 'name' => $filePath, + 'tmp_name' => __DIR__ . '/temp/' . $filePath, + 'size' => \filesize(__DIR__ . '/temp/' . $filePath), + ]; + } + } - // TestUtils::setMember($request, 'files', $files); + TestUtils::setMember($request, 'files', $files); - // $this->module->apiInterfaceInstall($request, $response); - // self::assertGreaterThan(0, $response->get('')['response']->id); - // } + $this->module->apiInterfaceInstall($request, $response); + self::assertGreaterThan(0, $response->get('')['response']->id); + } - // if (\is_dir(__DIR__ . '/temp')) { - // \rmdir(__DIR__ . '/temp'); - // } - // } + if (\is_dir(__DIR__ . '/temp')) { + \rmdir(__DIR__ . '/temp'); + } + } - // /** - // * @covers Modules\Exchange\Controller\ApiController - // * @group module - // */ - // public function testInterfaceInstallInvalidData() : void - // { - // $response = new HttpResponse(); - // $request = new HttpRequest(new HttpUri('')); + /** + * @covers Modules\Exchange\Controller\ApiController + * @group module + */ + public function testInterfaceInstallInvalidData() : void + { + $response = new HttpResponse(); + $request = new HttpRequest(new HttpUri('')); - // $request->header->account = 1; - // $request->setData('invalid', '1'); + $request->header->account = 1; + $request->setData('invalid', '1'); - // $this->module->apiInterfaceInstall($request, $response); - // self::assertEquals(RequestStatusCode::R_400, $response->header->status); - // } + $this->module->apiInterfaceInstall($request, $response); + self::assertEquals(RequestStatusCode::R_400, $response->header->status); + } - // /** - // * @covers Modules\Exchange\Controller\ApiController - // * @group module - // */ - // public function testExport() : void - // { - // $response = new HttpResponse(); - // $request = new HttpRequest(new HttpUri('')); + /** + * @covers Modules\Exchange\Controller\ApiController + * @group module + */ + public function testExport() : void + { + $response = new HttpResponse(); + $request = new HttpRequest(new HttpUri('')); - // $request->header->account = 1; - // $request->setData('id', '1'); - // $request->setData('type', 'language'); + $request->header->account = 1; + $request->setData('id', '1'); + $request->setData('type', 'language'); - // $this->module->apiExchangeExport($request, $response); - // self::assertTrue(\strlen($response->get('')) > 500); - // } + $this->module->apiExchangeExport($request, $response); + self::assertTrue(\strlen($response->get('')) > 500); + } - // /** - // * @covers Modules\Exchange\Controller\ApiController - // * @group module - // */ - // public function testExportInvalidInterface() : void - // { - // $response = new HttpResponse(); - // $request = new HttpRequest(new HttpUri('')); + /** + * @covers Modules\Exchange\Controller\ApiController + * @group module + */ + public function testExportInvalidInterface() : void + { + $response = new HttpResponse(); + $request = new HttpRequest(new HttpUri('')); - // $request->header->account = 1; - // $request->setData('id', '9999'); - // $request->setData('type', 'language'); + $request->header->account = 1; + $request->setData('id', '9999'); + $request->setData('type', 'language'); - // $this->module->apiExchangeExport($request, $response); - // self::assertEquals(RequestStatusCode::R_400, $response->header->status); - // } + $this->module->apiExchangeExport($request, $response); + self::assertEquals(RequestStatusCode::R_400, $response->header->status); + } - // /** - // * @covers Modules\Exchange\Controller\ApiController - // * @group module - // */ - // public function testLanguageImport() : void - // { - // $response = new HttpResponse(); - // $request = new HttpRequest(new HttpUri('')); + /** + * @covers Modules\Exchange\Controller\ApiController + * @group module + */ + public function testLanguageImport() : void + { + $response = new HttpResponse(); + $request = new HttpRequest(new HttpUri('')); - // $request->header->account = 1; - // $request->setData('id', '1'); - // $request->setData('type', 'language'); + $request->header->account = 1; + $request->setData('id', '1'); + $request->setData('type', 'language'); - // if (!\is_file(__DIR__ . '/test_tmp.csv')) { - // \copy(__DIR__ . '/../Interfaces/OMS/test.csv', __DIR__ . '/test_tmp.csv'); - // } + if (!\is_file(__DIR__ . '/test_tmp.csv')) { + \copy(__DIR__ . '/../Interfaces/OMS/test.csv', __DIR__ . '/test_tmp.csv'); + } - // TestUtils::setMember($request, 'files', [ - // 'file0' => [ - // 'name' => 'test_tmp.csv', - // 'type' => 'csv', - // 'tmp_name' => __DIR__ . '/test_tmp.csv', - // 'error' => \UPLOAD_ERR_OK, - // 'size' => \filesize(__DIR__ . '/test_tmp.csv'), - // ], - // ]); + TestUtils::setMember($request, 'files', [ + 'file0' => [ + 'name' => 'test_tmp.csv', + 'type' => 'csv', + 'tmp_name' => __DIR__ . '/test_tmp.csv', + 'error' => \UPLOAD_ERR_OK, + 'size' => \filesize(__DIR__ . '/test_tmp.csv'), + ], + ]); - // $this->module->apiExchangeImport($request, $response); - // self::assertEquals( - // \date('Y-m-d'), - // \date('Y-m-d', \filemtime(__DIR__ . '/../../../TestModule/Theme/Backend/Lang/en.lang.php')) - // ); - // } + $this->module->apiExchangeImport($request, $response); + self::assertEquals( + \date('Y-m-d'), + \date('Y-m-d', \filemtime(__DIR__ . '/../../../TestModule/Theme/Backend/Lang/en.lang.php')) + ); + } - // /** - // * @covers Modules\Exchange\Controller\ApiController - // * @group module - // */ - // public function testImportInvalidInterface() : void - // { - // $response = new HttpResponse(); - // $request = new HttpRequest(new HttpUri('')); + /** + * @covers Modules\Exchange\Controller\ApiController + * @group module + */ + public function testImportInvalidInterface() : void + { + $response = new HttpResponse(); + $request = new HttpRequest(new HttpUri('')); - // $request->header->account = 1; - // $request->setData('id', '9999'); + $request->header->account = 1; + $request->setData('id', '9999'); - // $this->module->apiExchangeExport($request, $response); - // self::assertEquals(RequestStatusCode::R_400, $response->header->status); - // } + $this->module->apiExchangeExport($request, $response); + self::assertEquals(RequestStatusCode::R_400, $response->header->status); + } }