From acf4ea21f37909e93911553a7ab03c65f97b8b16 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 21 Sep 2023 22:22:41 +0000 Subject: [PATCH] test fixes --- Uri/UriFactory.php | 6 ++++++ .../Spreadsheet/SpreadsheetDatabaseMapper.php | 2 ++ .../Database/Schema/BuilderTest.php | 18 ++++++++++++++---- tests/Message/Cli/CliRequestTest.php | 2 +- tests/Message/Http/HttpHeaderTest.php | 2 +- tests/Message/Http/HttpRequestLanguage.php | 2 +- tests/Message/Http/HttpRequestTest.php | 4 ++-- tests/Message/Http/RestTest.php | 1 + tests/Message/Mail/EmailTest.php | 2 +- tests/Module/testPackage/info.json | 2 +- tests/Stdlib/Base/AddressTest.php | 18 ++++++------------ tests/Stdlib/Base/EnumTest.php | 6 ++---- tests/Stdlib/Graph/GraphTest.php | 2 +- tests/Uri/UriFactoryTest.php | 4 ++-- 14 files changed, 41 insertions(+), 30 deletions(-) diff --git a/Uri/UriFactory.php b/Uri/UriFactory.php index e979dca88..5c4935f2f 100755 --- a/Uri/UriFactory.php +++ b/Uri/UriFactory.php @@ -34,6 +34,12 @@ final class UriFactory */ private static array $uri = []; + /** + * Function for parsing urls + * + * @var null|\Closure + * @since 1.0.0 + */ private static ?\Closure $replaceFunction = null; /** diff --git a/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php b/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php index d70b44066..148543973 100755 --- a/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php +++ b/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php @@ -104,6 +104,8 @@ class SpreadsheetDatabaseMapper implements IODatabaseMapper $cells[] = $row; } + var_dump($cells); + ++$line; $query->values(...$cells); diff --git a/tests/DataStorage/Database/Schema/BuilderTest.php b/tests/DataStorage/Database/Schema/BuilderTest.php index af3ecb0d0..b988c99c0 100755 --- a/tests/DataStorage/Database/Schema/BuilderTest.php +++ b/tests/DataStorage/Database/Schema/BuilderTest.php @@ -150,8 +150,7 @@ final class BuilderTest extends \PHPUnit\Framework\TestCase $sql = 'SELECT * FROM pragma_table_info(\'test\') WHERE pragma_table_info(\'test\') = \'test\';'; } - $sql = ''; - $sql = \strtr($sql, '[]', $iS . $iE); + $sql = \strtr($sql, '[]', $iS . $iE); self::assertEquals($sql, $query->selectFields('test')->toSql()); } @@ -173,8 +172,19 @@ final class BuilderTest extends \PHPUnit\Framework\TestCase // @todo: fix, this is not correct for sqlite $query = new Builder($con); - $sql = 'CREATE TABLE IF NOT EXISTS [user_roles] ([user_id] INT AUTO_INCREMENT, [role_id] VARCHAR(10) DEFAULT \'1\' NULL, PRIMARY KEY ([user_id]), FOREIGN KEY ([user_id]) REFERENCES [users] ([ext1_id]), FOREIGN KEY ([role_id]) REFERENCES [roles] ([ext2_id])) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT=1;'; - $sql = \strtr($sql, '[]', $iS . $iE); + + $sql = ''; + if ($con instanceof MysqlConnection) { + $sql = 'CREATE TABLE IF NOT EXISTS [user_roles] ([user_id] INT AUTO_INCREMENT, [role_id] VARCHAR(10) DEFAULT \'1\' NULL, PRIMARY KEY ([user_id]), FOREIGN KEY ([user_id]) REFERENCES [users] ([ext1_id]), FOREIGN KEY ([role_id]) REFERENCES [roles] ([ext2_id])) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 AUTO_INCREMENT=1;'; + } elseif ($con instanceof PostgresConnection) { + $sql = 'CREATE TABLE IF NOT EXISTS [user_roles] ([user_id] INT AUTO_INCREMENT, [role_id] VARCHAR(10) DEFAULT \'1\' NULL, PRIMARY KEY ([user_id]), FOREIGN KEY ([user_id]) REFERENCES [users] ([ext1_id]), FOREIGN KEY ([role_id]) REFERENCES [roles] ([ext2_id]));'; + } elseif ($con instanceof SqlServerConnection) { + $sql = 'CREATE TABLE IF NOT EXISTS [user_roles] ([user_id] INT AUTO_INCREMENT, [role_id] VARCHAR(10) DEFAULT \'1\' NULL, PRIMARY KEY ([user_id]), FOREIGN KEY ([user_id]) REFERENCES [users] ([ext1_id]), FOREIGN KEY ([role_id]) REFERENCES [roles] ([ext2_id]));'; + } elseif ($con instanceof SQLiteConnection) { + $sql = 'CREATE TABLE IF NOT EXISTS [user_roles] ([user_id] INT AUTO_INCREMENT, [role_id] VARCHAR(10) DEFAULT \'1\' NULL, PRIMARY KEY ([user_id]), FOREIGN KEY ([user_id]) REFERENCES [users] ([ext1_id]), FOREIGN KEY ([role_id]) REFERENCES [roles] ([ext2_id]));'; + } + + $sql = \strtr($sql, '[]', $iS . $iE); self::assertEquals( $sql, $query->createTable('user_roles') diff --git a/tests/Message/Cli/CliRequestTest.php b/tests/Message/Cli/CliRequestTest.php index b7643af22..8a06a8f73 100755 --- a/tests/Message/Cli/CliRequestTest.php +++ b/tests/Message/Cli/CliRequestTest.php @@ -150,7 +150,7 @@ final class CliRequestTest extends \PHPUnit\Framework\TestCase self::assertTrue($this->request->setData('key', 'value')); self::assertTrue($this->request->setData('key', 'value2', true)); self::assertEquals('value2', $this->request->getData('key')); - self::assertEquals(['-key', 'value2'], $this->request->getData()); + self::assertEquals(['key', 'value2'], $this->request->getData()); } /** diff --git a/tests/Message/Http/HttpHeaderTest.php b/tests/Message/Http/HttpHeaderTest.php index 5f87e0897..31be55068 100755 --- a/tests/Message/Http/HttpHeaderTest.php +++ b/tests/Message/Http/HttpHeaderTest.php @@ -192,7 +192,7 @@ final class HttpHeaderTest extends \PHPUnit\Framework\TestCase $consts = RequestStatusCode::getConstants(); foreach ($consts as $status) { $this->header->generate($status); - self::assertTrue(\stripos($this->header->get('status')[0], (string) $status) !== false); + self::assertTrue(\stripos($this->header->get('status')[0], (string) $status) !== false, 'Failed for ' . $status); } } diff --git a/tests/Message/Http/HttpRequestLanguage.php b/tests/Message/Http/HttpRequestLanguage.php index 9a24b3b8f..6eb636dbf 100755 --- a/tests/Message/Http/HttpRequestLanguage.php +++ b/tests/Message/Http/HttpRequestLanguage.php @@ -7,4 +7,4 @@ use phpOMS\Message\Http\HttpRequest; $request = HttpRequest::createFromSuperglobals(); -echo $request->header->l11n->country; +echo $request->header->l11n->language; diff --git a/tests/Message/Http/HttpRequestTest.php b/tests/Message/Http/HttpRequestTest.php index 79940d99f..d8b55a076 100755 --- a/tests/Message/Http/HttpRequestTest.php +++ b/tests/Message/Http/HttpRequestTest.php @@ -59,7 +59,7 @@ final class HttpRequestTest extends \PHPUnit\Framework\TestCase self::assertEquals('', $request->__toString()); self::assertFalse($request->hasData('key')); self::assertNull($request->getData('key')); - self::assertEquals('en', $request->header->l11n->country); + self::assertEquals('XX', $request->header->l11n->country); self::assertEquals('en_US', $request->getLocale()); } @@ -271,7 +271,7 @@ final class HttpRequestTest extends \PHPUnit\Framework\TestCase ]; $request->setData('abc', \json_encode($data) . ','); - self::assertEquals([], $request->getDataJson('abc')); + self::assertEquals($data, $request->getDataJson('abc')); } /** diff --git a/tests/Message/Http/RestTest.php b/tests/Message/Http/RestTest.php index d2d48f337..10aebe4f3 100755 --- a/tests/Message/Http/RestTest.php +++ b/tests/Message/Http/RestTest.php @@ -52,6 +52,7 @@ final class RestTest extends \PHPUnit\Framework\TestCase $request = new HttpRequest(new HttpUri('http://httpbin.org/post')); $request->setMethod(RequestMethod::POST); self::assertTrue($request->setData('pdata', 'abc')); + var_dump(REST::request($request)->getJsonData()); self::assertEquals('abc', REST::request($request)->getJsonData()['form']['pdata'] ?? ''); } diff --git a/tests/Message/Mail/EmailTest.php b/tests/Message/Mail/EmailTest.php index b1202f383..e25af6705 100755 --- a/tests/Message/Mail/EmailTest.php +++ b/tests/Message/Mail/EmailTest.php @@ -56,7 +56,7 @@ final class EmailTestTest extends \PHPUnit\Framework\TestCase public function testInvalidFromInputOutput() : void { self::assertFalse($this->mail->setFrom('Test Name ')); - self::assertEquals([0 => '', 1 => ''], $this->mail->from); + self::assertEquals([], $this->mail->from); } public function testContentTypeInputOutput() : void diff --git a/tests/Module/testPackage/info.json b/tests/Module/testPackage/info.json index d58cde244..e15ab2375 100755 --- a/tests/Module/testPackage/info.json +++ b/tests/Module/testPackage/info.json @@ -5,7 +5,7 @@ "update": [ { "download": { - "https://raw.githubusercontent.com/Jingga-Management/Jingga/develop/README.md": "README.md" + "https://raw.githubusercontent.com/Karaka-Management/Karaka/develop/README.md": "README.md" }, "move": { "toMove": "moveHere" diff --git a/tests/Stdlib/Base/AddressTest.php b/tests/Stdlib/Base/AddressTest.php index 7af57a052..3a5166c34 100755 --- a/tests/Stdlib/Base/AddressTest.php +++ b/tests/Stdlib/Base/AddressTest.php @@ -50,10 +50,8 @@ final class AddressTest extends \PHPUnit\Framework\TestCase 'country' => 'XX', 'address' => '', 'state' => '', - 'geo' => [ - 'lat' => 0, - 'long' => 0, - ], + 'lat' => 0.0, + 'lon' => 0.0, ], ]; @@ -114,10 +112,8 @@ final class AddressTest extends \PHPUnit\Framework\TestCase 'country' => 'XX', 'address' => '', 'state' => '', - 'geo' => [ - 'lat' => 0, - 'long' => 0, - ], + 'lat' => 0.0, + 'lon' => 0.0, ], ]; @@ -144,10 +140,8 @@ final class AddressTest extends \PHPUnit\Framework\TestCase 'country' => 'XX', 'address' => '', 'state' => '', - 'geo' => [ - 'lat' => 0, - 'long' => 0, - ], + 'lat' => 0.0, + 'lon' => 0.0, ], ]; diff --git a/tests/Stdlib/Base/EnumTest.php b/tests/Stdlib/Base/EnumTest.php index 71d6145c1..13e25e8a5 100755 --- a/tests/Stdlib/Base/EnumTest.php +++ b/tests/Stdlib/Base/EnumTest.php @@ -138,14 +138,12 @@ final class EnumTest extends \PHPUnit\Framework\TestCase } /** - * @testdox A invalid enum name throws a OutOfBoundsException + * @testdox A invalid enum name returns null * @covers phpOMS\Stdlib\Base\Enum * @group framework */ public function testInvalidConstantException() : void { - $this->expectException(\Exception::class); - - EnumDemo::getByName('ENUM3'); + self::assertEquals(null, EnumDemo::getByName('ENUM3')); } } diff --git a/tests/Stdlib/Graph/GraphTest.php b/tests/Stdlib/Graph/GraphTest.php index 7f14e2b40..cec8ad14a 100755 --- a/tests/Stdlib/Graph/GraphTest.php +++ b/tests/Stdlib/Graph/GraphTest.php @@ -830,7 +830,7 @@ final class GraphTest extends \PHPUnit\Framework\TestCase $node3->setNodeRelative($node5); $node4->setNodeRelative($node5); - self::assertGreaterThan(3, $this->graph->getGirth()); + self::assertEquals(3, $this->graph->getGirth()); } /** diff --git a/tests/Uri/UriFactoryTest.php b/tests/Uri/UriFactoryTest.php index 6f1bb09f8..b0f95fb28 100755 --- a/tests/Uri/UriFactoryTest.php +++ b/tests/Uri/UriFactoryTest.php @@ -188,10 +188,10 @@ final class UriFactoryTest extends \PHPUnit\Framework\TestCase UriFactory::setupUriBuilder(new HttpUri($uri)); - self::assertEquals($uri, UriFactory::build('{/base}{/rootPath}{/}?id={?id}&ab={?ab}#{#}')); + self::assertEquals($uri, UriFactory::build('{/tld}{/rootPath}{/}?id={?id}&ab={?ab}#{#}')); self::assertEquals($uri, UriFactory::build('{/scheme}://{/host}{/rootPath}{/}?id={?id}&ab={?ab}#{#}')); self::assertEquals($uri, UriFactory::build('{%}')); - self::assertEquals($uri, UriFactory::build('{/base}{/rootPath}{/}?{?}#{#}')); + self::assertEquals($uri, UriFactory::build('{/tld}{/rootPath}{/}?{?}#{#}')); } /**