From 160a0dfebaeb21cc75d7166dfbac6d0ef1a51460 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 14 May 2014 17:32:49 +0200 Subject: convert array() to [] --- utility/controllertestutility.php | 102 ----------------------- utility/mappertestutility.php | 170 -------------------------------------- 2 files changed, 272 deletions(-) delete mode 100644 utility/controllertestutility.php delete mode 100644 utility/mappertestutility.php (limited to 'utility') diff --git a/utility/controllertestutility.php b/utility/controllertestutility.php deleted file mode 100644 index 3898e09b1..000000000 --- a/utility/controllertestutility.php +++ /dev/null @@ -1,102 +0,0 @@ - - * @author Bernhard Posselt - * @copyright Alessandro Cosentino 2012 - * @copyright Bernhard Posselt 2012, 2014 - */ - -namespace OCA\News\Utility; - -use OCP\IRequest; -use OCP\AppFramework\Http\Response; - - -/** - * Simple utility class for testing controllers - */ -abstract class ControllerTestUtility extends \PHPUnit_Framework_TestCase { - - - /** - * Checks if a controllermethod has the expected annotations - * @param Controller/string $controller name or instance of the controller - * @param array $expected an array containing the expected annotations - * @param array $valid if you define your own annotations, pass them here - */ - protected function assertAnnotations($controller, $method, array $expected, - array $valid=array()){ - $standard = array( - 'PublicPage', - 'NoAdminRequired', - 'NoCSRFRequired', - 'API' - ); - - $possible = array_merge($standard, $valid); - - // check if expected annotations are valid - foreach($expected as $annotation){ - $this->assertTrue(in_array($annotation, $possible)); - } - - $reader = new MethodAnnotationReader($controller, $method); - foreach($expected as $annotation){ - $this->assertTrue($reader->hasAnnotation($annotation)); - } - } - - - /** - * Shortcut for testing expected headers of a response - * @param array $expected an array with the expected headers - * @param Response $response the response which we want to test for headers - */ - protected function assertHeaders(array $expected=array(), Response $response){ - $headers = $response->getHeaders(); - foreach($expected as $header){ - $this->assertTrue(in_array($header, $headers)); - } - } - - - /** - * Instead of using positional parameters this function instantiates - * a request by using a hashmap so its easier to only set specific params - * @param array $params a hashmap with the parameters for request - * @return Request a request instance - */ - protected function getRequest(array $params=array()) { - $mock = $this->getMockBuilder('\OCP\IRequest') - ->getMock(); - - $merged = array(); - - foreach ($params as $key => $value) { - $merged = array_merge($value, $merged); - } - - $mock->expects($this->any()) - ->method('getParam') - ->will($this->returnCallback(function($index, $default) use ($merged) { - if (array_key_exists($index, $merged)) { - return $merged[$index]; - } else { - return $default; - } - })); - - // attribute access - if(array_key_exists('server', $params)) { - $mock->server = $params['server']; - } - - return $mock; - } - -} diff --git a/utility/mappertestutility.php b/utility/mappertestutility.php deleted file mode 100644 index 9b8cda069..000000000 --- a/utility/mappertestutility.php +++ /dev/null @@ -1,170 +0,0 @@ - - * @author Bernhard Posselt - * @copyright Alessandro Cosentino 2012 - * @copyright Bernhard Posselt 2012, 2014 - */ - -namespace OCA\News\Utility; - -use OCA\News\Core\Db; - - -/** - * Simple utility class for testing mappers - */ -abstract class MapperTestUtility extends \PHPUnit_Framework_TestCase { - - - protected $db; - private $query; - private $pdoResult; - private $queryAt; - private $prepareAt; - private $fetchAt; - private $iterators; - - - /** - * Run this function before the actual test to either set or initialize the - * db. After this the db can be accessed by using $this->db - */ - protected function beforeEach(){ - $this->db = $this->getMockBuilder( - '\OCA\News\Core\Db') - ->disableOriginalConstructor() - ->getMock(); - - $this->query = $this->getMock('Query', array('execute', 'bindValue')); - $this->pdoResult = $this->getMock('Result', array('fetch')); - $this->queryAt = 0; - $this->prepareAt = 0; - $this->iterators = array(); - $this->fetchAt = 0; - } - - - /** - * Create mocks and set expected results for database queries - * @param string $sql the sql query that you expect to receive - * @param array $arguments the expected arguments for the prepare query - * method - * @param array $returnRows the rows that should be returned for the result - * of the database query. If not provided, it wont be assumed that fetchRow - * will be called on the result - */ - protected function setMapperResult($sql, $arguments=array(), $returnRows=array(), - $limit=null, $offset=null){ - - $this->iterators[] = new ArgumentIterator($returnRows); - - $iterators = $this->iterators; - $fetchAt = $this->fetchAt; - - $this->pdoResult->expects($this->any()) - ->method('fetch') - ->will($this->returnCallback( - function() use ($iterators, $fetchAt){ - $iterator = $iterators[$fetchAt]; - $result = $iterator->next(); - - if($result === false) { - $fetchAt++; - } - - return $result; - } - )); - - $index = 1; - foreach($arguments as $argument) { - switch (gettype($argument)) { - case 'integer': - $pdoConstant = \PDO::PARAM_INT; - break; - - case 'NULL': - $pdoConstant = \PDO::PARAM_NULL; - break; - - case 'boolean': - $pdoConstant = \PDO::PARAM_BOOL; - break; - - default: - $pdoConstant = \PDO::PARAM_STR; - break; - } - $this->query->expects($this->at($this->queryAt)) - ->method('bindValue') - ->with($this->equalTo($index), - $this->equalTo($argument), - $this->equalTo($pdoConstant)); - $index++; - $this->queryAt++; - } - - $this->query->expects($this->at($this->queryAt)) - ->method('execute') - ->with() - ->will($this->returnValue($this->pdoResult)); - $this->queryAt++; - - if($limit === null && $offset === null) { - $this->db->expects($this->at($this->prepareAt)) - ->method('prepareQuery') - ->with($this->equalTo($sql)) - ->will(($this->returnValue($this->query))); - } elseif($limit !== null && $offset === null) { - $this->db->expects($this->at($this->prepareAt)) - ->method('prepareQuery') - ->with($this->equalTo($sql), $this->equalTo($limit)) - ->will(($this->returnValue($this->query))); - } elseif($limit === null && $offset !== null) { - $this->db->expects($this->at($this->prepareAt)) - ->method('prepareQuery') - ->with($this->equalTo($sql), - $this->equalTo(null), - $this->equalTo($offset)) - ->will(($this->returnValue($this->query))); - } else { - $this->db->expects($this->at($this->prepareAt)) - ->method('prepareQuery') - ->with($this->equalTo($sql), - $this->equalTo($limit), - $this->equalTo($offset)) - ->will(($this->returnValue($this->query))); - } - $this->prepareAt++; - $this->fetchAt++; - - } - - -} - - -class ArgumentIterator { - - private $arguments; - - public function __construct($arguments){ - $this->arguments = $arguments; - } - - public function next(){ - $result = array_shift($this->arguments); - if($result === null){ - return false; - } else { - return $result; - } - } -} - -- cgit v1.2.3