This commit is contained in:
Antonio Spinelli
2014-04-16 17:59:03 -03:00
parent da35c96b90
commit fc3b6a1608
25 changed files with 65 additions and 64 deletions

View File

@@ -45,7 +45,8 @@ class ChainTest extends \PHPUnit_Framework_TestCase
$this->assertObjectHasAttribute('response', $request); $this->assertObjectHasAttribute('response', $request);
$this->assertEquals('baz', $request->response); $this->assertEquals('baz', $request->response);
// despite both handle owns the 'bar' key, the FastStorage is responding first // despite both handle owns the 'bar' key, the FastStorage is responding first
$this->assertEquals('DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\FastStorage', $request->forDebugOnly); $className = 'DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\FastStorage';
$this->assertEquals($className, $request->forDebugOnly);
} }
/** /**
@@ -60,7 +61,8 @@ class ChainTest extends \PHPUnit_Framework_TestCase
$this->assertObjectHasAttribute('response', $request); $this->assertObjectHasAttribute('response', $request);
$this->assertEquals('bar', $request->response); $this->assertEquals('bar', $request->response);
// FastStorage has no 'foo' key, the SlowStorage is responding // FastStorage has no 'foo' key, the SlowStorage is responding
$this->assertEquals('DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage', $request->forDebugOnly); $className = 'DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage';
$this->assertEquals($className, $request->forDebugOnly);
} }
/** /**
@@ -73,6 +75,7 @@ class ChainTest extends \PHPUnit_Framework_TestCase
$this->assertFalse($ret); $this->assertFalse($ret);
// the last responsible : // the last responsible :
$this->assertEquals('DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage', $request->forDebugOnly); $className = 'DesignPatterns\Behavioral\ChainOfResponsibilities\Responsible\SlowStorage';
$this->assertEquals($className, $request->forDebugOnly);
} }
} }

View File

@@ -13,7 +13,7 @@ class BookList implements \Countable
return $this->books[$bookNumberToGet]; return $this->books[$bookNumberToGet];
} }
return NULL; return null;
} }
public function addBook(Book $book) public function addBook(Book $book)

View File

@@ -58,5 +58,4 @@ class ObserverTest extends \PHPUnit_Framework_TestCase
$subject->notify(); $subject->notify();
} }
} }

View File

@@ -15,7 +15,6 @@ class Plus extends AbstractSpecification
* *
* @param SpecificationInterface $left * @param SpecificationInterface $left
* @param SpecificationInterface $right * @param SpecificationInterface $right
*/ */
public function __construct(SpecificationInterface $left, SpecificationInterface $right) public function __construct(SpecificationInterface $left, SpecificationInterface $right)
{ {

View File

@@ -38,10 +38,10 @@ class PriceSpecification extends AbstractSpecification
*/ */
public function isSatisfiedBy(Item $item) public function isSatisfiedBy(Item $item)
{ {
if ( !empty($this->maxPrice) && $item->getPrice() > $this->maxPrice) { if (!empty($this->maxPrice) && $item->getPrice() > $this->maxPrice) {
return false; return false;
} }
if ( !empty($this->minPrice) && $item->getPrice() < $this->minPrice) { if (!empty($this->minPrice) && $item->getPrice() < $this->minPrice) {
return false; return false;
} }

View File

@@ -19,7 +19,6 @@ interface SpecificationInterface
* Creates a logical AND specification * Creates a logical AND specification
* *
* @param SpecificationInterface $spec * @param SpecificationInterface $spec
*/ */
public function plus(SpecificationInterface $spec); public function plus(SpecificationInterface $spec);
@@ -27,7 +26,6 @@ interface SpecificationInterface
* Creates a logical OR specification * Creates a logical OR specification
* *
* @param SpecificationInterface $spec * @param SpecificationInterface $spec
*/ */
public function either(SpecificationInterface $spec); public function either(SpecificationInterface $spec);

View File

@@ -30,7 +30,7 @@ class ObjectCollection
*/ */
public function sort() public function sort()
{ {
if (!$this->comparator){ if (!$this->comparator) {
throw new \LogicException("Comparator is not set"); throw new \LogicException("Comparator is not set");
} }

View File

@@ -41,5 +41,4 @@ class JourneyTest extends \PHPUnit_Framework_TestCase
{ {
echo "Fear and loathing in Las Vegas\n"; echo "Fear and loathing in Las Vegas\n";
} }
} }

View File

@@ -43,5 +43,4 @@ class VisitorTest extends \PHPUnit_Framework_TestCase
$mock = $this->getMockForAbstractClass('DesignPatterns\Behavioral\Visitor\Role'); $mock = $this->getMockForAbstractClass('DesignPatterns\Behavioral\Visitor\Role');
$mock->accept($this->visitor); $mock->accept($this->visitor);
} }
} }

View File

@@ -26,5 +26,4 @@ class Pool
{ {
$this->instances[] = $instance; $this->instances[] = $instance;
} }
} }

View File

@@ -2,8 +2,6 @@
namespace DesignPatterns\Creational\Pool; namespace DesignPatterns\Creational\Pool;
use DesignPatterns\Creational\Pool\Pool;
class TestWorker class TestWorker
{ {
@@ -27,4 +25,3 @@ class PoolTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(1, $pool->get()->id); $this->assertEquals(1, $pool->get()->id);
} }
} }

View File

@@ -49,5 +49,4 @@ class Processor
{ {
return array_pop($this->waitingQueue); return array_pop($this->waitingQueue);
} }
} }

View File

@@ -17,5 +17,4 @@ class Worker
// and when it's done, execute callback // and when it's done, execute callback
call_user_func($callback, $this); call_user_func($callback, $this);
} }
} }

View File

@@ -41,5 +41,4 @@ class SimpleFactoryTest extends \PHPUnit_Framework_TestCase
{ {
$this->factory->createVehicle('car'); $this->factory->createVehicle('car');
} }
} }

View File

@@ -33,7 +33,7 @@ class AdapterTest extends \PHPUnit_Framework_TestCase
* *
* @dataProvider getBook * @dataProvider getBook
*/ */
public function test_I_am_an_old_Client(PaperBookInterface $book) public function testIAmAnOldClient(PaperBookInterface $book)
{ {
$book->open(); $book->open();
$book->turnPage(); $book->turnPage();

View File

@@ -29,6 +29,8 @@ class CompositeTest extends \PHPUnit_Framework_TestCase
*/ */
public function testFormImplementsFormEelement() public function testFormImplementsFormEelement()
{ {
$this->assertTrue(is_subclass_of('DesignPatterns\Structural\Composite\Form', 'DesignPatterns\Structural\Composite\FormElement')); $className = 'DesignPatterns\Structural\Composite\Form';
$abstractName = 'DesignPatterns\Structural\Composite\FormElement';
$this->assertTrue(is_subclass_of($className, $abstractName));
} }
} }

View File

@@ -65,7 +65,12 @@ class DataMapperTest extends \PHPUnit_Framework_TestCase
*/ */
public function testRestoreOne(User $existing) public function testRestoreOne(User $existing)
{ {
$rows = new \ArrayIterator(array(array('userid' => 1, 'username' => 'Odysseus', 'email' => 'Odysseus@ithaca.gr'))); $row = array(
'userid' => 1,
'username' => 'Odysseus',
'email' => 'Odysseus@ithaca.gr'
);
$rows = new \ArrayIterator(array($row));
$this->dbal->expects($this->once()) $this->dbal->expects($this->once())
->method('find') ->method('find')
->with(1) ->with(1)

View File

@@ -30,7 +30,8 @@ class DecoratorTest extends \PHPUnit_Framework_TestCase
// Wrap service with a JSON decorator for renderers // Wrap service with a JSON decorator for renderers
$service = new Decorator\RenderInXml($this->service); $service = new Decorator\RenderInXml($this->service);
// Our Renderer will now output XML instead of an array // Our Renderer will now output XML instead of an array
$this->assertXmlStringEqualsXmlString('<?xml version="1.0"?><foo>bar</foo>', $service->renderData()); $xml = '<?xml version="1.0"?><foo>bar</foo>';
$this->assertXmlStringEqualsXmlString($xml, $service->renderData());
} }
/** /**
@@ -38,7 +39,9 @@ class DecoratorTest extends \PHPUnit_Framework_TestCase
*/ */
public function testDecoratorMustImplementsRenderer() public function testDecoratorMustImplementsRenderer()
{ {
$this->assertTrue(is_subclass_of('DesignPatterns\Structural\Decorator\Decorator', 'DesignPatterns\Structural\Decorator\RendererInterface')); $className = 'DesignPatterns\Structural\Decorator\Decorator';
$interfaceName = 'DesignPatterns\Structural\Decorator\RendererInterface';
$this->assertTrue(is_subclass_of($className, $interfaceName));
} }
/** /**

View File

@@ -13,10 +13,11 @@ class ArrayConfig extends AbstractConfig implements Parameters
* Get parameter * Get parameter
* *
* @param string|int $key * @param string|int $key
* * @param null $default
* @return mixed * @return mixed
*/ */
public function get($key, $default = null) { public function get($key, $default = null)
{
if (isset($this->storage[$key])) { if (isset($this->storage[$key])) {
return $this->storage[$key]; return $this->storage[$key];
} }