From 39d3bc61d81eae92d9615e898bc6dd6b658d71a6 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Thu, 21 Mar 2013 13:16:16 +0100 Subject: added all controllers --- tests/controller/FolderControllerTest.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/controller/FolderControllerTest.php b/tests/controller/FolderControllerTest.php index 52836b092..531584ddc 100644 --- a/tests/controller/FolderControllerTest.php +++ b/tests/controller/FolderControllerTest.php @@ -62,16 +62,16 @@ class FolderControllerTest extends ControllerTestUtility { /** * getAll */ - public function testGetAllCalled(){ + public function testFoldersCalled(){ $this->folderBl->expects($this->once()) ->method('findAll') ->will($this->returnValue( array() )); - $this->controller->getAll(); + $this->controller->folders(); } - public function testGetAllReturnsFolders(){ + public function testFoldersReturnsFolders(){ $return = array( new Folder(), new Folder(), @@ -80,7 +80,7 @@ class FolderControllerTest extends ControllerTestUtility { ->method('findAll') ->will($this->returnValue($return)); - $response = $this->controller->getAll(); + $response = $this->controller->folders(); $expected = array( 'folders' => $return ); @@ -88,16 +88,16 @@ class FolderControllerTest extends ControllerTestUtility { } - public function testGetAllAnnotations(){ - $methodName = 'getAll'; + public function testFoldersAnnotations(){ + $methodName = 'folders'; $annotations = array('IsAdminExemption', 'IsSubAdminExemption', 'Ajax'); $this->assertAnnotations($this->controller, $methodName, $annotations); } - public function testGetAllReturnsJSON(){ - $response = $this->controller->getAll(); + public function testFoldersReturnsJSON(){ + $response = $this->controller->folders(); $this->assertTrue($response instanceof JSONResponse); } -- cgit v1.2.3