diff --git a/src/Site/Lib/Tester.php b/src/Site/Lib/Tester.php index 193e81a..fa4e75c 100644 --- a/src/Site/Lib/Tester.php +++ b/src/Site/Lib/Tester.php @@ -1,6 +1,12 @@ colorOutput = false; } } @@ -486,19 +491,8 @@ class Tester { $this->output($this->colorize('bold', "テスト結果の概要:")); $this->output(" テスト総数: {$this->testCount}"); $this->output(" ".$this->colorize('green', "合格: {$this->passCount}")); - - if ($this->failCount > 0) { - $this->output(" ".$this->colorize('red', "失敗: {$this->failCount}")); - } else { - $this->output(" 失敗: 0"); - } - - if ($this->errorCount > 0) { - $this->output(" ".$this->colorize('yellow', "エラー: {$this->errorCount}")); - } else { - $this->output(" エラー: 0"); - } - + $this->output(" ".$this->colorize('red', "失敗: {$this->failCount}")); + $this->output(" ".$this->colorize('yellow', "エラー: {$this->errorCount}")); $this->output(''); // 失敗を書き出す @@ -620,10 +614,4 @@ class Tester { 'trace' => $trace, ]; } -} - -/** - * アサーション失敗用のカスタム例外 - */ -class AssertionFailedException extends \Exception { } \ No newline at end of file diff --git a/src/Site/Test/LibMysql.php b/src/Site/Test/LibMysql.php index 7d9317f..59854b9 100644 --- a/src/Site/Test/LibMysql.php +++ b/src/Site/Test/LibMysql.php @@ -13,55 +13,47 @@ if (MYSQL_ENABLED) { ]); $test->describe('パケットのデバッグ', function($test): void { - try { - $db = new Mysql(); + $db = new Mysql(); - $db->setDebug(true); - $db->connect(); + $db->setDebug(true); + $db->connect(); - $result = $db->query('SELECT * FROM user WHERE id = 1'); + $result = $db->query('SELECT * FROM user WHERE id = 1'); - foreach ($result['rows'] as $row) { - echo "ユーザー名: ".$row['nickname']."\n"; - } - - $db->savePacketLogToFile('mysql_log.txt'); - $db->close(); - } catch (\Exception $e) { - echo 'エラー: '.$e->getMessage()."\n"; + foreach ($result['rows'] as $row) { + echo "ユーザー名: ".$row['nickname']."\n"; } + + $db->savePacketLogToFile('mysql_log.txt'); + $db->close(); }); $test->describe('プリペアドステートメント', function($test): void { - try { - $db = new Mysql(); - $db->connect(); + $db = new Mysql(); + $db->connect(); - // データの入り - $stmt = $db->prepare('INSERT INTO users (name, age) VALUES (?, ?)'); - $test->assertTrue($stmt); + // データの入り + $stmt = $db->prepare('INSERT INTO users (name, age) VALUES (?, ?)'); + $test->assertTrue($stmt); - $db->execute($stmt, ['山田太郎', 25]); - // TODO: assert + $db->execute($stmt, ['山田太郎', 25]); + // TODO: assert - $close = $db->demolish($stmt); - $this->assertTrue($close); + $close = $db->demolish($stmt); + $this->assertTrue($close); - // データの受け取り - $stmt = $db->prepare('SELECT * FROM users WHERE age > ?'); - $test->assertTrue($stmt); + // データの受け取り + $stmt = $db->prepare('SELECT * FROM users WHERE age > ?'); + $test->assertTrue($stmt); - $res = $db->execute($stmt, [20]); - // TODO: assert - print_r($res); + $res = $db->execute($stmt, [20]); + // TODO: assert + print_r($res); - $close = $db->demolish($stmt); - $this->assertTrue($close); + $close = $db->demolish($stmt); + $this->assertTrue($close); - $db->close(); - } catch (\Exception $e) { - echo 'エラー: '.$e->getMessage()."\n"; - } + $db->close(); }); $test->printSummary(); diff --git a/src/Site/Test/LibRoute.php b/src/Site/Test/LibRoute.php new file mode 100644 index 0000000..cb625ff --- /dev/null +++ b/src/Site/Test/LibRoute.php @@ -0,0 +1,38 @@ + true, + 'verboseOutput' => true +]); + +$test->describe('ルート', function($test): void { + $test->it('ルートに追加出来るはず', function($test): void { + class Webpage { + public function about(array $params): void {} + } + + $routes = [ + Route::add('GET', 'about', Webpage::class.'@about'), + ]; + + $expect = [ + [ + 'method' => 'GET', + 'path' => 'about', + 'class' => 'Site\Test\Webpage@about', + 'params' => [], + ] + ]; + + $test->assertNotNull($routes); + $test->assertEquals($expect, $routes); + }); +}); + +$test->printSummary(); \ No newline at end of file