Add more assertions

pydio · Sep 16, 2015 · 6d8db1a · 6d8db1a
1 parent 5d739a5
commit 6d8db1a
Showing 1 changed file with 22 additions and 4 deletions.
diff --git a/core/src/phpunit/AJXP/Tests/Atomics/PermissionMaskTest.php b/core/src/phpunit/AJXP/Tests/Atomics/PermissionMaskTest.php
@@ -522,6 +522,12 @@ public function testGroupPathPermission(){
         $randomRole = new \AJXP_PermissionMask();
         $randomRole->updateBranch("/Services/Admin/Requests/Secrets", new \AJXP_Permission("d"));
 
+        $randomRole1 = new \AJXP_PermissionMask();
+        $randomRole1->updateBranch("/Services/Admin/Requests", new \AJXP_Permission("wr"));
+
+        $randomRole2 = new \AJXP_PermissionMask();
+        $randomRole2->updateBranch("/Services/Admin/Requests/Secrets", new \AJXP_Permission("r"));
+
         echo "================================\n";
         echo "Service Admin Request User 0: \n";
         $ServiceAdminRequestsUser->toStr($ServiceAdminRequestsUser->getTree(), 1);
@@ -551,18 +557,30 @@ public function testGroupPathPermission(){
 
         $this->assertTrue($ServiceAdminRequestsUser->match("/Public/write", \AJXP_Permission::WRITE));
         $this->assertFalse($ServiceAdminRequestsUser->match("/Services/Admin/Requests/Secrets", \AJXP_Permission::WRITE));
+        $this->assertTrue($ServiceAdminRequestsUser->match("/Services/Admin/Requests/Secrets", \AJXP_Permission::DENY));
 
         echo "Service Admin Request User 6: \n";
         $ServiceAdminRequestsUser->toStr($ServiceAdminRequestsUser->getTree(), 1);
 
-
-        $randomRole2 = new \AJXP_PermissionMask();
-        $randomRole2->updateBranch("/Services/Admin/Requests/Secrets", new \AJXP_Permission("r"));
-        $ServiceAdminRequestsUser = $randomRole2->override($ServiceAdminRequestsUser);
+        $ServiceAdminRequestsUser = $ServiceAdminRequestsUser->override($randomRole2);
         echo "Service Admin Request User 7: \n";
         $ServiceAdminRequestsUser->toStr($ServiceAdminRequestsUser->getTree(), 1);
 
+        $this->assertTrue($ServiceAdminRequestsUser->match("/Services/Admin/Requests/Secrets", \AJXP_Permission::READ));
+        $this->assertFalse($ServiceAdminRequestsUser->match("/Services/Admin/Requests/Secrets", \AJXP_Permission::WRITE));
+        $this->assertFalse($ServiceAdminRequestsUser->match("/Services/Admin/Requests/Secrets", \AJXP_Permission::DENY));
+
+        $ServiceAdminRequestsUser = $ServiceAdminRequestsUser->override($randomRole1);
+        echo "Service Admin Request User 8: \n";
+        $ServiceAdminRequestsUser->toStr($ServiceAdminRequestsUser->getTree(), 1);
+
+
+        $this->assertTrue($ServiceAdminRequestsUser->match("/Services/Admin/Requests/Secrets", \AJXP_Permission::READ));
+        $this->assertTrue($ServiceAdminRequestsUser->match("/Services/Admin/Requests/Secrets", \AJXP_Permission::WRITE));
+        $this->assertFalse($ServiceAdminRequestsUser->match("/Services/Admin/Requests/Secrets", \AJXP_Permission::DENY));
+
     }
 }
 
 
+