This commit is contained in:
Manuel Raynaud
2013-10-18 09:28:17 +02:00
parent 12b5a81364
commit 52ed89f1aa
70 changed files with 136 additions and 244 deletions

View File

@@ -23,7 +23,6 @@
namespace Thelia\Tests\Action;
/**
* Class BaseAction
* @package Thelia\Tests\Action\ImageTest
@@ -41,4 +40,4 @@ class BaseAction extends \PHPUnit_Framework_TestCase
return $container;
}
}
}

View File

@@ -36,7 +36,6 @@ use Thelia\Model\ContentFolderQuery;
use Thelia\Model\ContentQuery;
use Thelia\Model\FolderQuery;
/**
* Class ContentTest
* @package Thelia\Tests\Action
@@ -205,7 +204,7 @@ class ContentTest extends BaseAction
$test = ContentFolderQuery::create()
->filterByContent($content)
->filterByFolder($folder);
} while($test->count() > 0);
} while ($test->count() > 0);
$event = new ContentAddFolderEvent($content, $folder->getId());
@@ -267,10 +266,10 @@ class ContentTest extends BaseAction
->addAscendingOrderByColumn('RAND()')
->findOne();
if(null === $folder) {
if (null === $folder) {
$this->fail('use fixtures before launching test, there is no folder in database');
}
return $folder;
}
}
}

View File

@@ -31,7 +31,6 @@ use Thelia\Core\Event\Folder\FolderUpdateEvent;
use Thelia\Core\Event\UpdatePositionEvent;
use Thelia\Model\FolderQuery;
/**
* Class FolderTest
* @package Thelia\Tests\Action\ImageTest
@@ -73,8 +72,6 @@ class FolderTest extends BaseAction
{
$folder = $this->getRandomFolder();
$visible = !$folder->getVisible();
$event = new FolderUpdateEvent($folder->getId());
@@ -147,7 +144,7 @@ class FolderTest extends BaseAction
->filterByPosition(1, Criteria::GREATER_THAN)
->findOne();
if(null === $folder) {
if (null === $folder) {
$this->fail('use fixtures before launching test, there is no folder in database');
}
@@ -169,7 +166,7 @@ class FolderTest extends BaseAction
->filterByPosition(1)
->findOne();
if(null === $folder) {
if (null === $folder) {
$this->fail('use fixtures before launching test, there is no folder in database');
}
@@ -191,7 +188,7 @@ class FolderTest extends BaseAction
->filterByPosition(1, Criteria::GREATER_THAN)
->findOne();
if(null === $folder) {
if (null === $folder) {
$this->fail('use fixtures before launching test, there is no folder in database');
}
@@ -215,10 +212,10 @@ class FolderTest extends BaseAction
->addAscendingOrderByColumn('RAND()')
->findOne();
if(null === $folder) {
if (null === $folder) {
$this->fail('use fixtures before launching test, there is no folder in database');
}
return $folder;
}
}
}

View File

@@ -127,7 +127,7 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
$taxRulesCollection = new ObjectCollection();
$aProduct = ProductQuery::create()->findOne();
if(null === $aProduct) {
if (null === $aProduct) {
return;
}
@@ -169,7 +169,7 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
$taxRulesCollection->setModel('\Thelia\Model\Tax');
$aProduct = ProductQuery::create()->findOne();
if(null === $aProduct) {
if (null === $aProduct) {
return;
}
@@ -214,7 +214,7 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
$taxRulesCollection->append($tax);
$aProduct = ProductQuery::create()->findOne();
if(null === $aProduct) {
if (null === $aProduct) {
return;
}
@@ -270,7 +270,7 @@ class CalculatorTest extends \PHPUnit_Framework_TestCase
$taxRulesCollection->append($tax);
$aProduct = ProductQuery::create()->findOne();
if(null === $aProduct) {
if (null === $aProduct) {
return;
}