juliushaertl / apporder

controller/settingscontroller.php

Braces +14 added lines, -10 removed lines

@@ -37,23 +37,27 @@
     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)
-            $result[$app] = $nav_tmp[$app];
-        foreach ($nav as $app)
-            if (!array_key_exists($app['href'], $result))
+        foreach ($nav as $app) {
+                    $nav_tmp[$app['href']] = $app;
+        }
+        foreach ($order as $app) {
+                    $result[$app] = $nav_tmp[$app];
+        }
+        foreach ($nav as $app) {
+                    if (!array_key_exists($app['href'], $result))
                 $result[$app['href']] = $app;
+        }
         return $result;
     }
 

tests/unit/controller/SettingsControllerTest.php

Indentation +77 added lines, -77 removed lines

@@ -11,149 +11,149 @@
 
 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 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->controller = new \OCA\AppOrder\Controller\SettingsController(
-      $this->appName, $this->request, $this->service, $this->navigationManager,
-      $this->userId
+        $this->appName, $this->request, $this->service, $this->navigationManager,
+        $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 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->controller->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->controller->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->controller->getAppOrder();
     $this->assertEquals(json_encode($nav_system), $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/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);
-  }
+    }
 
-  }
+    }