Merge pull request #21797 from owncloud/proper-controller-in-core

Move controller in core/ to a common subfolder

2 files changed, 6 insertions, 6 deletions

diff --git a/tests/core/avatar/avatarcontrollertest.php b/tests/core/controller/avatarcontrollertest.php
index 9e46e1782af..8e5e58904a7 100644
--- a/tests/core/avatar/avatarcontrollertest.php
+++ b/tests/core/controller/avatarcontrollertest.php
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-namespace OC\Core\Avatar;
+namespace OC\Core\Controller;
 
 use OC;
 use OC\Core\Application;
@@ -45,7 +45,7 @@ function is_uploaded_file($filename) {
  *
  * @group DB
  *
- * @package OC\Core\Avatar
+ * @package OC\Core\Controller
  */
 class AvatarControllerTest extends \Test\TestCase {
 	use UserTrait;
diff --git a/tests/core/lostpassword/controller/lostcontrollertest.php b/tests/core/controller/lostcontrollertest.php
index 0843d82da3f..44bc539247f 100644
--- a/tests/core/lostpassword/controller/lostcontrollertest.php
+++ b/tests/core/controller/lostcontrollertest.php
@@ -19,7 +19,7 @@
  *
  */
 
-namespace OC\Core\LostPassword\Controller;
+namespace OC\Core\Controller;
 
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -36,7 +36,7 @@ use PHPUnit_Framework_MockObject_MockObject;
 /**
  * Class LostControllerTest
  *
- * @package OC\Core\LostPassword\Controller
+ * @package OC\Core\Controller
  */
 class LostControllerTest extends \PHPUnit_Framework_TestCase {
 
@@ -124,8 +124,8 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 			->will($this->returnValue('https://ownCloud.com/index.php/lostpassword/'));
 
 		$response = $this->lostController->resetform($token, $userId);
-		$expectedResponse = new TemplateResponse('core/lostpassword',
-			'resetpassword',
+		$expectedResponse = new TemplateResponse('core',
+			'lostpassword/resetpassword',
 			array(
 				'link' => 'https://ownCloud.com/index.php/lostpassword/',
 			),