]> source.dussan.org Git - nextcloud-server.git/commitdiff
kill unused require of MapperTestUtility.php
authorThomas Müller <thomas.mueller@tmit.eu>
Thu, 17 Jul 2014 14:35:00 +0000 (16:35 +0200)
committerThomas Müller <thomas.mueller@tmit.eu>
Thu, 17 Jul 2014 14:35:00 +0000 (16:35 +0200)
tests/lib/appframework/db/MapperTest.php [deleted file]
tests/lib/appframework/db/mappertest.php [new file with mode: 0644]

diff --git a/tests/lib/appframework/db/MapperTest.php b/tests/lib/appframework/db/MapperTest.php
deleted file mode 100644 (file)
index 4ddc4ef..0000000
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-
-/**
- * ownCloud - App Framework
- *
- * @author Bernhard Posselt
- * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-namespace OCP\AppFramework\Db;
-
-use \OCP\IDb;
-
-
-require_once __DIR__ . '/MapperTestUtility.php';
-
-/**
- * @method integer getId()
- * @method void setId(integer $id)
- * @method string getEmail()
- * @method void setEmail(string $email)
- * @method string getPreName()
- * @method void setPreName(string $preName)
- */
-class Example extends Entity {
-       public $preName;
-       public $email;
-};
-
-
-class ExampleMapper extends Mapper {
-       public function __construct(IDb $db){ parent::__construct($db, 'table'); }
-       public function find($table, $id){ return $this->findOneQuery($table, $id); }
-       public function findOneEntity($table, $id){ return $this->findEntity($table, $id); }
-       public function findAllEntities($table){ return $this->findEntities($table); }
-       public function mapRow($row){ return $this->mapRowToEntity($row); }
-}
-
-
-class MapperTest extends MapperTestUtility {
-
-       private $mapper;
-
-       public function setUp(){
-               parent::setUp();
-               $this->mapper = new ExampleMapper($this->db);
-       }
-
-
-       public function testMapperShouldSetTableName(){
-               $this->assertEquals('*PREFIX*table', $this->mapper->getTableName());
-       }
-
-
-       public function testFindQuery(){
-               $sql = 'hi';
-               $params = array('jo');
-               $rows = array(
-                       array('hi')
-               );
-               $this->setMapperResult($sql, $params, $rows);           
-               $this->mapper->find($sql, $params);
-       }
-
-       public function testFindEntity(){
-               $sql = 'hi';
-               $params = array('jo');
-               $rows = array(
-                       array('pre_name' => 'hi')
-               );
-               $this->setMapperResult($sql, $params, $rows);
-               $this->mapper->findOneEntity($sql, $params);
-       }
-
-       public function testFindNotFound(){
-               $sql = 'hi';
-               $params = array('jo');
-               $rows = array();
-               $this->setMapperResult($sql, $params, $rows);           
-               $this->setExpectedException(
-                       '\OCP\AppFramework\Db\DoesNotExistException');
-               $this->mapper->find($sql, $params);
-       }
-
-       public function testFindEntityNotFound(){
-               $sql = 'hi';
-               $params = array('jo');
-               $rows = array();
-               $this->setMapperResult($sql, $params, $rows);
-               $this->setExpectedException(
-                       '\OCP\AppFramework\Db\DoesNotExistException');
-               $this->mapper->findOneEntity($sql, $params);
-       }
-
-       public function testFindMultiple(){
-               $sql = 'hi';
-               $params = array('jo');
-               $rows = array(
-                       array('jo'), array('ho')
-               );
-               $this->setMapperResult($sql, $params, $rows);
-               $this->setExpectedException(
-                       '\OCP\AppFramework\Db\MultipleObjectsReturnedException');
-               $this->mapper->find($sql, $params);
-       }
-
-       public function testFindEntityMultiple(){
-               $sql = 'hi';
-               $params = array('jo');
-               $rows = array(
-                       array('jo'), array('ho')
-               );
-               $this->setMapperResult($sql, $params, $rows);
-               $this->setExpectedException(
-                       '\OCP\AppFramework\Db\MultipleObjectsReturnedException');
-               $this->mapper->findOneEntity($sql, $params);
-       }
-
-
-       public function testDelete(){
-               $sql = 'DELETE FROM `*PREFIX*table` WHERE `id` = ?';
-               $params = array(2);
-
-               $this->setMapperResult($sql, $params);
-               $entity = new Example();
-               $entity->setId($params[0]);
-
-               $this->mapper->delete($entity);
-       }
-
-
-       public function testCreate(){
-               $this->db->expects($this->once())
-                       ->method('getInsertId')
-                       ->with($this->equalTo('*PREFIX*table'))
-                       ->will($this->returnValue(3));
-               $this->mapper = new ExampleMapper($this->db);
-
-               $sql = 'INSERT INTO `*PREFIX*table`(`pre_name`,`email`) ' .
-                               'VALUES(?,?)';
-               $params = array('john', 'my@email');
-               $entity = new Example();
-               $entity->setPreName($params[0]);
-               $entity->setEmail($params[1]);
-
-               $this->setMapperResult($sql, $params);
-
-               $this->mapper->insert($entity);
-       }
-
-
-       public function testCreateShouldReturnItemWithCorrectInsertId(){
-               $this->db->expects($this->once())
-                       ->method('getInsertId')
-                       ->with($this->equalTo('*PREFIX*table'))
-                       ->will($this->returnValue(3));
-               $this->mapper = new ExampleMapper($this->db);
-
-               $sql = 'INSERT INTO `*PREFIX*table`(`pre_name`,`email`) ' .
-                               'VALUES(?,?)';
-               $params = array('john', 'my@email');
-               $entity = new Example();
-               $entity->setPreName($params[0]);
-               $entity->setEmail($params[1]);
-
-               $this->setMapperResult($sql, $params);
-
-               $result = $this->mapper->insert($entity);
-
-               $this->assertEquals(3, $result->getId());
-       }
-
-
-       public function testUpdate(){
-               $sql = 'UPDATE `*PREFIX*table` ' .
-                               'SET ' .
-                               '`pre_name` = ?,'.
-                               '`email` = ? ' .
-                               'WHERE `id` = ?';
-
-               $params = array('john', 'my@email', 1);
-               $entity = new Example();
-               $entity->setPreName($params[0]);
-               $entity->setEmail($params[1]);
-               $entity->setId($params[2]);
-
-               $this->setMapperResult($sql, $params);
-
-               $this->mapper->update($entity);
-       }
-
-
-       public function testUpdateNoId(){
-               $params = array('john', 'my@email');
-               $entity = new Example();
-               $entity->setPreName($params[0]);
-               $entity->setEmail($params[1]);
-
-               $this->setExpectedException('InvalidArgumentException');
-
-               $this->mapper->update($entity);
-       }
-
-
-       public function testUpdateNothingChangedNoQuery(){
-               $params = array('john', 'my@email');
-               $entity = new Example();
-               $entity->setId(3);
-               $entity->setEmail($params[1]);
-               $entity->resetUpdatedFields();
-
-               $this->db->expects($this->never())
-                       ->method('prepareQuery');
-
-               $this->mapper->update($entity);
-       }
-
-
-       public function testMapRowToEntity(){
-               $entity1 = $this->mapper->mapRow(array('pre_name' => 'test1', 'email' => 'test2'));
-               $entity2 = new Example();
-               $entity2->setPreName('test1');
-               $entity2->setEmail('test2');
-               $entity2->resetUpdatedFields();
-               $this->assertEquals($entity2, $entity1);
-       }
-
-       public function testFindEntities(){
-               $sql = 'hi';
-               $rows = array(
-                       array('pre_name' => 'hi')
-               );
-               $entity = new Example();
-               $entity->setPreName('hi');
-               $entity->resetUpdatedFields();
-               $this->setMapperResult($sql, array(), $rows);
-               $result = $this->mapper->findAllEntities($sql);
-               $this->assertEquals(array($entity), $result);
-       }
-
-       public function testFindEntitiesNotFound(){
-               $sql = 'hi';
-               $rows = array();
-               $this->setMapperResult($sql, array(), $rows);
-               $result = $this->mapper->findAllEntities($sql);
-               $this->assertEquals(array(), $result);
-       }
-
-       public function testFindEntitiesMultiple(){
-               $sql = 'hi';
-               $rows = array(
-                       array('pre_name' => 'jo'), array('email' => 'ho')
-               );
-               $entity1 = new Example();
-               $entity1->setPreName('jo');
-               $entity1->resetUpdatedFields();
-               $entity2 = new Example();
-               $entity2->setEmail('ho');
-               $entity2->resetUpdatedFields();
-               $this->setMapperResult($sql, array(), $rows);
-               $result = $this->mapper->findAllEntities($sql);
-               $this->assertEquals(array($entity1, $entity2), $result);
-       }
-}
\ No newline at end of file
diff --git a/tests/lib/appframework/db/mappertest.php b/tests/lib/appframework/db/mappertest.php
new file mode 100644 (file)
index 0000000..42aa1ad
--- /dev/null
@@ -0,0 +1,280 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+
+namespace OCP\AppFramework\Db;
+
+use \OCP\IDb;
+use Test\AppFramework\Db\MapperTestUtility;
+
+/**
+ * @method integer getId()
+ * @method void setId(integer $id)
+ * @method string getEmail()
+ * @method void setEmail(string $email)
+ * @method string getPreName()
+ * @method void setPreName(string $preName)
+ */
+class Example extends Entity {
+       public $preName;
+       public $email;
+};
+
+
+class ExampleMapper extends Mapper {
+       public function __construct(IDb $db){ parent::__construct($db, 'table'); }
+       public function find($table, $id){ return $this->findOneQuery($table, $id); }
+       public function findOneEntity($table, $id){ return $this->findEntity($table, $id); }
+       public function findAllEntities($table){ return $this->findEntities($table); }
+       public function mapRow($row){ return $this->mapRowToEntity($row); }
+}
+
+
+class MapperTest extends MapperTestUtility {
+
+       /**
+        * @var Mapper
+        */
+       private $mapper;
+
+       public function setUp(){
+               parent::setUp();
+               $this->mapper = new ExampleMapper($this->db);
+       }
+
+
+       public function testMapperShouldSetTableName(){
+               $this->assertEquals('*PREFIX*table', $this->mapper->getTableName());
+       }
+
+
+       public function testFindQuery(){
+               $sql = 'hi';
+               $params = array('jo');
+               $rows = array(
+                       array('hi')
+               );
+               $this->setMapperResult($sql, $params, $rows);           
+               $this->mapper->find($sql, $params);
+       }
+
+       public function testFindEntity(){
+               $sql = 'hi';
+               $params = array('jo');
+               $rows = array(
+                       array('pre_name' => 'hi')
+               );
+               $this->setMapperResult($sql, $params, $rows);
+               $this->mapper->findOneEntity($sql, $params);
+       }
+
+       public function testFindNotFound(){
+               $sql = 'hi';
+               $params = array('jo');
+               $rows = array();
+               $this->setMapperResult($sql, $params, $rows);           
+               $this->setExpectedException(
+                       '\OCP\AppFramework\Db\DoesNotExistException');
+               $this->mapper->find($sql, $params);
+       }
+
+       public function testFindEntityNotFound(){
+               $sql = 'hi';
+               $params = array('jo');
+               $rows = array();
+               $this->setMapperResult($sql, $params, $rows);
+               $this->setExpectedException(
+                       '\OCP\AppFramework\Db\DoesNotExistException');
+               $this->mapper->findOneEntity($sql, $params);
+       }
+
+       public function testFindMultiple(){
+               $sql = 'hi';
+               $params = array('jo');
+               $rows = array(
+                       array('jo'), array('ho')
+               );
+               $this->setMapperResult($sql, $params, $rows);
+               $this->setExpectedException(
+                       '\OCP\AppFramework\Db\MultipleObjectsReturnedException');
+               $this->mapper->find($sql, $params);
+       }
+
+       public function testFindEntityMultiple(){
+               $sql = 'hi';
+               $params = array('jo');
+               $rows = array(
+                       array('jo'), array('ho')
+               );
+               $this->setMapperResult($sql, $params, $rows);
+               $this->setExpectedException(
+                       '\OCP\AppFramework\Db\MultipleObjectsReturnedException');
+               $this->mapper->findOneEntity($sql, $params);
+       }
+
+
+       public function testDelete(){
+               $sql = 'DELETE FROM `*PREFIX*table` WHERE `id` = ?';
+               $params = array(2);
+
+               $this->setMapperResult($sql, $params);
+               $entity = new Example();
+               $entity->setId($params[0]);
+
+               $this->mapper->delete($entity);
+       }
+
+
+       public function testCreate(){
+               $this->db->expects($this->once())
+                       ->method('getInsertId')
+                       ->with($this->equalTo('*PREFIX*table'))
+                       ->will($this->returnValue(3));
+               $this->mapper = new ExampleMapper($this->db);
+
+               $sql = 'INSERT INTO `*PREFIX*table`(`pre_name`,`email`) ' .
+                               'VALUES(?,?)';
+               $params = array('john', 'my@email');
+               $entity = new Example();
+               $entity->setPreName($params[0]);
+               $entity->setEmail($params[1]);
+
+               $this->setMapperResult($sql, $params);
+
+               $this->mapper->insert($entity);
+       }
+
+
+       public function testCreateShouldReturnItemWithCorrectInsertId(){
+               $this->db->expects($this->once())
+                       ->method('getInsertId')
+                       ->with($this->equalTo('*PREFIX*table'))
+                       ->will($this->returnValue(3));
+               $this->mapper = new ExampleMapper($this->db);
+
+               $sql = 'INSERT INTO `*PREFIX*table`(`pre_name`,`email`) ' .
+                               'VALUES(?,?)';
+               $params = array('john', 'my@email');
+               $entity = new Example();
+               $entity->setPreName($params[0]);
+               $entity->setEmail($params[1]);
+
+               $this->setMapperResult($sql, $params);
+
+               $result = $this->mapper->insert($entity);
+
+               $this->assertEquals(3, $result->getId());
+       }
+
+
+       public function testUpdate(){
+               $sql = 'UPDATE `*PREFIX*table` ' .
+                               'SET ' .
+                               '`pre_name` = ?,'.
+                               '`email` = ? ' .
+                               'WHERE `id` = ?';
+
+               $params = array('john', 'my@email', 1);
+               $entity = new Example();
+               $entity->setPreName($params[0]);
+               $entity->setEmail($params[1]);
+               $entity->setId($params[2]);
+
+               $this->setMapperResult($sql, $params);
+
+               $this->mapper->update($entity);
+       }
+
+
+       public function testUpdateNoId(){
+               $params = array('john', 'my@email');
+               $entity = new Example();
+               $entity->setPreName($params[0]);
+               $entity->setEmail($params[1]);
+
+               $this->setExpectedException('InvalidArgumentException');
+
+               $this->mapper->update($entity);
+       }
+
+
+       public function testUpdateNothingChangedNoQuery(){
+               $params = array('john', 'my@email');
+               $entity = new Example();
+               $entity->setId(3);
+               $entity->setEmail($params[1]);
+               $entity->resetUpdatedFields();
+
+               $this->db->expects($this->never())
+                       ->method('prepareQuery');
+
+               $this->mapper->update($entity);
+       }
+
+
+       public function testMapRowToEntity(){
+               $entity1 = $this->mapper->mapRow(array('pre_name' => 'test1', 'email' => 'test2'));
+               $entity2 = new Example();
+               $entity2->setPreName('test1');
+               $entity2->setEmail('test2');
+               $entity2->resetUpdatedFields();
+               $this->assertEquals($entity2, $entity1);
+       }
+
+       public function testFindEntities(){
+               $sql = 'hi';
+               $rows = array(
+                       array('pre_name' => 'hi')
+               );
+               $entity = new Example();
+               $entity->setPreName('hi');
+               $entity->resetUpdatedFields();
+               $this->setMapperResult($sql, array(), $rows);
+               $result = $this->mapper->findAllEntities($sql);
+               $this->assertEquals(array($entity), $result);
+       }
+
+       public function testFindEntitiesNotFound(){
+               $sql = 'hi';
+               $rows = array();
+               $this->setMapperResult($sql, array(), $rows);
+               $result = $this->mapper->findAllEntities($sql);
+               $this->assertEquals(array(), $result);
+       }
+
+       public function testFindEntitiesMultiple(){
+               $sql = 'hi';
+               $rows = array(
+                       array('pre_name' => 'jo'), array('email' => 'ho')
+               );
+               $entity1 = new Example();
+               $entity1->setPreName('jo');
+               $entity1->resetUpdatedFields();
+               $entity2 = new Example();
+               $entity2->setEmail('ho');
+               $entity2->resetUpdatedFields();
+               $this->setMapperResult($sql, array(), $rows);
+               $result = $this->mapper->findAllEntities($sql);
+               $this->assertEquals(array($entity1, $entity2), $result);
+       }
+}