Switch to phpunit (part 2)

glpi-project · Jul 4, 2024 · ebf789a · ebf789a
1 parent 14148d5
commit ebf789a
Show file tree

Hide file tree

Showing 66 changed files with 4,511 additions and 4,240 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,5 +8,8 @@
        <directory suffix=".php">phpunit/functional/</directory>
     </testsuite>
   </testsuites>
+  <php>
+    <ini name="memory_limit" value="256M" />
+  </php>
 </phpunit>
 
diff --git a/phpunit/DbTestCase.php b/phpunit/DbTestCase.php
@@ -150,7 +150,7 @@ protected function getClasses($function = false, array $excludes = [])
         $excludes = array_merge(
             $excludes,
             [
-                'TicketFollowup', // Deprecated
+                '/^TicketFollowup$/', // Deprecated
                 '/^RuleImportComputer.*/', // Deprecated
             ]
         );

diff --git a/phpunit/GLPITestCase.php b/phpunit/GLPITestCase.php
@@ -35,6 +35,7 @@
 
 use Glpi\Tests\Log\TestHandler;
 use Monolog\Logger;
+use org\bovigo\vfs\vfsStreamWrapper;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LogLevel;
 
@@ -72,10 +73,14 @@ public function setUp(): void
         $PHPLOGGER->setHandlers([$this->php_log_handler]);
         $this->sql_log_handler = new TestHandler(LogLevel::DEBUG);
         $SQLLOGGER->setHandlers([$this->sql_log_handler]);
+
+        vfsStreamWrapper::register();
     }
 
     public function tearDown(): void
     {
+        vfsStreamWrapper::unregister();
+
         if (isset($_SESSION['MESSAGE_AFTER_REDIRECT']) && !$this->has_failed) {
             unset($_SESSION['MESSAGE_AFTER_REDIRECT'][INFO]);
             $this->assertSame(

diff --git a/phpunit/bootstrap.php b/phpunit/bootstrap.php
@@ -97,7 +97,7 @@
 include_once __DIR__ . '/InventoryTestCase.php';
 //include_once __DIR__ . '/functional/CommonITILRecurrent.php';
 //include_once __DIR__ . '/functional/Glpi/ContentTemplates/Parameters/AbstractParameters.php';
-//include_once __DIR__ . '/functional/AbstractRightsDropdown.php';
+include_once __DIR__ . '/functional/AbstractRightsDropdown.php';
 
 // check folder exists instead of class_exists('\GuzzleHttp\Client'), to prevent global includes
 if (file_exists(__DIR__ . '/../vendor/autoload.php') && !file_exists(__DIR__ . '/../vendor/guzzlehttp/guzzle')) {

diff --git a/tests/functional/AbstractRightsDropdown.php → ...nit/functional/AbstractRightsDropdown.php b/tests/functional/AbstractRightsDropdown.php → ...nit/functional/AbstractRightsDropdown.php
@@ -44,7 +44,7 @@
 
 abstract class AbstractRightsDropdown extends \GLPITestCase
 {
-    protected function testGetPostedIdsProvider(): Generator
+    public static function getPostedIdsProvider(): Generator
     {
         $flat_values_set = [
             'users_id-3',
@@ -91,14 +91,14 @@ protected function testGetPostedIdsProvider(): Generator
     }
 
     /**
-     * @dataprovider testGetPostedIdsProvider
+     * @dataProvider getPostedIdsProvider
      */
     public function testGetPostedIds(
         array $values,
         string $class,
         array $expected_ids
     ): void {
         $ids = \AbstractRightsDropdown::getPostedIds($values, $class);
-        $this->array($ids)->isEqualTo($expected_ids);
+        $this->assertSame($expected_ids, $ids);
     }
 }