wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed tests with inc Config and Registry classes. Use LOGGING in logger tests.

Browse Source
This commit is contained in:
Alexander Demidov
2012-06-28 16:18:28 +04:00
parent cfd6536c5f
commit 7a26da1034
10 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/LoadTest.php
View File

@ -10,6 +10,8 @@
* Unit tests for Load class * Unit tests for Load class
*/ */
require_once dirname(__FILE__) . '/../Registry.php';
require_once dirname(__FILE__) . '/../Config.php';
require_once dirname(__FILE__) . '/../Load.php'; require_once dirname(__FILE__) . '/../Load.php';
require_once 'vfsStream/vfsStream.php'; require_once 'vfsStream/vfsStream.php';

2
tests/app/Action_TestCase.php
View File

@ -10,6 +10,8 @@
* Action_TestCase class for testing Actions * Action_TestCase class for testing Actions
*/ */
require_once dirname(__FILE__) . '/../../Registry.php';
require_once dirname(__FILE__) . '/../../Config.php';
require_once dirname(__FILE__) . '/../../Load.php'; require_once dirname(__FILE__) . '/../../Load.php';
require_once dirname(__FILE__) . '/../../classes/Env.class.php'; require_once dirname(__FILE__) . '/../../classes/Env.class.php';
require_once dirname(__FILE__) . '/../../exception/ErrorHandler.php'; require_once dirname(__FILE__) . '/../../exception/ErrorHandler.php';

2
tests/layout/ErrorLayoutTest.php
View File

@ -8,6 +8,8 @@
* @user: agrebnev * @user: agrebnev
*/ */
require_once dirname(__FILE__) . '/../../Registry.php';
require_once dirname(__FILE__) . '/../../Config.php';
require_once dirname(__FILE__) . '/../../exception/ErrorHandler.php'; require_once dirname(__FILE__) . '/../../exception/ErrorHandler.php';
require_once dirname(__FILE__) . '/../../exception/GeneralException.php'; require_once dirname(__FILE__) . '/../../exception/GeneralException.php';
require_once dirname(__FILE__) . '/../../app/FrontController.php'; require_once dirname(__FILE__) . '/../../app/FrontController.php';

2
tests/layout/LayoutTest.php
View File

@ -10,6 +10,8 @@
* Unit tests for Layout class * Unit tests for Layout class
*/ */
require_once dirname(__FILE__) . '/../../Registry.php';
require_once dirname(__FILE__) . '/../../Config.php';
require_once dirname(__FILE__) . '/../../exception/ErrorHandler.php'; require_once dirname(__FILE__) . '/../../exception/ErrorHandler.php';
require_once dirname(__FILE__) . '/../../app/FrontController.php'; require_once dirname(__FILE__) . '/../../app/FrontController.php';
require_once dirname(__FILE__) . '/../../layout/Layout.php'; require_once dirname(__FILE__) . '/../../layout/Layout.php';

3
tests/logger/CliLoggerTest.php
View File

@ -44,7 +44,8 @@ class CliLoggerTest extends PHPUnit_Framework_TestCase
public function testLog() public function testLog()
{ {
Config::set('DEBUG', 1); Config::set('LOGGING', 1);
Config::set('Logger', array('logger' => 'CliLogger'));
$logger = Logger::getInstance(); $logger = Logger::getInstance();
ob_start(); ob_start();
$logger->setPid(123); $logger->setPid(123);

1
tests/logger/FileLoggerTest.php
View File

@ -33,6 +33,7 @@ class FileLoggerTest extends PHPUnit_Framework_TestCase
vfsStream::setup(); vfsStream::setup();
$root = vfsStream::create(array()); $root = vfsStream::create(array());
vfsStreamWrapper::setRoot($root); vfsStreamWrapper::setRoot($root);
Config::set('LOGGING', 1);
$this->conf = array('logger' => 'FileLogger', 'filepath' => vfsStream::url('root/log.txt')); $this->conf = array('logger' => 'FileLogger', 'filepath' => vfsStream::url('root/log.txt'));
Config::set('Logger', $this->conf); Config::set('Logger', $this->conf);
if ($root->hasChild('log.txt')) { if ($root->hasChild('log.txt')) {

28
tests/model/MongoStatementTest.php
View File

@ -10,6 +10,8 @@
* Unit tests for MySQLiStatement class * Unit tests for MySQLiStatement class
*/ */
require_once dirname(__FILE__) . '/../../Registry.php';
require_once dirname(__FILE__) . '/../../Config.php';
require_once dirname(__FILE__) . '/../../util/profiler/CommandProfiler.php'; require_once dirname(__FILE__) . '/../../util/profiler/CommandProfiler.php';
require_once dirname(__FILE__) . '/../../util/profiler/Profiler.php'; require_once dirname(__FILE__) . '/../../util/profiler/Profiler.php';
require_once dirname(__FILE__) . '/../../model/Db.php'; require_once dirname(__FILE__) . '/../../model/Db.php';
@ -168,7 +170,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase
*/ */
public function testExecuteWithDebug() public function testExecuteWithDebug()
{ {
Config::set('DEBUG', 1; Config::set('DEBUG', 1);
$this->setDriverGetConnectionMethod()->setRequestExecuteMethod(); $this->setDriverGetConnectionMethod()->setRequestExecuteMethod();
$this->assertTrue($this->stmt->execute()); $this->assertTrue($this->stmt->execute());
$this->assertEquals(10, $this->stmt->numRows()); $this->assertEquals(10, $this->stmt->numRows());
@ -180,7 +182,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase
*/ */
public function testBindParam() public function testBindParam()
{ {
Config::set('DEBUG', 1; Config::set('DEBUG', 1);
$this->request $this->request
->expects($this->once()) ->expects($this->once())
@ -201,7 +203,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase
*/ */
public function testFetch() public function testFetch()
{ {
Config::set('DEBUG', 1; Config::set('DEBUG', 1);
$this->assertFalse($this->stmt->fetch()); $this->assertFalse($this->stmt->fetch());
$this->setDriverGetConnectionMethod()->setRequestForFetch(); $this->setDriverGetConnectionMethod()->setRequestForFetch();
@ -218,7 +220,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase
*/ */
public function testFetchWithInitialArray() public function testFetchWithInitialArray()
{ {
Config::set('DEBUG', 1; Config::set('DEBUG', 1);
$this->assertFalse($this->stmt->fetch()); $this->assertFalse($this->stmt->fetch());
$this->setDriverGetConnectionMethod(); $this->setDriverGetConnectionMethod();
@ -237,7 +239,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase
*/ */
public function testFetchAssocFromCursor() public function testFetchAssocFromCursor()
{ {
Config::set('DEBUG', 1; Config::set('DEBUG', 1);
$this->assertFalse($this->stmt->fetch()); $this->assertFalse($this->stmt->fetch());
$this->setDriverGetConnectionMethod()->setRequestForFetch(); $this->setDriverGetConnectionMethod()->setRequestForFetch();
@ -254,7 +256,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase
*/ */
public function testFetchAssocFromArray() public function testFetchAssocFromArray()
{ {
Config::set('DEBUG', 1; Config::set('DEBUG', 1);
$this->assertFalse($this->stmt->fetch()); $this->assertFalse($this->stmt->fetch());
$this->setDriverGetConnectionMethod(); $this->setDriverGetConnectionMethod();
@ -274,7 +276,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase
*/ */
public function testFetchWrongMode() public function testFetchWrongMode()
{ {
Config::set('DEBUG', 1; Config::set('DEBUG', 1);
$this->assertFalse($this->stmt->fetch()); $this->assertFalse($this->stmt->fetch());
$this->setDriverGetConnectionMethod(); $this->setDriverGetConnectionMethod();
@ -294,7 +296,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase
*/ */
public function testSkipOrderLimit() public function testSkipOrderLimit()
{ {
Config::set('DEBUG', 1; Config::set('DEBUG', 1);
$this->setDriverGetConnectionMethod()->setRequestForFetch(); $this->setDriverGetConnectionMethod()->setRequestForFetch();
$this->stmt->execute(); $this->stmt->execute();
@ -312,7 +314,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase
*/ */
public function testCount() public function testCount()
{ {
Config::set('DEBUG', 1; Config::set('DEBUG', 1);
$this->setDriverGetConnectionMethod()->setRequestForFetch(); $this->setDriverGetConnectionMethod()->setRequestForFetch();
$this->stmt->execute(); $this->stmt->execute();
@ -327,7 +329,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase
*/ */
public function testCountException() public function testCountException()
{ {
Config::set('DEBUG', 1; Config::set('DEBUG', 1);
$this->setDriverGetConnectionMethod(); $this->setDriverGetConnectionMethod();
$this->request $this->request
->expects($this->once()) ->expects($this->once())
@ -345,7 +347,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase
*/ */
public function testOrderException() public function testOrderException()
{ {
Config::set('DEBUG', 1; Config::set('DEBUG', 1);
$this->setDriverGetConnectionMethod(); $this->setDriverGetConnectionMethod();
$this->request $this->request
->expects($this->once()) ->expects($this->once())
@ -363,7 +365,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase
*/ */
public function testSkipException() public function testSkipException()
{ {
Config::set('DEBUG', 1; Config::set('DEBUG', 1);
$this->setDriverGetConnectionMethod(); $this->setDriverGetConnectionMethod();
$this->request $this->request
->expects($this->once()) ->expects($this->once())
@ -381,7 +383,7 @@ class MongoStatementTest extends PHPUnit_Framework_TestCase
*/ */
public function testLimitException() public function testLimitException()
{ {
Config::set('DEBUG', 1; Config::set('DEBUG', 1);
$this->setDriverGetConnectionMethod(); $this->setDriverGetConnectionMethod();
$this->request $this->request
->expects($this->once()) ->expects($this->once())

2
tests/model/MySQLiStatementTest.php
View File

@ -10,6 +10,8 @@
* Unit tests for MySQLiStatement class * Unit tests for MySQLiStatement class
*/ */
require_once dirname(__FILE__) . '/../../Registry.php';
require_once dirname(__FILE__) . '/../../Config.php';
require_once dirname(__FILE__) . '/../../util/profiler/CommandProfiler.php'; require_once dirname(__FILE__) . '/../../util/profiler/CommandProfiler.php';
require_once dirname(__FILE__) . '/../../util/profiler/Profiler.php'; require_once dirname(__FILE__) . '/../../util/profiler/Profiler.php';
require_once dirname(__FILE__) . '/../../model/Db.php'; require_once dirname(__FILE__) . '/../../model/Db.php';

2
tests/redis/RedisDebugTest.php
View File

@ -10,6 +10,8 @@
* Unit tests for RedisDebug class * Unit tests for RedisDebug class
*/ */
require_once dirname(__FILE__) . '/../../Registry.php';
require_once dirname(__FILE__) . '/../../Config.php';
require_once dirname(__FILE__) . '/../../exception/GeneralException.php'; require_once dirname(__FILE__) . '/../../exception/GeneralException.php';
require_once dirname(__FILE__) . '/../../util/profiler/CommandProfiler.php'; require_once dirname(__FILE__) . '/../../util/profiler/CommandProfiler.php';
require_once dirname(__FILE__) . '/../../util/profiler/Profiler.php'; require_once dirname(__FILE__) . '/../../util/profiler/Profiler.php';

2
tests/util/profiler/ProfilerTest.php
View File

@ -10,6 +10,8 @@
* Unit tests for CommandProfiler class * Unit tests for CommandProfiler class
*/ */
require_once dirname(__FILE__) . '/../../../Registry.php';
require_once dirname(__FILE__) . '/../../../Config.php';
require_once dirname(__FILE__) . '/../../../exception/GeneralException.php'; require_once dirname(__FILE__) . '/../../../exception/GeneralException.php';
require_once dirname(__FILE__) . '/../../../util/FirePHPCore-0.3.2/lib/FirePHPCore/fb.php'; require_once dirname(__FILE__) . '/../../../util/FirePHPCore-0.3.2/lib/FirePHPCore/fb.php';
require_once dirname(__FILE__) . '/../../../util/profiler/Profiler.php'; require_once dirname(__FILE__) . '/../../../util/profiler/Profiler.php';