From fbd477a6257b3474b2c5ca7ee479bd9ff7662368 Mon Sep 17 00:00:00 2001
From: Karol Stelmaczonek <karol.stelmaczonek@taotesting.com>
Date: Fri, 16 Dec 2022 13:31:16 +0100
Subject: [PATCH 1/2] fix: remove usage of deprecated TestCase class which
 resulted in warnings in tests

---
 test/unit/model/DataBaseAccessTest.php                     | 7 +++++--
 test/unit/model/PermissionProviderTest.php                 | 7 +++++--
 test/unit/model/RolePrivilegeRetrieverTest.php             | 7 +++++--
 test/unit/model/eventHandler/ResourceUpdateHandlerTest.php | 7 +++++--
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/test/unit/model/DataBaseAccessTest.php b/test/unit/model/DataBaseAccessTest.php
index 9a9e0408..e2b2a7fc 100644
--- a/test/unit/model/DataBaseAccessTest.php
+++ b/test/unit/model/DataBaseAccessTest.php
@@ -24,7 +24,8 @@
 
 use common_persistence_SqlPersistence;
 use core_kernel_classes_Resource;
-use oat\generis\test\TestCase;
+use oat\generis\test\ServiceManagerMockTrait;
+use PHPUnit\Framework\TestCase;
 use oat\oatbox\event\EventManager;
 use oat\taoDacSimple\model\DataBaseAccess;
 use oat\taoDacSimple\model\event\DacAddedEvent;
@@ -42,6 +43,8 @@
  */
 class DataBaseAccessTest extends TestCase
 {
+    use ServiceManagerMockTrait;
+
     private const INSERT_CHUNK_SIZE = 1;
 
     /** @var DataBaseAccess */
@@ -62,7 +65,7 @@ public function setUp(): void
         $this->sut->setLogger(new NullLogger());
         $this->sut->setInsertChunkSize(self::INSERT_CHUNK_SIZE);
         $this->sut->setServiceLocator(
-            $this->getServiceLocatorMock(
+            $this->getServiceManagerMock(
                 [
                     EventManager::SERVICE_ID => $this->eventManager
                 ]
diff --git a/test/unit/model/PermissionProviderTest.php b/test/unit/model/PermissionProviderTest.php
index a7a2c533..ad556e9d 100644
--- a/test/unit/model/PermissionProviderTest.php
+++ b/test/unit/model/PermissionProviderTest.php
@@ -22,13 +22,16 @@
 
 namespace oat\taoDacSimple\test\unit\model;
 
-use oat\generis\test\TestCase;
+use oat\generis\test\ServiceManagerMockTrait;
+use PHPUnit\Framework\TestCase;
 use oat\taoDacSimple\model\DataBaseAccess;
 use oat\taoDacSimple\model\PermissionProvider;
 use oat\taoDacSimple\model\RolePrivilegeRetriever;
 
 class PermissionProviderTest extends TestCase
 {
+    use ServiceManagerMockTrait;
+
     /** @var PermissionProvider */
     private $sut;
 
@@ -38,7 +41,7 @@ class PermissionProviderTest extends TestCase
     public function setUp(): void
     {
         $this->userPrivilegeRetriever = $this->createMock(RolePrivilegeRetriever::class);
-        $serviceLocator = $this->getServiceLocatorMock(
+        $serviceLocator = $this->getServiceManagerMock(
             [
                 DataBaseAccess::SERVICE_ID => $this->createMock(DataBaseAccess::class),
                 RolePrivilegeRetriever::class => $this->userPrivilegeRetriever,
diff --git a/test/unit/model/RolePrivilegeRetrieverTest.php b/test/unit/model/RolePrivilegeRetrieverTest.php
index ad8309b7..1f73b010 100644
--- a/test/unit/model/RolePrivilegeRetrieverTest.php
+++ b/test/unit/model/RolePrivilegeRetrieverTest.php
@@ -23,12 +23,15 @@
 
 namespace oat\taoDacSimple\test\unit\model;
 
-use oat\generis\test\TestCase;
+use oat\generis\test\ServiceManagerMockTrait;
+use PHPUnit\Framework\TestCase;
 use oat\taoDacSimple\model\DataBaseAccess;
 use oat\taoDacSimple\model\RolePrivilegeRetriever;
 
 class RolePrivilegeRetrieverTest extends TestCase
 {
+    use ServiceManagerMockTrait;
+
     /** @var RolePrivilegeRetriever */
     private $sut;
 
@@ -41,7 +44,7 @@ public function setUp(): void
 
         $this->sut = new RolePrivilegeRetriever();
         $this->sut->setServiceLocator(
-            $this->getServiceLocatorMock(
+            $this->getServiceManagerMock(
                 [
                     DataBaseAccess::SERVICE_ID => $this->databaseAccess
                 ]
diff --git a/test/unit/model/eventHandler/ResourceUpdateHandlerTest.php b/test/unit/model/eventHandler/ResourceUpdateHandlerTest.php
index d5112d79..59c04551 100644
--- a/test/unit/model/eventHandler/ResourceUpdateHandlerTest.php
+++ b/test/unit/model/eventHandler/ResourceUpdateHandlerTest.php
@@ -25,7 +25,8 @@
 use core_kernel_classes_Class;
 use core_kernel_classes_Resource;
 use oat\generis\test\MockObject;
-use oat\generis\test\TestCase;
+use oat\generis\test\ServiceManagerMockTrait;
+use PHPUnit\Framework\TestCase;
 use oat\tao\model\event\ResourceMovedEvent;
 use oat\taoDacSimple\model\eventHandler\ResourceUpdateHandler;
 use oat\taoDacSimple\model\PermissionsService;
@@ -34,6 +35,8 @@
 
 class ResourceUpdateHandlerTest extends TestCase
 {
+    use ServiceManagerMockTrait;
+
     /** @var RolePrivilegeRetriever|MockObject */
     private $rolePrivilegeRetriever;
 
@@ -70,7 +73,7 @@ public function setUp(): void
 
         $this->subject = new ResourceUpdateHandler();
         $this->subject->setServiceLocator(
-            $this->getServiceLocatorMock(
+            $this->getServiceManagerMock(
                 [
                     RolePrivilegeRetriever::class => $this->rolePrivilegeRetriever,
                     PermissionsServiceFactory::class => $this->permissionsServiceFactory

From 172cf934cb7874e37d3d8ef5f03ebfffbfb8712e Mon Sep 17 00:00:00 2001
From: Karol Stelmaczonek <karol.stelmaczonek@taotesting.com>
Date: Fri, 16 Dec 2022 16:20:01 +0100
Subject: [PATCH 2/2] fix: phpcbf fixed error : Header blocks must be separated
 by a single blank line

---
 test/unit/model/PermissionProviderTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/unit/model/PermissionProviderTest.php b/test/unit/model/PermissionProviderTest.php
index ad556e9d..8bab3249 100644
--- a/test/unit/model/PermissionProviderTest.php
+++ b/test/unit/model/PermissionProviderTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License