From a8dff3d6d72d5a3718645d81de333cd15bb27b62 Mon Sep 17 00:00:00 2001 From: Gregory PLANCHAT Date: Thu, 12 Jul 2012 03:35:31 +0200 Subject: [PATCH] Updated integration to Travis-CI Signed-off-by: Gregory PLANCHAT --- .gitmodules | 3 - .travis.yml | 6 ++ build/build.sh | 10 ++++ .../Definition/MethodDefinition.php | 4 +- .../test/{unit/php => }/bootstrap.php | 0 .../WootookUnit}/Core/App/AppTest.php | 4 +- .../WootookUnit}/Core/Base/BaseObjectTest.php | 33 ++++++----- .../WootookUnit}/Core/Config/NodeTest.php | 59 ++++++++++--------- .../Sql/Dml/Condition/ConditionTest.php | 2 +- .../Sql/Dml/Condition/LogicalOperatorTest.php | 2 +- .../Database/Sql/Dml/Section/ColumnMock.php | 2 +- .../Database/Sql/Dml/Section/ColumnTest.php | 4 +- .../Database/Sql/Dml/Section/FromMock.php | 2 +- .../Database/Sql/Dml/Section/FromTest.php | 4 +- .../Database/Sql/Dml/Section/IntoMock.php | 2 +- .../Database/Sql/Dml/Section/IntoTest.php | 4 +- .../Database/Sql/Dml/Section/LimitMock.php | 2 +- .../Database/Sql/Dml/Section/LimitTest.php | 4 +- .../Sql/Dml/Section/Renderer/ColumnMock.php | 2 +- .../Sql/Dml/Section/Renderer/ColumnTest.php | 6 +- .../Sql/Dml/Section/Renderer/FromMock.php | 2 +- .../Sql/Dml/Section/Renderer/FromTest.php | 6 +- .../Sql/Dml/Section/Renderer/IntoMock.php | 2 +- .../Sql/Dml/Section/Renderer/IntoTest.php | 6 +- .../Sql/Dml/Section/Renderer/LimitMock.php | 2 +- .../Sql/Dml/Section/Renderer/LimitTest.php | 6 +- .../Sql/Dml/Section/Renderer/SetMock.php | 2 +- .../Sql/Dml/Section/Renderer/SetTest.php | 6 +- .../Core/Database/Sql/Dml/Section/SetMock.php | 2 +- .../Core/Database/Sql/Dml/Section/SetTest.php | 4 +- .../Database/Sql/Dml/Section/WhereMock.php | 2 +- .../Database/Sql/Dml/Section/WhereTest.php | 4 +- .../Core/DateTime/DateTimeTest.php | 0 .../Core/DateTime/DateTimeTest.php.old | 2 +- .../Definition/ArgumentDefinitionTest.php | 2 +- .../Definition/ClassDefinitionTest.php | 4 +- .../Definition/MethodDefinitionTest.php | 4 +- .../Core/DependencyInjection/FactoryTest.php | 2 +- .../Core/DependencyInjection/RegistryTest.php | 2 +- .../modules/WootookCore/test/phpunit.xml | 24 ++++++++ 40 files changed, 139 insertions(+), 100 deletions(-) delete mode 100644 .gitmodules create mode 100644 .travis.yml create mode 100644 build/build.sh rename src/application/modules/WootookCore/test/{unit/php => }/bootstrap.php (100%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/App/AppTest.php (75%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Base/BaseObjectTest.php (82%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Config/NodeTest.php (89%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Condition/ConditionTest.php (99%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Condition/LogicalOperatorTest.php (97%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/ColumnMock.php (79%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/ColumnTest.php (91%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/FromMock.php (78%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/FromTest.php (91%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/IntoMock.php (78%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/IntoTest.php (82%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/LimitMock.php (78%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/LimitTest.php (80%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/Renderer/ColumnMock.php (74%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/Renderer/ColumnTest.php (90%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/Renderer/FromMock.php (74%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/Renderer/FromTest.php (90%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/Renderer/IntoMock.php (74%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/Renderer/IntoTest.php (84%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/Renderer/LimitMock.php (74%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/Renderer/LimitTest.php (84%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/Renderer/SetMock.php (74%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/Renderer/SetTest.php (91%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/SetMock.php (78%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/SetTest.php (90%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/WhereMock.php (78%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/Database/Sql/Dml/Section/WhereTest.php (91%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/DateTime/DateTimeTest.php (100%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/DateTime/DateTimeTest.php.old (99%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/DependencyInjection/Definition/ArgumentDefinitionTest.php (99%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/DependencyInjection/Definition/ClassDefinitionTest.php (98%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/DependencyInjection/Definition/MethodDefinitionTest.php (97%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/DependencyInjection/FactoryTest.php (98%) rename src/application/modules/WootookCore/test/{unit/php/WootookTest => php/WootookUnit}/Core/DependencyInjection/RegistryTest.php (98%) create mode 100644 src/application/modules/WootookCore/test/phpunit.xml diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 8f630ff..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "vendor/ZendFramework"] - path = vendor/ZendFramework - url = git://github.com/zendframework/zf2.git diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..a09e130 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,6 @@ +language: php + +php: + - 5.4 + +script: build/build.sh diff --git a/build/build.sh b/build/build.sh new file mode 100644 index 0000000..0b75c51 --- /dev/null +++ b/build/build.sh @@ -0,0 +1,10 @@ +echo " * Wootook unit testing" + +MODULES_DIR="`pwd`/../src/application/modules" + +for file in "$MODULES_DIR/*" +do + echo " * Running ${file} module tests" + phpunit --strict --configuration $MODULES_DIR/${file}/test/$phpunit.xml $MODULES_DIR/${file} +done + diff --git a/src/application/modules/WootookCore/src/Wootook/Core/DependencyInjection/Definition/MethodDefinition.php b/src/application/modules/WootookCore/src/Wootook/Core/DependencyInjection/Definition/MethodDefinition.php index 6cdd5e5..142634e 100644 --- a/src/application/modules/WootookCore/src/Wootook/Core/DependencyInjection/Definition/MethodDefinition.php +++ b/src/application/modules/WootookCore/src/Wootook/Core/DependencyInjection/Definition/MethodDefinition.php @@ -108,13 +108,13 @@ class MethodDefinition if (is_object($argumentVariable)) { $this->_arguments[$argumentPosition] = $argumentVariable; } else { - $this->_arguments[$argumentPosition] = &$argumentVariable; + $this->_arguments[$argumentPosition] =& $argumentVariable; } } else if (is_string($argumentPosition) && isset($this->_argumentIndex[$argumentPosition])) { if (is_object($argumentVariable)) { $this->_arguments[$this->_argumentIndex[$argumentPosition]] = $argumentVariable; } else { - $this->_arguments[$this->_argumentIndex[$argumentPosition]] = &$argumentVariable; + $this->_arguments[$this->_argumentIndex[$argumentPosition]] =& $argumentVariable; } } else { throw new CoreException\DependencyInjection\InvalidArgumentException('No such argument'); diff --git a/src/application/modules/WootookCore/test/unit/php/bootstrap.php b/src/application/modules/WootookCore/test/bootstrap.php similarity index 100% rename from src/application/modules/WootookCore/test/unit/php/bootstrap.php rename to src/application/modules/WootookCore/test/bootstrap.php diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/App/AppTest.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/App/AppTest.php similarity index 75% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/App/AppTest.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/App/AppTest.php index a478b68..f6bde51 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/App/AppTest.php +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/App/AppTest.php @@ -1,12 +1,12 @@ _app); + $object = new Base\BaseObject($this->_app); $this->assertAttributeSame($this->_app, '_app', $object); @@ -35,7 +36,7 @@ class WootookTest_Core_BaseObjectTest extends PHPUnit_Framework_TestCase public function testSetData() { - $object = new Wootook\Core\Base\BaseObject($this->_app); + $object = new Base\BaseObject($this->_app); $this->assertAttributeEmpty('_data', $object); @@ -53,7 +54,7 @@ class WootookTest_Core_BaseObjectTest extends PHPUnit_Framework_TestCase */ public function testGetData() { - $object = new Wootook\Core\Base\BaseObject($this->_app); + $object = new Base\BaseObject($this->_app); $object->setData('test', 'testing'); @@ -71,7 +72,7 @@ class WootookTest_Core_BaseObjectTest extends PHPUnit_Framework_TestCase */ public function testGetAllDatas() { - $object = new Wootook\Core\Base\BaseObject($this->_app); + $object = new Base\BaseObject($this->_app); $object->setData('test', 'testing'); @@ -89,7 +90,7 @@ class WootookTest_Core_BaseObjectTest extends PHPUnit_Framework_TestCase */ public function testHasData() { - $object = new Wootook\Core\Base\BaseObject($this->_app); + $object = new Base\BaseObject($this->_app); $object->setData('test', 'testing'); @@ -102,7 +103,7 @@ class WootookTest_Core_BaseObjectTest extends PHPUnit_Framework_TestCase */ public function testAddData() { - $object = new Wootook\Core\Base\BaseObject($this->_app); + $object = new Base\BaseObject($this->_app); $object->setData('test', 'testing'); @@ -133,7 +134,7 @@ class WootookTest_Core_BaseObjectTest extends PHPUnit_Framework_TestCase */ public function testUnsetData() { - $object = new Wootook\Core\Base\BaseObject($this->_app); + $object = new Base\BaseObject($this->_app); $object->setData('test', 'testing'); $object->setData('testing', true); @@ -152,7 +153,7 @@ class WootookTest_Core_BaseObjectTest extends PHPUnit_Framework_TestCase public function testClearData() { - $object = new Wootook\Core\Base\BaseObject($this->_app); + $object = new Base\BaseObject($this->_app); $object->setData('test', 'testing'); $object->setData('testing', true); @@ -175,7 +176,7 @@ class WootookTest_Core_BaseObjectTest extends PHPUnit_Framework_TestCase */ public function testOffsetExists() { - $object = new Wootook\Core\Base\BaseObject($this->_app); + $object = new Base\BaseObject($this->_app); $object->setData('test', 'testing'); @@ -188,7 +189,7 @@ class WootookTest_Core_BaseObjectTest extends PHPUnit_Framework_TestCase */ public function testOffsetGet() { - $object = new Wootook\Core\Base\BaseObject($this->_app); + $object = new Base\BaseObject($this->_app); $object->setData('test', 'testing'); @@ -201,7 +202,7 @@ class WootookTest_Core_BaseObjectTest extends PHPUnit_Framework_TestCase */ public function testOffsetSet() { - $object = new Wootook\Core\Base\BaseObject($this->_app); + $object = new Base\BaseObject($this->_app); $object['test'] = 'testing'; @@ -214,7 +215,7 @@ class WootookTest_Core_BaseObjectTest extends PHPUnit_Framework_TestCase */ public function testOffsetUnset() { - $object = new Wootook\Core\Base\BaseObject($this->_app); + $object = new Base\BaseObject($this->_app); $object->setData('test', 'testing'); diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Config/NodeTest.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Config/NodeTest.php similarity index 89% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Config/NodeTest.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/Config/NodeTest.php index 026e8cd..dcaa6d9 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Config/NodeTest.php +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Config/NodeTest.php @@ -1,18 +1,19 @@ assertAttributeEmpty('_children', $object); $this->assertAttributeEquals(null, '_parent', $object); } @@ -39,8 +40,8 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase public function testCreateEmptyWithParent() { - $parent = new Wootook\Core\Config\Node(); - $object = new Wootook\Core\Config\Node(array(), $parent); + $parent = new Config\Node(); + $object = new Config\Node(array(), $parent); $this->assertAttributeEmpty('_children', $object); $this->assertAttributeEquals($parent, '_parent', $object); @@ -49,7 +50,7 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase public function testDirectChildAccessWithObjectNotation() { - $object = new Wootook\Core\Config\Node(); + $object = new Config\Node(); $object->testingAttribute = 'testing random data'; $this->assertAttributeEquals(array('testing-attribute' => 'testing random data'), '_children', $object); @@ -64,7 +65,7 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase public function testDirectChildAccessWithArrayNotation() { - $object = new Wootook\Core\Config\Node(); + $object = new Config\Node(); $object['testing-attribute'] = 'testing random data'; $this->assertAttributeEquals(array('testing-attribute' => 'testing random data'), '_children', $object); @@ -79,7 +80,7 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase public function testDirectChildSettingArrayNotationWithoutKey() { - $object = new Wootook\Core\Config\Node(); + $object = new Config\Node(); $object[] = 'testing random data'; $this->assertAttributeEquals(array('testing random data'), '_children', $object); @@ -87,14 +88,14 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase public function testDirectChildGettingArrayNotationKeyNotExists() { - $object = new Wootook\Core\Config\Node(); + $object = new Config\Node(); $this->assertEquals(null, $object['inexistent']); } public function testSwitchingArrayNotationToObjectNotation() { - $object = new Wootook\Core\Config\Node(); + $object = new Config\Node(); $object['testing-attribute'] = 'testing random data'; $this->assertEquals('testing random data', $object->testingAttribute); @@ -107,7 +108,7 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase public function testSwitchingObjectNotationToArrayNotation() { - $object = new Wootook\Core\Config\Node(); + $object = new Config\Node(); $object->testingAttribute = 'testing random data'; $this->assertEquals('testing random data', $object['testing-attribute']); @@ -120,8 +121,8 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase public function testGetConfigByPath() { - $parent = new Wootook\Core\Config\Node(); - $object = new Wootook\Core\Config\Node(array(), $parent); + $parent = new Config\Node(); + $object = new Config\Node(array(), $parent); $parent->superChild = $object; $object->testingAttribute = 'testing random data'; @@ -131,8 +132,8 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase public function testGetConfigAsArray() { - $parent = new Wootook\Core\Config\Node(); - $object = new Wootook\Core\Config\Node(array(), $parent); + $parent = new Config\Node(); + $object = new Config\Node(array(), $parent); $parent->superChild = $object; $object->testingAttribute = 'testing random data'; @@ -142,7 +143,7 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase public function testCount() { - $object = new Wootook\Core\Config\Node(array( + $object = new Config\Node(array( 'first-child' => 1, 'second-child' => 2, '3rd-child' => '3rd', @@ -301,7 +302,7 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase 'fourth-child' => '4th' ); - $mock = new Wootook\Core\Config\Node($dataItems); + $mock = new Config\Node($dataItems); $counter = 0; reset($dataItems); @@ -327,7 +328,7 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase 'fourth-child' => '4th' ); - $mock = new Wootook\Core\Config\Node($dataItems); + $mock = new Config\Node($dataItems); $this->assertInstanceOf('Wootook\\Core\\Config\\Node', $mock->getConfig('second-child')); $this->assertEquals(1, $mock->getConfig('second-child/second-sub-child')); } @@ -344,7 +345,7 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase 'fourth-child' => '4th' ); - $mock = new Wootook\Core\Config\Node($dataItems); + $mock = new Config\Node($dataItems); $this->assertEquals(null, $mock->getConfig('second-child/third-inexisting-sub-child')); } @@ -360,7 +361,7 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase 'fourth-child' => '4th' ); - $mock = new Wootook\Core\Config\Node($dataItems); + $mock = new Config\Node($dataItems); $this->setExpectedException('Wootook\\Core\\Exception\\RuntimeException'); $mock->getConfig('second-child/second-sub-child/inexistent-depth-child'); } @@ -377,14 +378,14 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase 'fourth-child' => '4th' ); - $object = new Wootook\Core\Config\Node($dataItems); + $object = new Config\Node($dataItems); $clone = clone $object; $this->assertEquals($dataItems, $clone->toArray()); } public function testUseNumericAttribute() { - $object = new Wootook\Core\Config\Node(); + $object = new Config\Node(); $object->{1} = 'first-child'; $this->assertEquals('first-child', $object->{1}); $this->assertEquals(array(1 => 'first-child'), $object->toArray()); @@ -422,8 +423,8 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase 'fourth-child' => '4th' ); - $root = new Wootook\Core\Config\Node($rootDataItems); - $secondary = new Wootook\Core\Config\Node($secondaryDataItems); + $root = new Config\Node($rootDataItems); + $secondary = new Config\Node($secondaryDataItems); $root->secondChild->merge($secondary); $this->assertEquals($expectedDataItems, $root->toArray()); } @@ -440,7 +441,7 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase 'fourth-child' => '4th' ); - $object = new Wootook\Core\Config\Node($dataItems); + $object = new Config\Node($dataItems); $object->reset(); $this->assertEmpty($object->toArray()); } @@ -475,7 +476,7 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase 'fourth-child' => '4th' ); - $object = new Wootook\Core\Config\Node($dataItems); + $object = new Config\Node($dataItems); $object->setConfig('second-child/fourth-sub-child/random-level-child', 72); $this->assertEquals($expected, $object->toArray()); } @@ -510,7 +511,7 @@ class WootookTest_Core_Config_NodeTest extends PHPUnit_Framework_TestCase 'fourth-child' => '4th' ); - $object = new Wootook\Core\Config\Node($dataItems); + $object = new Config\Node($dataItems); $this->setExpectedException('Wootook\\Core\\Exception\\RuntimeException'); $object->setConfig('second-child/third-sub-child/random-inexisting-level-child', 72); } diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Condition/ConditionTest.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Condition/ConditionTest.php similarity index 99% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Condition/ConditionTest.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Condition/ConditionTest.php index 710fb05..21cc0c7 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Condition/ConditionTest.php +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Condition/ConditionTest.php @@ -1,6 +1,6 @@ getMockForAbstractClass('Wootook\\Core\\Database\\Adapter\\Adapter'); - $this->_mock = $this->getMockForAbstractClass('WootookTest\\Core\\Database\\Sql\\Dml\\Section\\ColumnMock', array($adapter)); + $this->_mock = $this->getMockForAbstractClass('WootookUnit\\Core\\Database\\Sql\\Dml\\Section\\ColumnMock', array($adapter)); } public function testAddColumnWithoutTableWithoutAlias() diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/FromMock.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/FromMock.php similarity index 78% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/FromMock.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/FromMock.php index ee9a1ec..7d8354c 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/FromMock.php +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/FromMock.php @@ -1,6 +1,6 @@ getMockForAbstractClass('Wootook\\Core\\Database\\Adapter\\Adapter'); - $this->_mock = $this->getMockForAbstractClass('WootookTest\\Core\\Database\\Sql\\Dml\\Section\\FromMock', array($adapter)); + $this->_mock = $this->getMockForAbstractClass('WootookUnit\\Core\\Database\\Sql\\Dml\\Section\\FromMock', array($adapter)); } public function testSetOneTableWithoutSchemaWithoutAlias() diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/IntoMock.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/IntoMock.php similarity index 78% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/IntoMock.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/IntoMock.php index fe051ab..0d39fb4 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/IntoMock.php +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/IntoMock.php @@ -1,6 +1,6 @@ getMockForAbstractClass('Wootook\\Core\\Database\\Adapter\\Adapter'); - $this->_mock = $this->getMockForAbstractClass('WootookTest\\Core\\Database\\Sql\\Dml\\Section\\IntoMock', array($adapter)); + $this->_mock = $this->getMockForAbstractClass('WootookUnit\\Core\\Database\\Sql\\Dml\\Section\\IntoMock', array($adapter)); } public function testSetTableWithoutSchema() diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/LimitMock.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/LimitMock.php similarity index 78% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/LimitMock.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/LimitMock.php index 9bd6c7c..774461f 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/LimitMock.php +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/LimitMock.php @@ -1,6 +1,6 @@ getMockForAbstractClass('Wootook\\Core\\Database\\Adapter\\Adapter'); - $this->_mock = $this->getMockForAbstractClass('WootookTest\\Core\\Database\\Sql\\Dml\\Section\\LimitMock', array($adapter)); + $this->_mock = $this->getMockForAbstractClass('WootookUnit\\Core\\Database\\Sql\\Dml\\Section\\LimitMock', array($adapter)); } public function testSetLimitWithoutOffset() diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/Renderer/ColumnMock.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/Renderer/ColumnMock.php similarity index 74% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/Renderer/ColumnMock.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/Renderer/ColumnMock.php index 5d54b4b..fe66d53 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/Renderer/ColumnMock.php +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/Renderer/ColumnMock.php @@ -1,6 +1,6 @@ will($this->returnArgument(0)) ; - $this->_queryMock = $this->getMockForAbstractClass('WootookTest\\Core\\Database\\Sql\\Dml\\Section\\ColumnMock', array($adapterMock)); - $this->_rendererMock = $this->getMockForAbstractClass('WootookTest\\Core\\Database\\Sql\\Dml\\Section\\Renderer\\ColumnMock'); + $this->_queryMock = $this->getMockForAbstractClass('WootookUnit\\Core\\Database\\Sql\\Dml\\Section\\ColumnMock', array($adapterMock)); + $this->_rendererMock = $this->getMockForAbstractClass('WootookUnit\\Core\\Database\\Sql\\Dml\\Section\\Renderer\\ColumnMock'); } public function testRenderColumnWithoutTableWithoutAlias() diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/Renderer/FromMock.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/Renderer/FromMock.php similarity index 74% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/Renderer/FromMock.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/Renderer/FromMock.php index 2ad922a..833908c 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/Renderer/FromMock.php +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/Renderer/FromMock.php @@ -1,6 +1,6 @@ will($this->returnArgument(0)) ; - $this->_queryMock = $this->getMockForAbstractClass('WootookTest\\Core\\Database\\Sql\\Dml\\Section\\FromMock', array($adapterMock)); - $this->_rendererMock = $this->getMockForAbstractClass('WootookTest\\Core\\Database\\Sql\\Dml\\Section\\Renderer\\FromMock'); + $this->_queryMock = $this->getMockForAbstractClass('WootookUnit\\Core\\Database\\Sql\\Dml\\Section\\FromMock', array($adapterMock)); + $this->_rendererMock = $this->getMockForAbstractClass('WootookUnit\\Core\\Database\\Sql\\Dml\\Section\\Renderer\\FromMock'); } public function testRenderOneTableWithoutSchemaWithoutAlias() diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/Renderer/IntoMock.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/Renderer/IntoMock.php similarity index 74% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/Renderer/IntoMock.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/Renderer/IntoMock.php index 8f5b817..5d2805c 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/Renderer/IntoMock.php +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/Renderer/IntoMock.php @@ -1,6 +1,6 @@ will($this->returnArgument(0)) ; - $this->_queryMock = $this->getMockForAbstractClass('WootookTest\\Core\\Database\\Sql\\Dml\\Section\\IntoMock', array($adapterMock)); - $this->_rendererMock = $this->getMockForAbstractClass('WootookTest\\Core\\Database\\Sql\\Dml\\Section\\Renderer\\IntoMock'); + $this->_queryMock = $this->getMockForAbstractClass('WootookUnit\\Core\\Database\\Sql\\Dml\\Section\\IntoMock', array($adapterMock)); + $this->_rendererMock = $this->getMockForAbstractClass('WootookUnit\\Core\\Database\\Sql\\Dml\\Section\\Renderer\\IntoMock'); } public function testRenderTableWithoutSchema() diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/Renderer/LimitMock.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/Renderer/LimitMock.php similarity index 74% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/Renderer/LimitMock.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/Renderer/LimitMock.php index c8d0c78..a47d70a 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/Renderer/LimitMock.php +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/Renderer/LimitMock.php @@ -1,6 +1,6 @@ getMockForAbstractClass('Wootook\\Core\\Database\\Adapter\\Adapter'); - $this->_queryMock = $this->getMockForAbstractClass('WootookTest\\Core\\Database\\Sql\\Dml\\Section\\LimitMock', array($adapter)); - $this->_rendererMock = $this->getMockForAbstractClass('WootookTest\\Core\\Database\\Sql\\Dml\\Section\\Renderer\\LimitMock'); + $this->_queryMock = $this->getMockForAbstractClass('WootookUnit\\Core\\Database\\Sql\\Dml\\Section\\LimitMock', array($adapter)); + $this->_rendererMock = $this->getMockForAbstractClass('WootookUnit\\Core\\Database\\Sql\\Dml\\Section\\Renderer\\LimitMock'); } public function testRenderLimitWithoutOffset() diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/Renderer/SetMock.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/Renderer/SetMock.php similarity index 74% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/Renderer/SetMock.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/Renderer/SetMock.php index 29637c0..5f34c99 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/Renderer/SetMock.php +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/Renderer/SetMock.php @@ -1,6 +1,6 @@ will($this->returnArgument(0)) ; - $this->_queryMock = $this->getMockForAbstractClass('WootookTest\\Core\\Database\\Sql\\Dml\\Section\\SetMock', array($adapterMock)); - $this->_rendererMock = $this->getMockForAbstractClass('WootookTest\\Core\\Database\\Sql\\Dml\\Section\\Renderer\\SetMock'); + $this->_queryMock = $this->getMockForAbstractClass('WootookUnit\\Core\\Database\\Sql\\Dml\\Section\\SetMock', array($adapterMock)); + $this->_rendererMock = $this->getMockForAbstractClass('WootookUnit\\Core\\Database\\Sql\\Dml\\Section\\Renderer\\SetMock'); } public function testRenderFieldAndValue() diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/SetMock.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/SetMock.php similarity index 78% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/SetMock.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/SetMock.php index 313fc09..4cc42d5 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/SetMock.php +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/SetMock.php @@ -1,6 +1,6 @@ getMockForAbstractClass('Wootook\\Core\\Database\\Adapter\\Adapter'); - $this->_mock = $this->getMockForAbstractClass('WootookTest\\Core\\Database\\Sql\\Dml\\Section\\SetMock', array($adapter)); + $this->_mock = $this->getMockForAbstractClass('WootookUnit\\Core\\Database\\Sql\\Dml\\Section\\SetMock', array($adapter)); } public function testSetFieldAndValue() diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/WhereMock.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/WhereMock.php similarity index 78% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/WhereMock.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/WhereMock.php index 7bf52ef..b5d78ed 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/Database/Sql/Dml/Section/WhereMock.php +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/Database/Sql/Dml/Section/WhereMock.php @@ -1,6 +1,6 @@ getMockForAbstractClass('Wootook\\Core\\Database\\Adapter\\Adapter'); - $this->_mock = $this->getMockForAbstractClass('WootookTest\\Core\\Database\\Sql\\Dml\\Section\\WhereMock', array($adapter)); + $this->_mock = $this->getMockForAbstractClass('WootookUnit\\Core\\Database\\Sql\\Dml\\Section\\WhereMock', array($adapter)); } public function testAddScalarCondition() diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/DateTime/DateTimeTest.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/DateTime/DateTimeTest.php similarity index 100% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/DateTime/DateTimeTest.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/DateTime/DateTimeTest.php diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/DateTime/DateTimeTest.php.old b/src/application/modules/WootookCore/test/php/WootookUnit/Core/DateTime/DateTimeTest.php.old similarity index 99% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/DateTime/DateTimeTest.php.old rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/DateTime/DateTimeTest.php.old index 300a7f7..1e1707a 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/DateTime/DateTimeTest.php.old +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/DateTime/DateTimeTest.php.old @@ -6,7 +6,7 @@ require_once 'Wootook/Core/DateTime/DateTime.php'; * Test class for Wootook\Core\DateTime\DateTime. * Generated by PHPUnit on 2011-09-01 at 11:24:52. */ -class WootookTest_Core_DateTime_DateTimeTest extends PHPUnit_Framework_TestCase +class WootookUnit_Core_DateTime_DateTimeTest extends PHPUnit_Framework_TestCase { public function testTimestamp() { diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/DependencyInjection/Definition/ArgumentDefinitionTest.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/DependencyInjection/Definition/ArgumentDefinitionTest.php similarity index 99% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/DependencyInjection/Definition/ArgumentDefinitionTest.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/DependencyInjection/Definition/ArgumentDefinitionTest.php index e3169e6..713b86c 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/DependencyInjection/Definition/ArgumentDefinitionTest.php +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/DependencyInjection/Definition/ArgumentDefinitionTest.php @@ -1,6 +1,6 @@ getMock('Wootook\\Core\\DependencyInjection\\Definition\\MethodDefinition', array(), array(), $methodDefinitionClassName, false); $definition = new Definition\ClassDefinition(__CLASS__, $methodDefinitionClassName); diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/DependencyInjection/Definition/MethodDefinitionTest.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/DependencyInjection/Definition/MethodDefinitionTest.php similarity index 97% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/DependencyInjection/Definition/MethodDefinitionTest.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/DependencyInjection/Definition/MethodDefinitionTest.php index 966a511..a4dab1e 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/DependencyInjection/Definition/MethodDefinitionTest.php +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/DependencyInjection/Definition/MethodDefinitionTest.php @@ -1,6 +1,6 @@ getMock('Wootook\\Core\\DependencyInjection\\Definition\\ArgumentDefinition', array(), array(), $argumentDefinitionClassName, false); $mock = $this->getMock('Wootook\\Core\\DependencyInjection\\Definition\\ClassDefinition', array(), array(), '', false); diff --git a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/DependencyInjection/FactoryTest.php b/src/application/modules/WootookCore/test/php/WootookUnit/Core/DependencyInjection/FactoryTest.php similarity index 98% rename from src/application/modules/WootookCore/test/unit/php/WootookTest/Core/DependencyInjection/FactoryTest.php rename to src/application/modules/WootookCore/test/php/WootookUnit/Core/DependencyInjection/FactoryTest.php index 6b01c79..61b464a 100644 --- a/src/application/modules/WootookCore/test/unit/php/WootookTest/Core/DependencyInjection/FactoryTest.php +++ b/src/application/modules/WootookCore/test/php/WootookUnit/Core/DependencyInjection/FactoryTest.php @@ -1,6 +1,6 @@ + + + + + ./php/WootookTest/Core + + + +