mirror of
https://github.com/Karaka-Management/phpOMS.git
synced 2026-01-24 23:28:40 +00:00
test fixes
This commit is contained in:
parent
05d913b09a
commit
acf4ea21f3
|
|
@ -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;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -104,6 +104,8 @@ class SpreadsheetDatabaseMapper implements IODatabaseMapper
|
|||
$cells[] = $row;
|
||||
}
|
||||
|
||||
var_dump($cells);
|
||||
|
||||
++$line;
|
||||
|
||||
$query->values(...$cells);
|
||||
|
|
|
|||
|
|
@ -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')
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,4 +7,4 @@ use phpOMS\Message\Http\HttpRequest;
|
|||
|
||||
$request = HttpRequest::createFromSuperglobals();
|
||||
|
||||
echo $request->header->l11n->country;
|
||||
echo $request->header->l11n->language;
|
||||
|
|
|
|||
|
|
@ -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'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -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'] ?? '');
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ final class EmailTestTest extends \PHPUnit\Framework\TestCase
|
|||
public function testInvalidFromInputOutput() : void
|
||||
{
|
||||
self::assertFalse($this->mail->setFrom('Test Name <test-^invalid>'));
|
||||
self::assertEquals([0 => '', 1 => ''], $this->mail->from);
|
||||
self::assertEquals([], $this->mail->from);
|
||||
}
|
||||
|
||||
public function testContentTypeInputOutput() : void
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
],
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -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<extended>
|
||||
* @group framework
|
||||
*/
|
||||
public function testInvalidConstantException() : void
|
||||
{
|
||||
$this->expectException(\Exception::class);
|
||||
|
||||
EnumDemo::getByName('ENUM3');
|
||||
self::assertEquals(null, EnumDemo::getByName('ENUM3'));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -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}{/}?{?}#{#}'));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user