diff options
Diffstat (limited to 'tests/lib/appframework/db/MapperTest.php')
-rw-r--r-- | tests/lib/appframework/db/MapperTest.php | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/tests/lib/appframework/db/MapperTest.php b/tests/lib/appframework/db/MapperTest.php index 2a7a3700dab..015528dd2e4 100644 --- a/tests/lib/appframework/db/MapperTest.php +++ b/tests/lib/appframework/db/MapperTest.php @@ -38,10 +38,8 @@ 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 findAll($table){ return $this->findAllQuery($table); } public function findAllEntities($table){ return $this->findEntities($table); } public function mapRow($row){ return $this->mapRowToEntity($row); } - public function pDeleteQuery($table, $id){ $this->deleteQuery($table, $id); } } @@ -66,7 +64,7 @@ class MapperTest extends MapperTestUtility { $rows = array( array('hi') ); - $row = $this->setMapperResult($sql, $params, $rows); + $this->setMapperResult($sql, $params, $rows); $this->mapper->find($sql, $params); } @@ -76,7 +74,7 @@ class MapperTest extends MapperTestUtility { $rows = array( array('pre_name' => 'hi') ); - $row = $this->setMapperResult($sql, $params, $rows); + $this->setMapperResult($sql, $params, $rows); $this->mapper->findOneEntity($sql, $params); } @@ -84,7 +82,7 @@ class MapperTest extends MapperTestUtility { $sql = 'hi'; $params = array('jo'); $rows = array(); - $row = $this->setMapperResult($sql, $params, $rows); + $this->setMapperResult($sql, $params, $rows); $this->setExpectedException( '\OCP\AppFramework\Db\DoesNotExistException'); $this->mapper->find($sql, $params); @@ -94,7 +92,7 @@ class MapperTest extends MapperTestUtility { $sql = 'hi'; $params = array('jo'); $rows = array(); - $row = $this->setMapperResult($sql, $params, $rows); + $this->setMapperResult($sql, $params, $rows); $this->setExpectedException( '\OCP\AppFramework\Db\DoesNotExistException'); $this->mapper->findOneEntity($sql, $params); @@ -106,7 +104,7 @@ class MapperTest extends MapperTestUtility { $rows = array( array('jo'), array('ho') ); - $row = $this->setMapperResult($sql, $params, $rows); + $this->setMapperResult($sql, $params, $rows); $this->setExpectedException( '\OCP\AppFramework\Db\MultipleObjectsReturnedException'); $this->mapper->find($sql, $params); @@ -118,7 +116,7 @@ class MapperTest extends MapperTestUtility { $rows = array( array('jo'), array('ho') ); - $row = $this->setMapperResult($sql, $params, $rows); + $this->setMapperResult($sql, $params, $rows); $this->setExpectedException( '\OCP\AppFramework\Db\MultipleObjectsReturnedException'); $this->mapper->findOneEntity($sql, $params); @@ -233,7 +231,7 @@ class MapperTest extends MapperTestUtility { $entity = new Example(); $entity->setPreName('hi'); $entity->resetUpdatedFields(); - $row = $this->setMapperResult($sql, array(), $rows); + $this->setMapperResult($sql, array(), $rows); $result = $this->mapper->findAllEntities($sql); $this->assertEquals(array($entity), $result); } @@ -241,7 +239,7 @@ class MapperTest extends MapperTestUtility { public function testFindEntitiesNotFound(){ $sql = 'hi'; $rows = array(); - $row = $this->setMapperResult($sql, array(), $rows); + $this->setMapperResult($sql, array(), $rows); $result = $this->mapper->findAllEntities($sql); $this->assertEquals(array(), $result); } @@ -257,7 +255,7 @@ class MapperTest extends MapperTestUtility { $entity2 = new Example(); $entity2->setEmail('ho'); $entity2->resetUpdatedFields(); - $row = $this->setMapperResult($sql, array(), $rows); + $this->setMapperResult($sql, array(), $rows); $result = $this->mapper->findAllEntities($sql); $this->assertEquals(array($entity1, $entity2), $result); } |