dernières optimisation sur les tests

Etienne Pallier
1 parent b711c664
Showing 6 changed files with 112 additions and 45 deletions Show diff stats
README-LABINVENT.md
src/Controller/AppController.php
src/Template/Layout/default.ctp
tests/TestCase/Controller/General.php
tests/TestCase/Controller/MaterielsControllerTest.php
tests/TestCase/Controller/PagesControllerTest.php
@@ -47,8 +47,8 @@ Logiciel testé et validé sur les configurations suivantes :
  
 VERSION ACTUELLE
  
-Date: 28/08/2017
-Version: 2.7.6
+Date: 29/08/2017
+Version: 2.7.7
 	Grosse amelioration des tests (refactorisation, généralisation)
  
 Version majeure en cours (2.7): https://projects.irap.omp.eu/versions/162
@@ -65,6 +65,10 @@ CHANGEMENTS IMPORTANTS (MILESTONES)
  
 Liste complète des évolutions: https://gitlab.irap.omp.eu/epallier/labinvent/commits/master
  
+28/08/2017	Version: 2.7.6
+			- renforcement important des TESTS : généralisation, refactorisation, simplification + numérotation systématique (cf doc ACL)
+			- nouvelle philo mise en place : 1 fichier tests par Controleur (c'était déjà le cas), puis pour un controleur donné, tri des tests par ACTION, puis pour chaque action, tests systématique de tous les ROLES (profils) avec les cas particuliers de chacun
+
 06/07/2017	Version: 2.7.3
 			- suppression du contenu de vendor/ => désormais ignoré car autogénéré
 			- update des plugins phpqrcode et fpdf => désormais via composer.json
@@ -49,6 +49,9 @@ class AppController extends Controller {
    		'Super Administrateur' => self::PROFILE_SUPERADMIN
     ];
  
+    // Current role (profile) of the user
+    private $CURRENT_ROLE = null;
+    
  
     public static function getRoleLevel($role) {
         //return $this->allProfiles[$role];  
@@ -105,12 +108,15 @@ class AppController extends Controller {
     }
  
     public function getUserRole() {
-        $configuration = $this->confLabinvent;
-        $user = TableRegistry::get('Users')->find()
-        ->where(['username' => $this->LdapAuth->user($configuration->authentificationType_ldap)[0]])
-        //->where(['username' => $this->LdapAuth->user('cn')[0]])
-        ->first();
-        return $user['role'];
+        if (! $this->CURRENT_ROLE) {
+            $configuration = $this->confLabinvent;
+            $user = TableRegistry::get('Users')->find()
+            ->where(['username' => $this->LdapAuth->user($configuration->authentificationType_ldap)[0]])
+            //->where(['username' => $this->LdapAuth->user('cn')[0]])
+            ->first();
+            $this->CURRENT_ROLE = $user['role'];
+        }
+        return $this->CURRENT_ROLE;
     }
  
     public function userHasRole($expectedRole, $ORMORE=false) {
@@ -115,7 +115,7 @@ $cakeDescription = &#39;Labinvent 2&#39;;
 					</i></td>
 					<td id="version">
 						<!-- VERSION M.m.f.b (version (M)ajeure, version (m)ineure, numero de nouvelle (f)onctionnalite, numero de (b)ugfix) -->
-						<font color="black">VERSION 2.7.6 (28/08/2017)</font>
+						<font color="black">VERSION 2.7.7 (29/08/2017)</font>
 						<br/>
 						<font color="black"><a href="<?php
  
@@ -30,6 +30,9 @@ class General extends IntegrationTestCase {
     ];
  
     const PROFILES = AppController::PROFILES;
+    
+    // Current role (profile) of the user
+    private $CURRENT_ROLE = null;
  
     /*
     public $ControllerApp = null;
@@ -67,11 +70,14 @@ class General extends IntegrationTestCase {
  
     // Definition DIFFERENTE de celle de AppController
     public function getUserRole() {
-        $user = TableRegistry::get('Users')->find()->where([
-            //'username' => 'user1_SUPER'
-            'username' => $this->_session['Auth']['User']['cn'][0]
-        ])->first();
-        return $user['role'];
+        if (! $this->CURRENT_ROLE) {
+            $user = TableRegistry::get('Users')->find()->where([
+                //'username' => 'user1_SUPER'
+                'username' => $this->_session['Auth']['User']['cn'][0]
+            ])->first();
+            $this->CURRENT_ROLE = $user['role'];
+        }
+        return $this->CURRENT_ROLE;
     }
     // MEME Definition de celle de AppController (mais n'utilise la meme fonction getUserRole())
     public function userHasRole($expectedRole, $ORMORE=false) {
@@ -106,20 +112,30 @@ class General extends IntegrationTestCase {
  
     public function authAs($role) {
         switch ($role) {
-            case 'USER': $this->authUtilisateur();
-            break;
-            case 'RESP': $this->authResponsable();
-            break;
-            case 'ADMIN': $this->authAdmin();
-            break;
-            case 'ADMINP': $this->authAdminPlus();
-            break;
-            case 'SUPER': $this->authSuperAdmin();
-            break;
+            case 'USER': 
+                $this->authUtilisateur();
+                //$this->CURRENT_ROLE = 'Utilisateur';
+                break;
+            case 'RESP': 
+                $this->authResponsable();
+                //$this->CURRENT_ROLE = 'Responsable';
+                break;
+            case 'ADMIN': 
+                $this->authAdmin();
+                //$this->CURRENT_ROLE = 'Administration';
+                break;
+            case 'ADMINP': 
+                $this->authAdminPlus();
+                //$this->CURRENT_ROLE = 'Administration Plus';
+                break;
+            case 'SUPER': 
+                $this->authSuperAdmin();
+                //$this->CURRENT_ROLE = 'Super Administrateur';
+                break;
         }
     }
  
-    public function authUser($cn, $givenName='test1', $sn='test2') {
+    private function authUser($cn, $givenName='test1', $sn='test2') {
         $user = [
             'Auth' => [
                 'User' => [
@@ -141,13 +141,20 @@ class MaterielsControllerTest extends General {
      *
      * @return void
      */
-    public function testMat20ReadAll() { // test INDEX action
+    // test INDEX action
+    /*
+    public function testMat20ReadAll() { 
         foreach ($this->ROLES as $role) $this->_testMatReadAllAs($role);
     }
-                
+    */
+    public function testMat20ReadAllAsUser() { $this->_testMatReadAllAs('USER'); }
+    public function testMat20ReadAllAsResp() { $this->_testMatReadAllAs('RESP'); }
+    public function testMat20ReadAllAsAdmin() { $this->_testMatReadAllAs('ADMIN'); }
+    public function testMat20ReadAllAsAdminP() { $this->_testMatReadAllAs('ADMINP'); }
+    public function testMat20ReadAllAsSuperAdmin() { $this->_testMatReadAllAs('SUPER'); }
     private function _testMatReadAllAs($role)
     {
-        $this->setUp();
+        //$this->setUp();
  
         // On doit pouvoir accéder à la page une fois authentifié
         $this->authAs($role);
@@ -190,7 +197,7 @@ class MaterielsControllerTest extends General {
         }
         */
  
-        $this->tearDown();
+        //$this->tearDown();
     }
     public function testMat21ReadAllAsAnonymous() { // test INDEX action
         // On ne doit pas avoir accès sans authentification
@@ -216,12 +223,20 @@ class MaterielsControllerTest extends General {
      * @group failing
      * @return void
      */
+    /*
     public function testMat10ReadOne() { // test VIEW action
         foreach ($this->ROLES as $role) $this->_testMatReadOneAs($role);
     }
+    */
+    // test VIEW action
+    public function testMat10ReadOneAsUser() { $this->_testMatReadOneAs('USER'); }
+    public function testMat10ReadOneAsResp() { $this->_testMatReadOneAs('RESP'); }
+    public function testMat10ReadOneAsAdmin() { $this->_testMatReadOneAs('ADMIN'); }
+    public function testMat10ReadOneAsAdminPlus() { $this->_testMatReadOneAs('ADMINP'); }
+    public function testMat10ReadOneAsSuperAdmin() { $this->_testMatReadOneAs('SUPER'); }
     private function _testMatReadOneAs($role)
     {
-        $this->setUp();
+        //$this->setUp();
  
         //$this->authSuperAdmin();
         $this->authAs($role);
@@ -243,7 +258,7 @@ class MaterielsControllerTest extends General {
         }
         else $this->assertResponseNotContains("Informations administratives");
  
-        $this->tearDown();
+        //$this->tearDown();
  
     }
  
@@ -260,13 +275,19 @@ class MaterielsControllerTest extends General {
      *
      * @return void
      */
+    /*
     public function testMat30AccessCreateForm() {
         foreach ($this->ROLES as $role) $this->_testMatAccessCreateFormAs($role);
     }
-    
+    */
+    public function testMat30AccessCreateFormAsUser() { $this->_testMatAccessCreateFormAs('USER'); }
+    public function testMat30AccessCreateFormAsResp() { $this->_testMatAccessCreateFormAs('RESP'); }
+    public function testMat30AccessCreateFormAsAdmin() { $this->_testMatAccessCreateFormAs('ADMIN'); }
+    public function testMat30AccessCreateFormAsAdminPlus() { $this->_testMatAccessCreateFormAs('ADMINP'); }
+    public function testMat30AccessCreateFormAsSuperAdmin() { $this->_testMatAccessCreateFormAs('SUPER'); }
     private function _testMatAccessCreateFormAs($role)
     {
-        $this->setUp();
+        //$this->setUp();
  
         // On doit pouvoir accéder à la page une fois authentifié
         $this->authAs($role);
@@ -283,7 +304,7 @@ class MaterielsControllerTest extends General {
         $this->assertResponseContains('EOTP', 'Le profil admin+ n\'a pas accès à la partie administrative sur le formulaire add.');
         */
  
-        $this->tearDown();
+        //$this->tearDown();
     }
  
  
@@ -458,6 +479,8 @@ class MaterielsControllerTest extends General {
      * @return void
      */
  
+    // ACTION 'edit'
+    /*
     public function testUpdate() { // ACTION 'edit'
         foreach ($this->ROLES as $role) { 
             $this->authAs($role);
@@ -465,10 +488,15 @@ class MaterielsControllerTest extends General {
             $this->_testUpdates($role);
         } // foreach
     }
-
-    
-    private function _testUpdates($role) {
-           
+    */
+    //TODO: test as USER
+    //public function testUpdateAsUser() { $this->_testUpdatesAs('USER'); }
+    public function testUpdateAsResp() { $this->_testUpdatesAs('RESP'); }
+    public function testUpdateAsAdmin() { $this->_testUpdatesAs('ADMIN'); }
+    public function testUpdateAsAdminPlus() { $this->_testUpdatesAs('ADMINP'); }
+    public function testUpdateAsSuperAdmin() { $this->_testUpdatesAs('SUPER'); }
+    private function _testUpdatesAs($role) {
+        $this->authAs($role);
         // 1) Test qu'on peut modifier un materiel CREATED
         // Toutes les donnees passees sont modifiees
         $data = [
@@ -61,12 +61,18 @@ class PagesControllerTest extends General
      * @return void
      */
  
+	//public function testDisplay()
+	/*
 	public function testPage10AccessHome() {
 	    foreach ($this->ROLES as $role) $this->subtestPageAccessHomeAs($role);
 	}
-	//public function testDisplay()
-	private function subtestPageAccessHomeAs($role)
-	{
+	*/
+	public function testPage10AccessHomeAsUser() { $this->_testPageAccessHomeAs('USER'); }
+	public function testPage10AccessHomeAsResp() { $this->_testPageAccessHomeAs('RESP'); }
+	public function testPage10AccessHomeAsAdmin() { $this->_testPageAccessHomeAs('ADMIN'); }
+	public function testPage10AccessHomeAsAdminPlus() { $this->_testPageAccessHomeAs('ADMINP'); }
+	public function testPage10AccessHomeAsSuperAdmin() { $this->_testPageAccessHomeAs('SUPER'); }
+	private function _testPageAccessHomeAs($role) {
 	    //$this->authUser();
 	    $this->authAs($role);
  
@@ -96,12 +102,18 @@ class PagesControllerTest extends General
  
 	}
  
-	
+	//public function testDisplay()
+	/*
 	public function testPage20AccessTools() {
 	    foreach ($this->ROLES as $role) $this->subtestPageAccessToolsAs($role);
 	}
-	//public function testDisplay()
-	private function subtestPageAccessToolsAs($role)
+	*/
+	public function testPage20AccessToolsAsUser() { $this->_testPageAccessToolsAs('USER'); }
+	public function testPage20AccessToolsAsResp() { $this->_testPageAccessToolsAs('RESP'); }
+	public function testPage20AccessToolsAsAdmin() { $this->_testPageAccessToolsAs('ADMIN'); }
+	public function testPage20AccessToolsAsAdminPlus() { $this->_testPageAccessToolsAs('ADMINP'); }
+	public function testPage20AccessToolsAsSuperAdmin() { $this->_testPageAccessToolsAs('SUPER'); }
+	private function _testPageAccessToolsAs($role)
 	{
 	    $this->authAs($role);
 	    $this->get('/pages/tools');
@@ -113,7 +125,8 @@ class PagesControllerTest extends General
 	       $this->assertResponseOk();
 	       $this->assertResponseContains('Outils', $role.' should be allowed to access the Tools page');
 	       $this->assertResponseContains('Gérer le contenu variable de ', $role);
-	       if ($role == 'SUPER') 
+	       if ($this->USER_IS_SUPERADMIN())
+	       //if ($role == 'SUPER') 
         	       $this->assertResponseContains('Passer en mode DEBUG');
 	       else
 	           $this->assertResponseNotContains('Passer en mode DEBUG');