Inventory options tests and fixes

glpi-project · Oct 14, 2024 · 586e475 · 586e475
1 parent 27164d7
commit 586e475
Show file tree

Hide file tree

Showing 13 changed files with 1,042 additions and 92 deletions.
diff --git a/.phpstan-baseline.php b/.phpstan-baseline.php
@@ -2467,12 +2467,6 @@
 	'count' => 1,
 	'path' => __DIR__ . '/src/Inventory/Asset/MainAsset.php',
 ];
-$ignoreErrors[] = [
-	// identifier: property.onlyWritten
-	'message' => '#^Property Glpi\\\\Inventory\\\\Asset\\\\Monitor\\:\\:\\$import_monitor_on_partial_sn is never read, only written\\.$#',
-	'count' => 1,
-	'path' => __DIR__ . '/src/Inventory/Asset/Monitor.php',
-];
 $ignoreErrors[] = [
 	// identifier: property.notFound
 	'message' => '#^Access to an undefined property object\\:\\:\\$instantiation_type\\.$#',

diff --git a/phpunit/functional/Glpi/Inventory/Assets/DriveTest.php b/phpunit/functional/Glpi/Inventory/Assets/DriveTest.php
@@ -101,6 +101,7 @@ public function testPrepare($xml, $expected)
         $computer = getItemByTypeName('Computer', '_test_pc01');
         $asset = new \Glpi\Inventory\Asset\Drive($computer, $json->content->storages);
         $asset->setExtraData((array)$json->content);
+        $this->assertTrue($asset->checkConf(new \Glpi\Inventory\Conf()));
         $result = $asset->prepare();
 
         if (!$asset->isDrive($json->content->storages[0])) {
@@ -138,6 +139,7 @@ public function testHandle()
         $computer = getItemByTypeName('Computer', '_test_pc01');
         $asset = new \Glpi\Inventory\Asset\Drive($computer, $json->content->storages);
         $asset->setExtraData((array)$json->content);
+        $this->assertTrue($asset->checkConf(new \Glpi\Inventory\Conf()));
         $result = $asset->prepare();
         //is a harddrive
         $this->assertIsArray($result);

diff --git a/phpunit/functional/Glpi/Inventory/Assets/PrinterTest.php b/phpunit/functional/Glpi/Inventory/Assets/PrinterTest.php
@@ -86,6 +86,8 @@ public function testPrepare($xml, $expected)
 
         $computer = getItemByTypeName('Computer', '_test_pc01');
         $asset = new \Glpi\Inventory\Asset\Printer($computer, $json->content->printers);
+        $conf = new \Glpi\Inventory\Conf();
+        $this->assertTrue($asset->checkConf($conf));
         $asset->setExtraData((array)$json->content);
         $result = $asset->prepare();
         $this->assertEquals(json_decode($expected), $result[0]);

diff --git a/phpunit/functional/Glpi/Inventory/Assets/UnmanagedTest.php b/phpunit/functional/Glpi/Inventory/Assets/UnmanagedTest.php
@@ -691,8 +691,7 @@ public function testState()
         $this->assertSame($inv_states_id, $computer->fields['states_id']);
 
         //run discovery
-        $xml_source = '
-        <?xml version="1.0" encoding="UTF-8" ?>
+        $xml_source = '<?xml version="1.0" encoding="UTF-8" ?>
 <REQUEST>
   <CONTENT>
     <DEVICE>