juliushaertl / apporder

tests/unit/service/ConfigServiceTest.php

Indentation +16 added lines, -16 removed lines

@@ -7,33 +7,33 @@
 
 class ConfigServiceTest extends \Test\TestCase {
 
-  private $config;
-  private $service;
+    private $config;
+    private $service;
 
-  public function setUp() {
+    public function setUp() {
     $this->config = $this->getMockBuilder('\OCP\IConfig')
-      ->disableOriginalConstructor()->getMock();
+        ->disableOriginalConstructor()->getMock();
     $this->service = new ConfigService($this->config, 'apporder');
-  }
+    }
 
-  public function testAppValue() {
+    public function testAppValue() {
     $this->config->expects($this->any())
-      ->method('getAppValue')
-      ->with('apporder', 'foo')
-      ->willReturn('bar');
+        ->method('getAppValue')
+        ->with('apporder', 'foo')
+        ->willReturn('bar');
 //    $this->service->setAppValue("foo","bar");
     $result = $this->service->getAppValue("foo");
     $this->assertEquals('bar', $result);
-  }
+    }
 
-  public function testUserValue() {
+    public function testUserValue() {
     $this->config->expects($this->any())
-      ->method('getUserValue')
-      ->with('user', 'apporder', 'foo')
-      ->willReturn('bar');
+        ->method('getUserValue')
+        ->with('user', 'apporder', 'foo')
+        ->willReturn('bar');
     $this->service->setUserValue("foo", "user", "bar");
     $result = $this->service->getUserValue("foo", "user");
     $this->assertEquals('bar', $result);
-  }
+    }
 
-  }
+    }

appinfo/routes.php

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 return [
     'routes' => [
-		['name' => 'app#index', 'url' => '/', 'verb' => 'GET'],
+        ['name' => 'app#index', 'url' => '/', 'verb' => 'GET'],
         ['name' => 'settings#getOrder', 'url' => 'ajax/order.php', 'verb' => 'GET'],
         ['name' => 'settings#savePersonal', 'url' => 'ajax/personal.php', 'verb' => 'GET'],
         ['name' => 'settings#saveDefaultOrder', 'url' => 'ajax/admin.php', 'verb' => 'GET'],

lib/Controller/SettingsController.php

Indentation +24 added lines, -24 removed lines

@@ -14,23 +14,23 @@ 
     private $userId;
     private $appConfig;
     private $navigationManager;
-	private $util;
+    private $util;
 
     public function __construct($appName, IRequest $request, ConfigService $appConfig, INavigationManager $navigationManager, Util $util, $userId) {
         parent::__construct($appName, $request);
         $this->userId = $userId;
         $this->appConfig = $appConfig;
         $this->navigationManager = $navigationManager;
-		$this->util = $util;
+        $this->util = $util;
     }
 
-	/**
-	 * Admin: render admin page
-	 * FIXME: Move to dedicated class
-	 * @return TemplateResponse
-	 */
+    /**
+     * Admin: render admin page
+     * FIXME: Move to dedicated class
+     * @return TemplateResponse
+     */
     public function adminIndex() {
-		// Private API call
+        // Private API call
         $navigation = $this->navigationManager->getAll();
         $order = json_decode($this->appConfig->getAppValue('order'));
         $nav = $this->util->matchOrder($navigation, $order);
@@ -42,17 +42,17 @@ 
         );
     }
 
-	/**
-	 * Admin: save default order
-	 * @param $order
-	 * @return array
-	 */
-	public function saveDefaultOrder($order) {
-		if (!is_null($order)) {
-			$this->appConfig->setAppValue('order', $order);
-		}
-		return array('status' => 'success', 'order' => $order);
-	}
+    /**
+     * Admin: save default order
+     * @param $order
+     * @return array
+     */
+    public function saveDefaultOrder($order) {
+        if (!is_null($order)) {
+            $this->appConfig->setAppValue('order', $order);
+        }
+        return array('status' => 'success', 'order' => $order);
+    }
 
     /**
      * @NoAdminRequired
@@ -62,11 +62,11 @@ 
         return array('status' => 'success', 'order' => $order);
     }
 
-	/**
-	 * @NoAdminRequired
-	 * @param $order string
-	 * @return array response
-	 */
+    /**
+     * @NoAdminRequired
+     * @param $order string
+     * @return array response
+     */
     public function savePersonal($order) {
         $this->appConfig->setUserValue('order', $this->userId, $order);
         $response = array(

lib/Util.php

Indentation +28 added lines, -28 removed lines

@@ -24,35 +24,35 @@
 namespace OCA\AppOrder;
 
 class Util {
-	private $userId;
-	private $appConfig;
+    private $userId;
+    private $appConfig;
 
-	public function __construct(ConfigService $appConfig, $userId) {
-		$this->userId = $userId;
-		$this->appConfig = $appConfig;
-	}
-	public function getAppOrder() {
-		$order_user = $this->appConfig->getUserValue('order', $this->userId);
-		$order_default = $this->appConfig->getAppValue('order');
-		if ($order_user !== null && $order_user !== "")
-			$order = $order_user;
-		else
-			$order = $order_default;
-		return $order;
-	}
+    public function __construct(ConfigService $appConfig, $userId) {
+        $this->userId = $userId;
+        $this->appConfig = $appConfig;
+    }
+    public function getAppOrder() {
+        $order_user = $this->appConfig->getUserValue('order', $this->userId);
+        $order_default = $this->appConfig->getAppValue('order');
+        if ($order_user !== null && $order_user !== "")
+            $order = $order_user;
+        else
+            $order = $order_default;
+        return $order;
+    }
 
-	public function matchOrder($nav, $order) {
-		$nav_tmp = array();
-		$result = array();
-		foreach ($nav as $app)
-			$nav_tmp[$app['href']] = $app;
-		foreach ($order as $app)
-			if(array_key_exists($app, $nav_tmp))
-				$result[$app] = $nav_tmp[$app];
-		foreach ($nav as $app)
-			if (!array_key_exists($app['href'], $result))
-				$result[$app['href']] = $app;
-		return $result;
-	}
+    public function matchOrder($nav, $order) {
+        $nav_tmp = array();
+        $result = array();
+        foreach ($nav as $app)
+            $nav_tmp[$app['href']] = $app;
+        foreach ($order as $app)
+            if(array_key_exists($app, $nav_tmp))
+                $result[$app] = $nav_tmp[$app];
+        foreach ($nav as $app)
+            if (!array_key_exists($app['href'], $result))
+                $result[$app['href']] = $app;
+        return $result;
+    }
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 		foreach ($nav as $app)
 			$nav_tmp[$app['href']] = $app;
 		foreach ($order as $app)
-			if(array_key_exists($app, $nav_tmp))
+			if (array_key_exists($app, $nav_tmp))
 				$result[$app] = $nav_tmp[$app];
 		foreach ($nav as $app)
 			if (!array_key_exists($app['href'], $result))

Braces +14 added lines, -10 removed lines

@@ -34,24 +34,28 @@
 	public function getAppOrder() {
 		$order_user = $this->appConfig->getUserValue('order', $this->userId);
 		$order_default = $this->appConfig->getAppValue('order');
-		if ($order_user !== null && $order_user !== "")
-			$order = $order_user;
-		else
-			$order = $order_default;
+		if ($order_user !== null && $order_user !== "") {
+					$order = $order_user;
+		} else {
+					$order = $order_default;
+		}
 		return $order;
 	}
 
 	public function matchOrder($nav, $order) {
 		$nav_tmp = array();
 		$result = array();
-		foreach ($nav as $app)
-			$nav_tmp[$app['href']] = $app;
-		foreach ($order as $app)
-			if(array_key_exists($app, $nav_tmp))
+		foreach ($nav as $app) {
+					$nav_tmp[$app['href']] = $app;
+		}
+		foreach ($order as $app) {
+					if(array_key_exists($app, $nav_tmp))
 				$result[$app] = $nav_tmp[$app];
-		foreach ($nav as $app)
-			if (!array_key_exists($app['href'], $result))
+		}
+		foreach ($nav as $app) {
+					if (!array_key_exists($app['href'], $result))
 				$result[$app['href']] = $app;
+		}
 		return $result;
 	}
 

lib/AppInfo/Application.php

Indentation +3 added lines, -3 removed lines

@@ -17,8 +17,8 @@
             );
         });
 
-		\OCP\Util::addStyle('apporder', 'apporder');
-		\OCP\Util::addScript('apporder', 'apporder');
-		\OCP\App::registerAdmin('apporder', 'admin');
+        \OCP\Util::addStyle('apporder', 'apporder');
+        \OCP\Util::addScript('apporder', 'apporder');
+        \OCP\App::registerAdmin('apporder', 'admin');
     }
 }

tests/unit/UtilTest.php

Indentation +37 added lines, -37 removed lines

@@ -28,72 +28,72 @@
 
 class UtilTest extends \PHPUnit_Framework_TestCase {
 
-	/**
-	 * @var ConfigService
-	 */
-  private $service;
-  private $userId;
-  private $util;
-  private $config;
-  public function setUp() {
+    /**
+     * @var ConfigService
+     */
+    private $service;
+    private $userId;
+    private $util;
+    private $config;
+    public function setUp() {
 
     parent::setUp();
 
     $this->config = $this->getMockBuilder('OCP\IConfig')
-      ->disableOriginalConstructor()
-      ->getMock();
+        ->disableOriginalConstructor()
+        ->getMock();
     $this->service = $this->getMockBuilder('\OCA\AppOrder\Service\ConfigService')
-      ->disableOriginalConstructor()
-      ->getMock();
+        ->disableOriginalConstructor()
+        ->getMock();
     $this->userId = 'admin';
     $this->util = new Util($this->service, $this->userId);
 
-  }
+    }
 
-  public function testMatchOrder() {
+    public function testMatchOrder() {
     $nav = [
-      ['href' => '/app/files/', 'name' => 'Files'],
-      ['href' => '/app/calendar/', 'name' => 'Calendar'],
-      ['href' => '/app/tasks/', 'name' => 'Tasks'],
+        ['href' => '/app/files/', 'name' => 'Files'],
+        ['href' => '/app/calendar/', 'name' => 'Calendar'],
+        ['href' => '/app/tasks/', 'name' => 'Tasks'],
     ];
     $order = ['/app/calendar/', '/app/tasks/'];
     $result = $this->util->matchOrder($nav, $order);
     $expected = [
-      '/app/calendar/' => ['href' => '/app/calendar/', 'name' => 'Calendar'],
-      '/app/tasks/' => ['href' => '/app/tasks/', 'name' => 'Tasks'],
-      '/app/files/' => ['href' => '/app/files/', 'name' => 'Files'],
+        '/app/calendar/' => ['href' => '/app/calendar/', 'name' => 'Calendar'],
+        '/app/tasks/' => ['href' => '/app/tasks/', 'name' => 'Tasks'],
+        '/app/files/' => ['href' => '/app/files/', 'name' => 'Files'],
     ];
     $this->assertEquals($expected, $result);
-  }
+    }
 
-  public function testGetAppOrder() {
+    public function testGetAppOrder() {
     $nav_system = ['/app/calendar/', '/app/tasks/'];
     $nav_user = ['/app/files/', '/app/calendar/', '/app/tasks/'];
     $this->service->expects($this->once())
-      ->method('getAppValue')
-      ->with('order')
-      ->will($this->returnValue(json_encode($nav_system)));
+        ->method('getAppValue')
+        ->with('order')
+        ->will($this->returnValue(json_encode($nav_system)));
     $this->service->expects($this->once())
-      ->method('getUserValue')
-      ->with('order', $this->userId)
-      ->will($this->returnValue(json_encode($nav_user)));
+        ->method('getUserValue')
+        ->with('order', $this->userId)
+        ->will($this->returnValue(json_encode($nav_user)));
     $result = $this->util->getAppOrder();
     $this->assertEquals(json_encode($nav_user), $result);
-  }
+    }
 
-  public function testGetAppOrderNoUser() {
+    public function testGetAppOrderNoUser() {
     $nav_system = ['/app/calendar/', '/app/tasks/'];
     $nav_user = '';
     $this->service->expects($this->once())
-      ->method('getAppValue')
-      ->with('order')
-      ->will($this->returnValue(json_encode($nav_system)));
+        ->method('getAppValue')
+        ->with('order')
+        ->will($this->returnValue(json_encode($nav_system)));
     $this->service->expects($this->once())
-      ->method('getUserValue')
-      ->with('order', $this->userId)
-      ->will($this->returnValue($nav_user));
+        ->method('getUserValue')
+        ->with('order', $this->userId)
+        ->will($this->returnValue($nav_user));
     $result = $this->util->getAppOrder();
     $this->assertEquals(json_encode($nav_system), $result);
-  }
+    }
 
 }

tests/unit/controller/SettingsControllerTest.php

Indentation +54 added lines, -54 removed lines

@@ -11,107 +11,107 @@
 
 class SettingsControllerTest extends \Test\TestCase {
 
-  private $container;
-  private $request;
-  private $service;
-  private $navigationManager;
-  private $userId;
-  private $appName;
-  private $controller;
-  private $config;
-  public function setUp() {
+    private $container;
+    private $request;
+    private $service;
+    private $navigationManager;
+    private $userId;
+    private $appName;
+    private $controller;
+    private $config;
+    public function setUp() {
 
     parent::setUp();
 
     $app = new \OCA\AppOrder\AppInfo\Application();
     $this->container = $app->getContainer();
     $this->request = $this->getMockBuilder('OCP\IRequest')
-      ->disableOriginalConstructor()
-      ->getMock();
+        ->disableOriginalConstructor()
+        ->getMock();
     $this->config = $this->getMockBuilder('OCP\IConfig')
-      ->disableOriginalConstructor()
-      ->getMock();
+        ->disableOriginalConstructor()
+        ->getMock();
     $this->service = $this->getMockBuilder('\OCA\AppOrder\Service\ConfigService')
-      ->disableOriginalConstructor()
-      ->getMock();
+        ->disableOriginalConstructor()
+        ->getMock();
     $this->navigationManager = $this->getMockBuilder('\OCP\INavigationManager')->setMethods(['getAll', 'add', 'setActiveEntry'])
-      ->disableOriginalConstructor()
-      ->getMock();
+        ->disableOriginalConstructor()
+        ->getMock();
 
     $this->userId = 'admin';
     $this->appName = 'apporder';
-	  $this->util = new \OCA\AppOrder\Util($this->service, $this->userId);
+        $this->util = new \OCA\AppOrder\Util($this->service, $this->userId);
     $this->controller = new \OCA\AppOrder\Controller\SettingsController(
-      $this->appName, $this->request, $this->service, $this->navigationManager, $this->util,
-      $this->userId
+        $this->appName, $this->request, $this->service, $this->navigationManager, $this->util,
+        $this->userId
     );
 
-  }
+    }
 
-  public function testAdminIndex() {
+    public function testAdminIndex() {
     $nav_custom = ['/app/calendar/', '/app/tasks/'];
     $nav_oc = [
-      ['href' => '/app/files/', 'name' => 'Files'],
-      ['href' => '/app/calendar/', 'name' => 'Calendar'],
-      ['href' => '/app/tasks/', 'name' => 'Tasks'],
+        ['href' => '/app/files/', 'name' => 'Files'],
+        ['href' => '/app/calendar/', 'name' => 'Calendar'],
+        ['href' => '/app/tasks/', 'name' => 'Tasks'],
     ];
     $nav_final = [
-      '/app/calendar/' => $nav_oc[1], '/app/tasks/' => $nav_oc[2], '/app/files/' => $nav_oc[0]
-      ];
+        '/app/calendar/' => $nav_oc[1], '/app/tasks/' => $nav_oc[2], '/app/files/' => $nav_oc[0]
+        ];
     $this->service->expects($this->once())
-      ->method('getAppValue')
-      ->with('order')
-      ->will($this->returnValue(json_encode($nav_custom)));
+        ->method('getAppValue')
+        ->with('order')
+        ->will($this->returnValue(json_encode($nav_custom)));
     $this->navigationManager->expects($this->once())
-      ->method('getAll')
-      ->will($this->returnValue($nav_oc));
+        ->method('getAll')
+        ->will($this->returnValue($nav_oc));
 
     $result = $this->controller->adminIndex(); 
     $expected = new \OCP\AppFramework\Http\TemplateResponse(
-      $this->appName, 
-      'admin',
-      ["nav" => $nav_final],
-      'blank'
+        $this->appName, 
+        'admin',
+        ["nav" => $nav_final],
+        'blank'
     );
     $this->assertEquals($expected, $result);
-  }
+    }
 
 
-  public function testGetOrder() {
+    public function testGetOrder() {
     $nav_system = ['/app/calendar/', '/app/tasks/'];
     $nav_user = ['/app/files/', '/app/calendar/', '/app/tasks/'];
     $this->service->expects($this->once())
-      ->method('getAppValue')
-      ->with('order')
-      ->will($this->returnValue(json_encode($nav_system)));
+        ->method('getAppValue')
+        ->with('order')
+        ->will($this->returnValue(json_encode($nav_system)));
     $this->service->expects($this->once())
-      ->method('getUserValue')
-      ->with('order', $this->userId)
-      ->will($this->returnValue(json_encode($nav_user)));
+        ->method('getUserValue')
+        ->with('order', $this->userId)
+        ->will($this->returnValue(json_encode($nav_user)));
     $order = ['/app/files/', '/app/calendar/', '/app/tasks/'];
     $result = $this->controller->getOrder();
     $expected = array('status' => 'success', 'order' => json_encode($order));
     $this->assertEquals($expected, $result);
-  }
+    }
 
-  public function testSavePersonal() {
+    public function testSavePersonal() {
     $order = "RANDOMORDER";
     $expected = array(
-      'status' => 'success',
-      'data' => array('message'=> 'User order saved successfully.'),
-      'order' => $order
+        'status' => 'success',
+        'data' => array('message'=> 'User order saved successfully.'),
+        'order' => $order
     );
     $result = $this->controller->savePersonal($order);
     $this->assertEquals($expected, $result);
-  }
+    }
 
-  public function testSaveDefaultOrder() {
+    public function testSaveDefaultOrder() {
     $order = "RANDOMORDER";
     $expected = array(
-      'status' => 'success',
-      'order' => $order
+        'status' => 'success',
+        'order' => $order
     );
     $result = $this->controller->saveDefaultOrder($order);
     $this->assertEquals($expected, $result);
-  }
+    }
 }

tests/bootstrap.php

Indentation +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 
 require_once __DIR__.'/../../../lib/base.php';
 if(!class_exists('PHPUnit_Framework_TestCase')) {
-	require_once('PHPUnit/Autoload.php');
+    require_once('PHPUnit/Autoload.php');
 }
 
 \OC_App::loadApp('apporder');

Spacing +3 added lines, -3 removed lines

@@ -21,12 +21,12 @@
  *
  */
 
-require_once __DIR__ . '/../../../tests/bootstrap.php';
-require_once __DIR__ . '/../appinfo/autoload.php';
+require_once __DIR__.'/../../../tests/bootstrap.php';
+require_once __DIR__.'/../appinfo/autoload.php';
 
 
 require_once __DIR__.'/../../../lib/base.php';
-if(!class_exists('PHPUnit_Framework_TestCase')) {
+if (!class_exists('PHPUnit_Framework_TestCase')) {
 	require_once('PHPUnit/Autoload.php');
 }
 

tests/unit/controller/AppControllerTest.php

Indentation +52 added lines, -52 removed lines

@@ -33,66 +33,66 @@
 
 class AppControllerTest extends \Test\TestCase {
 
-	private $container;
-	private $request;
-	private $service;
-	private $urlGenerator;
-	private $userId;
-	private $appName;
-	/**
-	 * @var AppController
-	 */
-	private $controller;
-	private $config;
-	private $util;
+    private $container;
+    private $request;
+    private $service;
+    private $urlGenerator;
+    private $userId;
+    private $appName;
+    /**
+     * @var AppController
+     */
+    private $controller;
+    private $config;
+    private $util;
 
-	public function setUp() {
+    public function setUp() {
 
-		parent::setUp();
+        parent::setUp();
 
-		$app = new \OCA\AppOrder\AppInfo\Application();
-		$this->container = $app->getContainer();
-		$this->request = $this->getMockBuilder('OCP\IRequest')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->config = $this->getMockBuilder('OCP\IConfig')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->service = $this->getMockBuilder('\OCA\AppOrder\Service\ConfigService')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->urlGenerator = \OC::$server->getURLGenerator();
-		$this->util = $this->getMockBuilder('\OCA\AppOrder\Util')->disableOriginalConstructor()->getMock();
+        $app = new \OCA\AppOrder\AppInfo\Application();
+        $this->container = $app->getContainer();
+        $this->request = $this->getMockBuilder('OCP\IRequest')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->config = $this->getMockBuilder('OCP\IConfig')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->service = $this->getMockBuilder('\OCA\AppOrder\Service\ConfigService')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->urlGenerator = \OC::$server->getURLGenerator();
+        $this->util = $this->getMockBuilder('\OCA\AppOrder\Util')->disableOriginalConstructor()->getMock();
 
-		$this->userId = 'admin';
-		$this->appName = 'apporder';
-		$this->controller = new AppController(
-			$this->appName, $this->request, $this->service, $this->urlGenerator, $this->util,
-			$this->userId
-		);
+        $this->userId = 'admin';
+        $this->appName = 'apporder';
+        $this->controller = new AppController(
+            $this->appName, $this->request, $this->service, $this->urlGenerator, $this->util,
+            $this->userId
+        );
 
-	}
+    }
 
-	public function testIndex() {
-  		$this->util->expects($this->once())
-			->method('getAppOrder')
-			->willReturn(
-				json_encode(['/index.php/foo/bar', '/index.php/bar/foo'])
-			);
-		$expected = new Http\RedirectResponse('/index.php/foo/bar');
-		$result = $this->controller->index();
-		$this->assertEquals($expected, $result);
-	}
+    public function testIndex() {
+            $this->util->expects($this->once())
+            ->method('getAppOrder')
+            ->willReturn(
+                json_encode(['/index.php/foo/bar', '/index.php/bar/foo'])
+            );
+        $expected = new Http\RedirectResponse('/index.php/foo/bar');
+        $result = $this->controller->index();
+        $this->assertEquals($expected, $result);
+    }
 
-	public function testIndexEmpty() {
-		$this->util->expects($this->once())
-			->method('getAppOrder')
-			->willReturn("");
-		$result = $this->controller->index();
+    public function testIndexEmpty() {
+        $this->util->expects($this->once())
+            ->method('getAppOrder')
+            ->willReturn("");
+        $result = $this->controller->index();
 
-		$expected = new Http\RedirectResponse('http://localhost/index.php/apps/files/');
-		$this->assertEquals($expected, $result);
-	}
+        $expected = new Http\RedirectResponse('http://localhost/index.php/apps/files/');
+        $this->assertEquals($expected, $result);
+    }
 
 
 }