{% if not usage_impact.isNewItem() or usage_carbon_emission_count > 0 %}
- {% set reset_args = "{_glpi_csrf_token: '" ~ csrf_token() ~ "', reset: '', itemtype: '" ~ asset.getType() ~ "', items_id: '" ~ asset.getID() ~ "'}" %}
+ {% set reset_args = "{reset: '', itemtype: '" ~ asset.getType() ~ "', items_id: '" ~ asset.getID() ~ "'}" %}
{{ __('Reset data', 'carbon') }}
{% endif %}
- {% set calculate_args = "{_glpi_csrf_token: '" ~ csrf_token() ~ "', calculate: '', itemtype: '" ~ asset.getType() ~ "', items_id: '" ~ asset.getID() ~ "'}" %}
+ {% set calculate_args = "{calculate: '', itemtype: '" ~ asset.getType() ~ "', items_id: '" ~ asset.getID() ~ "'}" %}
{{ __('Calculate data', 'carbon') }}
@@ -96,10 +102,10 @@
{% if not embodied_impact.isNewItem() %}
- {% set reset_args = "{_glpi_csrf_token: '" ~ csrf_token() ~ "', reset: '', id: '" ~ embodied_impact.getID() ~ "'}" %}
+ {% set reset_args = "{reset: '', id: '" ~ embodied_impact.getID() ~ "'}" %}
{{ __('Reset data', 'carbon') }}
{% endif %}
- {% set calculate_args = "{_glpi_csrf_token: '" ~ csrf_token() ~ "', calculate: '', itemtype: '" ~ asset.getType() ~ "', items_id: '" ~ asset.getID() ~ "'}" %}
+ {% set calculate_args = "{calculate: '', itemtype: '" ~ asset.getType() ~ "', items_id: '" ~ asset.getID() ~ "'}" %}
{{ __('Calculate data', 'carbon') }}
diff --git a/templates/history/status-item.html.twig b/templates/history/status-item.html.twig
index 8031a6a2..aef066f1 100644
--- a/templates/history/status-item.html.twig
+++ b/templates/history/status-item.html.twig
@@ -134,6 +134,8 @@
{% set field = nok_field %}
{% if status.has_model %}
{% set field = ok_field %}
+ {% elseif status.has_type is defined and status.has_type %}
+ {% set field = warning_field %}
{% endif %}
{{ fields.field('', field, __('The asset has a model', 'carbon')) }}
{% endif %}
@@ -153,10 +155,8 @@
{% if status.has_type is defined %}
{% set field = nok_field %}
- {% if status.has_model is defined %}
- {% if status.has_model %}
- {% set field = warning_field %}
- {% endif %}
+ {% if status.has_model is defined and status.has_model%}
+ {% set field = warning_field %}
{% endif %}
{% if status.has_type %}
{% set field = ok_field %}
@@ -193,6 +193,14 @@
{{ fields.field('', field, __('The asset has a category', 'carbon')) }}
{% endif %}
+ {% if status.is_category_not_cloud is defined %}
+ {% set field = nok_field %}
+ {% if status.is_category_not_cloud %}
+ {% set field = ok_field %}
+ {% endif %}
+ {{ fields.field('', field, __('The asset is not in a cloud', 'carbon')) }}
+ {% endif %}
+
{% if status.has_usage_profile is defined %}
{% set field = nok_field %}
{% if status.has_usage_profile %}
diff --git a/tests/fixtures/FakeDataSources.php b/tests/fixtures/FakeDataSources.php
index d931c1f1..35274023 100644
--- a/tests/fixtures/FakeDataSources.php
+++ b/tests/fixtures/FakeDataSources.php
@@ -32,6 +32,8 @@
namespace GlpiPlugin\Carbon\DataSource\CarbonIntensity\Foo;
+use CommonDBTM;
+use CommonGLPI;
use GlpiPlugin\Carbon\DataSource\CronTaskInterface;
class CronTask implements CronTaskInterface
@@ -40,10 +42,22 @@ public static function enumerateTasks(): array
{
return [];
}
+
+ public function getTabNameForItem(CommonGLPI $item, $withtemplate = 0)
+ {
+ return 'Foo';
+ }
+
+ public function showForCronTask(CommonDBTM $item)
+ {
+ return true;
+ }
}
namespace GlpiPlugin\Carbon\DataSource\Lca\Bar;
+use CommonDBTM;
+use CommonGLPI;
use GlpiPlugin\Carbon\DataSource\CronTaskInterface;
class CronTask implements CronTaskInterface
@@ -52,10 +66,22 @@ public static function enumerateTasks(): array
{
return [];
}
+
+ public function getTabNameForItem(CommonGLPI $item, $withtemplate = 0)
+ {
+ return 'Bar';
+ }
+
+ public function showForCronTask(CommonDBTM $item)
+ {
+ return true;
+ }
}
namespace GlpiPlugin\Carbon\DataSource\Lca\Baz;
+use CommonDBTM;
+use CommonGLPI;
use GlpiPlugin\Carbon\DataSource\CronTaskInterface;
class CronTask implements CronTaskInterface
@@ -64,4 +90,14 @@ public static function enumerateTasks(): array
{
return [];
}
+
+ public function getTabNameForItem(CommonGLPI $item, $withtemplate = 0)
+ {
+ return 'Baz';
+ }
+
+ public function showForCronTask(CommonDBTM $item)
+ {
+ return true;
+ }
}
diff --git a/tests/install/PluginInstallTest.php b/tests/install/PluginInstallTest.php
index c6a40cea..3d4a0401 100644
--- a/tests/install/PluginInstallTest.php
+++ b/tests/install/PluginInstallTest.php
@@ -67,7 +67,6 @@
use NetworkEquipmentModel;
use NetworkEquipmentType;
use PHPUnit\Framework\Attributes\CoversClass;
-use PHPUnit\Framework\Attributes\CoversNothing;
use PHPUnit\Framework\Attributes\Depends;
use Plugin;
use Profile;
@@ -170,7 +169,6 @@ public function testInstallPlugin()
$this->checkRegisteredClasses();
}
- #[CoversNothing()]
public function testConfigurationExists()
{
$config = Config::getConfigurationValues(TEST_PLUGIN_NAME);
@@ -181,7 +179,6 @@ public function testConfigurationExists()
return $config;
}
- #[CoversNothing()]
private function checkSchema(
string $version,
bool $strict = true,
@@ -610,6 +607,10 @@ public function test_dashboard_is_configured()
}
}
+ /**
+ * Summary of zones
+ * @var array
+ */
private $zones = [
'Afghanistan',
'Albania',
@@ -939,7 +940,6 @@ public function checkRegisteredClasses()
$this->assertEquals($expected, $result);
}
- #[CoversNothing()]
#[Depends('testInstallPlugin')]
public function test_version_is_consistent_across_files()
{
@@ -982,7 +982,6 @@ public function test_version_is_consistent_across_files()
$this->assertStringContainsString($setup_version, $supported_versions_table, "Current version '$setup_version' not found in Supported Versions table in SECURITY.md");
}
- #[CoversNothing()]
#[Depends('testInstallPlugin')]
public function test_tagged_version_is_declared_in_plugin_xml()
{
diff --git a/tests/migration/migration_to_1_2_0_Test.php b/tests/migration/migration_to_1_2_0_Test.php
index b2af6b9f..ab29691d 100644
--- a/tests/migration/migration_to_1_2_0_Test.php
+++ b/tests/migration/migration_to_1_2_0_Test.php
@@ -38,7 +38,6 @@
use GlpiPlugin\Carbon\Uninstall;
use Location as GlpiLocation;
use Migration;
-use PHPUnit\Framework\Attributes\CoversNothing;
use Plugin;
class migration_to_1_2_0_Test extends CommonTestCase
@@ -60,7 +59,6 @@ public function setUp(): void
$success = $DB->runFile(realpath($sql_file));
}
- #[CoversNothing]
public function testUpdateCountryLocationZoneRelation()
{
/** @var DBmysql $DB */
@@ -110,7 +108,6 @@ public function testUpdateCountryLocationZoneRelation()
$this->assertEquals($expected, $result->current());
}
- #[CoversNothing]
public function testUpdateStateLocationZoneRelation()
{
/** @var DBmysql $DB */
@@ -159,7 +156,6 @@ public function testUpdateStateLocationZoneRelation()
$this->assertEquals($expected, $result->current());
}
- #[CoversNothing]
public function testTimeformatInUsageProfile()
{
global $DB;
diff --git a/tests/src/CommonTestCase.php b/tests/src/CommonTestCase.php
index 35abfb7a..97d2e182 100644
--- a/tests/src/CommonTestCase.php
+++ b/tests/src/CommonTestCase.php
@@ -64,7 +64,7 @@ class CommonTestCase extends TestCase
/** @var int $debugMode save state of GLPI debug mode */
private $debugMode = null;
- protected $str = null;
+ protected ?string $str = null;
protected function disableDebug()
{
@@ -115,7 +115,7 @@ protected function setupGLPIFramework(): void
return;
}
- protected function login($name, $password, $noauto = false)
+ protected function login(string $name, string $password, $noauto = false)
{
Session::start();
$auth = new Auth();
@@ -539,7 +539,7 @@ protected function isolateInEntity(): int
*
* @return mixed
*/
- protected function callPrivateMethod($instance, string $methodName, ...$args)
+ protected function callPrivateMethod($instance, string $methodName, mixed ...$args)
{
$method = new ReflectionMethod($instance, $methodName);
if (version_compare(PHP_VERSION, '8.1.0') < 0) {
diff --git a/tests/units/CarbonEmissionTest.php b/tests/units/CarbonEmissionTest.php
index 84ad9d3c..50369df5 100644
--- a/tests/units/CarbonEmissionTest.php
+++ b/tests/units/CarbonEmissionTest.php
@@ -209,7 +209,7 @@ public function test_truncate_fails_when_not_logged_in()
$this->assertEquals(1, countElementsInTable($table));
}
- public function test_truncate_fails_when_user_has_all_required_rights()
+ public function test_truncate_succeeds_when_user_has_all_required_rights()
{
/** @var DBmysql $DB */
global $DB;
diff --git a/tests/units/CarbonIntensityTest.php b/tests/units/CarbonIntensityTest.php
index 932014d5..16081814 100644
--- a/tests/units/CarbonIntensityTest.php
+++ b/tests/units/CarbonIntensityTest.php
@@ -33,8 +33,6 @@
namespace GlpiPlugin\Carbon\Tests;
use Computer;
-use DateTime;
-use DateTimeImmutable;
use DateTimeInterface;
use DBmysql;
use GlpiPlugin\Carbon\CarbonIntensity;
@@ -44,6 +42,8 @@
use GlpiPlugin\Carbon\Zone;
use Infocom;
use PHPUnit\Framework\Attributes\CoversClass;
+use Safe\DateTime;
+use Safe\DateTimeImmutable;
use Symfony\Component\Console\Helper\ProgressBar;
use Symfony\Component\Console\Output\Output;
@@ -299,9 +299,7 @@ public function testGetDownloadStartDate()
{
$instance = new CarbonIntensity();
- $data_source = $this->getMockBuilder(AbstractClient::class)
- ->getMock();
- $result = $instance->getDownloadStartDate('foo', $data_source);
+ $result = $instance->getDownloadStartDate();
$expected = (new DateTime('13 months ago'))->setTime(0, 0, 0); // CarbonIntensity::MIN_HISTORY_LENGTH
$this->assertEquals($expected, $result);
@@ -312,7 +310,7 @@ public function testGetDownloadStartDate()
'buy_date' => '2022-02-01',
]);
- $result = $instance->getDownloadStartDate('foo', $data_source);
+ $result = $instance->getDownloadStartDate();
$expected = (new DateTime('2022-02-01'))->setTime(0, 0, 0); // CarbonIntensity::MIN_HISTORY_LENGTH
$this->assertEquals($expected, $result);
}
@@ -366,8 +364,7 @@ public function testDownloadOneZone()
$zone::getForeignKeyField() => $zone->getID(),
]);
- $data_source = $this->getMockBuilder(AbstractClient::class)
- ->getMock();
+ $data_source = $this->createStub(AbstractClient::class);
$hours = null;
$data_source->method('fullDownload')->willReturnCallback(
function ($zone_name, $gap_start, $gap_end, $carbon_intensity, $limit, $progress_bar) use (&$hours) {
@@ -379,8 +376,7 @@ function ($zone_name, $gap_start, $gap_end, $carbon_intensity, $limit, $progress
$data_source->method('getHardStartDate')->willReturn(
DateTimeImmutable::createFromFormat(DateTimeInterface::ATOM, '2021-01-01T00:00:00+00:00'),
);
- $output = $this->getMockBuilder(Output::class)
- ->getMock();
+ $output = $this->createStub(Output::class);
$progress_bar = new ProgressBar($output);
$instance = new CarbonIntensity();
diff --git a/tests/units/Command/ImportDashboardCommandTest.php b/tests/units/Command/ImportDashboardCommandTest.php
index 76174746..104ce551 100644
--- a/tests/units/Command/ImportDashboardCommandTest.php
+++ b/tests/units/Command/ImportDashboardCommandTest.php
@@ -133,7 +133,7 @@ public function test_import_dashboard_command()
$this->fail("Failed to get dashboard item with id {$row['id']}");
}
$item_fields = array_filter($item->fields, function ($key) {
- return !in_array($key, ['id', 'dashboards_dashboards_id']);
+ return !in_array($key, ['id', 'dashboards_dashboards_id', 'date_creation', 'date_mod']);
}, ARRAY_FILTER_USE_KEY);
$item_fields['card_options'] = json_decode($item_fields['card_options'], true);
$found = false;
diff --git a/tests/units/ComputerTypeTest.php b/tests/units/ComputerTypeTest.php
index 89db56c3..fd619a90 100644
--- a/tests/units/ComputerTypeTest.php
+++ b/tests/units/ComputerTypeTest.php
@@ -44,16 +44,21 @@ class ComputerTypeTest extends AbstractTypeTest
protected static string $glpi_type_itemtype = GlpiComputerType::class;
protected static string $type_itemtype = ComputerType::class;
- public function testGetTabNameForItem()
+ public function test_GetTabNameForItem_returns_empty_string_for_computer()
+ {
+ $glpi_computer_type = $this->createItem(GlpiComputerType::class);
+ $instance = new ComputerType();
+ $result = $instance->getTabNameForItem($glpi_computer_type, 1);
+ $this->assertEquals('', $result);
+ }
+
+ public function test_GetTabNameForItem_returns_tab_name_for_computer_type()
{
$glpi_computer_type = $this->createItem(GlpiComputerType::class);
$instance = new ComputerType();
$result = $instance->getTabNameForItem($glpi_computer_type);
$crawler = new Crawler($result);
$this->assertEquals('Carbon', $crawler->text());
-
- $result = $instance->getTabNameForItem($glpi_computer_type, 1);
- $this->assertEquals('', $result);
}
public function testShowForItemType()
@@ -124,9 +129,7 @@ public function testUpdateCategory()
public function testShowMassiveActionsSubForm()
{
// Test power consumption update form
- $massive_action = $this->getMockBuilder(MassiveAction::class)
- ->disableOriginalConstructor()
- ->getMock();
+ $massive_action = $this->createStub(MassiveAction::class);
$massive_action->method('getAction')->willReturn('MassUpdatePower');
$massive_action->method('getItems')->willReturn([
ComputerType::class => $this->createItem(GlpiComputerType::class),
@@ -153,9 +156,7 @@ public function testShowMassiveActionsSubForm()
$this->assertTrue($result);
// Test category update form
- $massive_action = $this->getMockBuilder(MassiveAction::class)
- ->disableOriginalConstructor()
- ->getMock();
+ $massive_action = $this->createStub(MassiveAction::class);
$massive_action->method('getAction')->willReturn('MassUpdateCategory');
$massive_action->method('getItems')->willReturn([
ComputerType::class => $this->createItem(GlpiComputerType::class),
@@ -181,9 +182,7 @@ public function testShowMassiveActionsSubForm()
$this->assertTrue($result);
// Test invalid action
- $massive_action = $this->getMockBuilder(MassiveAction::class)
- ->disableOriginalConstructor()
- ->getMock();
+ $massive_action = $this->createStub(MassiveAction::class);
$massive_action->method('getAction')->willReturn('');
$massive_action->method('getItems')->willReturn([
ComputerType::class => $this->createItem(GlpiComputerType::class),
@@ -200,9 +199,7 @@ public function testShowMassiveActionsSubForm()
public function testProcessMassiveActionForOneItemtype()
{
// Test create power consumption
- $massive_action = $this->getMockBuilder(MassiveAction::class)
- ->disableOriginalConstructor()
- ->getMock();
+ $massive_action = $this->createStub(MassiveAction::class);
$massive_action->method('getAction')->willReturn('MassUpdatePower');
$glpi_computer_type = $this->createItem(GlpiComputerType::class);
$massive_action->POST = [
@@ -222,9 +219,7 @@ public function testProcessMassiveActionForOneItemtype()
$this->assertEquals(25, $computer_type->fields['power_consumption']);
// Test update category
- $massive_action = $this->getMockBuilder(MassiveAction::class)
- ->disableOriginalConstructor()
- ->getMock();
+ $massive_action = $this->createStub(MassiveAction::class);
$massive_action->method('getAction')->willReturn('MassUpdateCategory');
$glpi_computer_type = $this->createItem(GlpiComputerType::class);
$massive_action->POST = [
diff --git a/tests/units/ComputerUsageProfileTest.php b/tests/units/ComputerUsageProfileTest.php
index b63e38a4..cd4a7503 100644
--- a/tests/units/ComputerUsageProfileTest.php
+++ b/tests/units/ComputerUsageProfileTest.php
@@ -180,9 +180,7 @@ public function testAssignToItem()
public function testShowMassiveActionsSubForm()
{
// Test power consumption update form
- $massive_action = $this->getMockBuilder(MassiveAction::class)
- ->disableOriginalConstructor()
- ->getMock();
+ $massive_action = $this->createStub(MassiveAction::class);
$massive_action->method('getAction')->willReturn('MassAssociateItems');
$massive_action->method('getItems')->willReturn([
GlpiComputer::class => $this->createItem(GlpiComputer::class),
diff --git a/tests/units/ConfigTest.php b/tests/units/ConfigTest.php
index 5f0c5d25..7917a72b 100644
--- a/tests/units/ConfigTest.php
+++ b/tests/units/ConfigTest.php
@@ -56,14 +56,20 @@ public function testGetTypeName()
$this->assertEquals('Environmental Impact', $result);
}
- public function testGetTabNameForItem()
+ public function test_GetTabNameForItem_returns_empty_string_for_computer()
{
$instance = new Config();
$result = $instance->getTabNameForItem(new GlpiComputer());
$this->assertEquals('', $result);
+ }
+
+ public function test_GetTabNameForItem_returns_tab_name_for_config()
+ {
+ $instance = new Config();
$result = $instance->getTabNameForItem(new GlpiConfig());
- $this->assertEquals('Environmental Impact', $result);
+ $crawler = new Crawler($result);
+ $this->assertEquals('Environmental Impact', $crawler->text());
}
public function testDisplayTabContentForItem()
@@ -99,10 +105,8 @@ public function testShowForm()
$crawler = new Crawler($output);
$config_class = $crawler->filter('input[type="hidden"][name="config_class"]');
$config_context = $crawler->filter('input[type="hidden"][name="config_context"]');
- $csrf = $crawler->filter('input[type="hidden"][name="_glpi_csrf_token"]');
$this->assertEquals(1, $config_class->count());
$this->assertEquals(1, $config_context->count());
- $this->assertEquals(1, $csrf->count());
$electricitymaps_api = $crawler->filter('input[name="electricitymap_api_key"]');
$impact_engine = $crawler->filter('select[name="impact_engine"]');
$this->assertEquals(1, $electricitymaps_api->count());
diff --git a/tests/units/DataSource/CarbonIntensity/AbstractClientTest.php b/tests/units/DataSource/CarbonIntensity/AbstractClientTest.php
index 2ffe9ca7..d0598d9a 100644
--- a/tests/units/DataSource/CarbonIntensity/AbstractClientTest.php
+++ b/tests/units/DataSource/CarbonIntensity/AbstractClientTest.php
@@ -32,10 +32,10 @@
namespace GlpiPlugin\Carbon\DataSource\CarbonIntensity\Tests;
-use DateTimeImmutable;
use GlpiPlugin\Carbon\DataSource\CarbonIntensity\AbstractClient;
use GlpiPlugin\Carbon\Tests\DbTestCase;
use PHPUnit\Framework\Attributes\CoversClass;
+use Safe\DateTimeImmutable;
#[CoversClass(AbstractClient::class)]
class AbstractClientTest extends DbTestCase
@@ -126,7 +126,7 @@ public function testSliceDateRangeByMonth()
{
foreach ($this->sliceDateRangeByMonthProvider() as $data) {
[$start, $stop, $expected] = $data;
- $stub = $this->getMockBuilder(AbstractClient::class)->getMock();
+ $stub = $this->createStub(AbstractClient::class);
$output = $this->callPrivateMethod($stub, 'sliceDateRangeByMonth', $start, $stop);
if (count($expected) === 0) {
@@ -175,7 +175,7 @@ public function testSliceDateRangeByDay()
{
foreach ($this->sliceDateRangeByDayProvider() as $data) {
[$start, $stop, $expected] = $data;
- $stub = $this->getMockBuilder(AbstractClient::class)->getMock();
+ $stub = $this->createStub(AbstractClient::class);
$output = $this->callPrivateMethod($stub, 'sliceDateRangeByDay', $start, $stop);
if (count($expected) === 0) {
diff --git a/tests/units/DataSource/CarbonIntensity/ElectricityMaps/ClientTest.php b/tests/units/DataSource/CarbonIntensity/ElectricityMaps/ClientTest.php
index 2c79a293..59496c87 100644
--- a/tests/units/DataSource/CarbonIntensity/ElectricityMaps/ClientTest.php
+++ b/tests/units/DataSource/CarbonIntensity/ElectricityMaps/ClientTest.php
@@ -34,7 +34,6 @@
use DateInterval;
use DateTime;
-use DateTimeImmutable;
use DateTimeInterface;
use GlpiPlugin\Carbon\DataSource\RestApiClientInterface;
use GlpiPlugin\Carbon\Source;
@@ -42,6 +41,7 @@
use GlpiPlugin\Carbon\Tests\DbTestCase;
use GlpiPlugin\Carbon\Zone;
use PHPUnit\Framework\Attributes\CoversClass;
+use Safe\DateTimeImmutable;
#[CoversClass(Client::class)]
class ClientTest extends DbTestCase
diff --git a/tests/units/DataSource/CarbonIntensity/ElectricityMaps/ConfigTest.php b/tests/units/DataSource/CarbonIntensity/ElectricityMaps/ConfigTest.php
index da22ef07..034a2347 100644
--- a/tests/units/DataSource/CarbonIntensity/ElectricityMaps/ConfigTest.php
+++ b/tests/units/DataSource/CarbonIntensity/ElectricityMaps/ConfigTest.php
@@ -99,10 +99,6 @@ public function testConfigUpdate(array $input, array $expected)
/** @var array $CFG_GLPI */
global $CFG_GLPI;
- $CFG_GLPI['plugi:carbon']['lca_datasources'] = [
- Client::class,
- ];
-
$instance = new Config();
$result = $instance->configUpdate($input);
$this->assertEquals($expected, $result);
diff --git a/tests/units/DataSource/CarbonIntensity/Rte/ClientTest.php b/tests/units/DataSource/CarbonIntensity/Rte/ClientTest.php
index 477e9c64..4283aebe 100644
--- a/tests/units/DataSource/CarbonIntensity/Rte/ClientTest.php
+++ b/tests/units/DataSource/CarbonIntensity/Rte/ClientTest.php
@@ -33,7 +33,6 @@
namespace GlpiPlugin\Carbon\DataSource\CarbonIntensity\Rte;
use DateTime;
-use DateTimeImmutable;
use GlpiPlugin\Carbon\CarbonIntensity;
use GlpiPlugin\Carbon\DataSource\RestApiClientInterface;
use GlpiPlugin\Carbon\Source;
@@ -41,6 +40,7 @@
use GlpiPlugin\Carbon\Tests\DbTestCase;
use GlpiPlugin\Carbon\Zone;
use PHPUnit\Framework\Attributes\CoversClass;
+use Safe\DateTimeImmutable;
#[CoversClass(Client::class)]
class ClientTest extends DbTestCase
diff --git a/tests/units/DataSource/CronTaskProviderTest.php b/tests/units/DataSource/CronTaskProviderTest.php
index 35ae0f38..0d186048 100644
--- a/tests/units/DataSource/CronTaskProviderTest.php
+++ b/tests/units/DataSource/CronTaskProviderTest.php
@@ -37,22 +37,55 @@
require_once dirname(__DIR__, 2) . '/fixtures/FakeDataSources.php';
-// Redefine glob() in the namespace context to mock
-function glob($pattern, $flags = 0)
-{
- return [
- '/var/www/glpi/plugins/carbon/src/DataSource/Carbonintensity/Foo',
- '/var/www/glpi/plugins/carbon/src/DataSource/Lca/Bar',
- '/var/www/glpi/plugins/carbon/src/DataSource/Lca/Baz',
- ];
-}
-
#[CoversClass(CronTaskProvider::class)]
class CronTaskProviderTest extends CommonTestCase
{
public function test_getCronTaskTypes_returns_()
{
- $result = CronTaskProvider::getCronTaskTypes();
+ $stub_carbon_intensity_dir = $this->createStub(\DirectoryIterator::class);
+ $stub_carbon_intensity_dir->method('getBasename')->willReturn('CarbonIntensity');
+ $foo_item = $this->createStub(\DirectoryIterator::class);
+ $foo_item->method('isDot')->willReturn(false);
+ $foo_item->method('isDir')->willReturn(true);
+ $foo_item->method('getBasename')->willReturn('Foo');
+ $foo_item->method('getPathName')->willReturn('/path/to/CarbonIntensity/Foo');
+ $internal_iterator = new \ArrayIterator([
+ $foo_item,
+ ]);
+ $stub_carbon_intensity_dir->method('rewind')->willReturnCallback(fn() => $internal_iterator->rewind());
+ $stub_carbon_intensity_dir->method('valid')->willReturnCallback(fn() => $internal_iterator->valid());
+ $stub_carbon_intensity_dir->method('current')->willReturnCallback(fn() => $internal_iterator->current());
+ $stub_carbon_intensity_dir->method('key')->willReturnCallback(fn() => $internal_iterator->key());
+ $stub_carbon_intensity_dir->method('next')->willReturnCallback(fn() => $internal_iterator->next());
+
+ $stub_lca_dir = $this->createStub(\DirectoryIterator::class);
+ $stub_lca_dir->method('getBasename')->willReturn('Lca');
+ $bar_item = $this->createStub(\DirectoryIterator::class);
+ $bar_item->method('isDot')->willReturn(false);
+ $bar_item->method('isDir')->willReturn(true);
+ $bar_item->method('getBasename')->willReturn('Bar');
+ $bar_item->method('getPathName')->willReturn('/path/to/Lca/Bar');
+ $baz_item = $this->createStub(\DirectoryIterator::class);
+ $baz_item->method('isDot')->willReturn(false);
+ $baz_item->method('isDir')->willReturn(true);
+ $baz_item->method('getBasename')->willReturn('Baz');
+ $baz_item->method('getPathName')->willReturn('/path/to/Lca/Baz');
+ $internal_iterator_lca = new \ArrayIterator([
+ $bar_item,
+ $baz_item,
+ ]);
+ $stub_lca_dir->method('rewind')->willReturnCallback(fn() => $internal_iterator_lca->rewind());
+ $stub_lca_dir->method('valid')->willReturnCallback(fn() => $internal_iterator_lca->valid());
+ $stub_lca_dir->method('current')->willReturnCallback(fn() => $internal_iterator_lca->current());
+ $stub_lca_dir->method('key')->willReturnCallback(fn() => $internal_iterator_lca->key());
+ $stub_lca_dir->method('next')->willReturnCallback(fn() => $internal_iterator_lca->next());
+
+ $dirs = [
+ $stub_carbon_intensity_dir,
+ $stub_lca_dir,
+ ];
+
+ $result = CronTaskProvider::getCronTaskTypes($dirs);
$expected = [
'Foo' => 'GlpiPlugin\\Carbon\\DataSource\\CarbonIntensity\\Foo\\CronTask',
'Bar' => 'GlpiPlugin\\Carbon\\DataSource\\Lca\\Bar\\CronTask',
diff --git a/tests/units/DataSource/Lca/Boaviztapi/ConfigTest.php b/tests/units/DataSource/Lca/Boaviztapi/ConfigTest.php
index 7f5249e1..ef3a40b7 100644
--- a/tests/units/DataSource/Lca/Boaviztapi/ConfigTest.php
+++ b/tests/units/DataSource/Lca/Boaviztapi/ConfigTest.php
@@ -124,10 +124,6 @@ public function testConfigUpdate(array $input, array $expected)
/** @var array $CFG_GLPI */
global $CFG_GLPI;
- $CFG_GLPI['plugi:carbon']['lca_datasources'] = [
- Client::class,
- ];
-
$result = (new Config())->configUpdate($input);
$this->assertEquals($expected, $result);
}
diff --git a/tests/units/HookTest.php b/tests/units/HookTest.php
index cb5b2ffd..ae6e5877 100644
--- a/tests/units/HookTest.php
+++ b/tests/units/HookTest.php
@@ -103,7 +103,7 @@ public function testCarbonAssetTypeIsPurgedOnAssetTypePurge()
'computertypes_id' => $computer_type->getID(),
]);
- $computer_type->delete($computer_type->fields, 1);
+ $computer_type->delete($computer_type->fields, true);
$count = (new DbUtils())->countElementsInTable($carbon_computer_type::getTable(), [
'computertypes_id' => $computer_type->getID(),
]);
diff --git a/tests/units/Impact/History/ComputerTest.php b/tests/units/Impact/History/ComputerTest.php
index 260850e2..1a4cebe0 100644
--- a/tests/units/Impact/History/ComputerTest.php
+++ b/tests/units/Impact/History/ComputerTest.php
@@ -36,7 +36,7 @@
use Computer as GlpiComputer;
use ComputerModel as GlpiComputerModel;
use ComputerType as GlpiComputerType;
-use DateTime;
+use DBmysql;
use GlpiPlugin\Carbon\CarbonEmission;
use GlpiPlugin\Carbon\ComputerModel;
use GlpiPlugin\Carbon\ComputerType;
@@ -51,6 +51,7 @@
use Infocom;
use Location as GlpiLocation;
use PHPUnit\Framework\Attributes\CoversClass;
+use Safe\DateTime;
#[CoversClass(Computer::class)]
class ComputerTest extends CommonAsset
@@ -153,7 +154,7 @@ public function testEvaluateItem()
}
$this->login('glpi', 'glpi');
- $entities_id = $this->isolateInEntity('glpi', 'glpi');
+ $entities_id = $this->isolateInEntity();
$model_power = 55;
$glpi_location = $this->createItem(GlpiLocation::class, [
@@ -290,6 +291,7 @@ public function test_getHistorizableDiagnosis_when_computer_is_historizable()
'has_usage_profile' => true,
'has_location' => true,
'has_category' => true,
+ 'is__category_not_cloud' => true,
'has_carbon_intensity_zone' => true,
'has_model' => true,
'has_model_power_consumption' => true,
@@ -328,6 +330,7 @@ public function test_getHistorizableDiagnosis_when_computer_is_deleted()
'has_usage_profile' => true,
'has_location' => true,
'has_category' => true,
+ 'is__category_not_cloud' => true,
'has_carbon_intensity_zone' => true,
'has_model' => true,
'has_model_power_consumption' => true,
@@ -366,6 +369,7 @@ public function test_getHistorizableDiagnosis_when_computer_is_template()
'has_usage_profile' => true,
'has_location' => true,
'has_category' => true,
+ 'is__category_not_cloud' => true,
'has_carbon_intensity_zone' => true,
'has_model' => true,
'has_model_power_consumption' => true,
@@ -404,6 +408,7 @@ public function test_getHistorizableDiagnosis_when_computer_has_no_usage_profile
'has_usage_profile' => false,
'has_location' => true,
'has_category' => true,
+ 'is__category_not_cloud' => true,
'has_carbon_intensity_zone' => true,
'has_model' => true,
'has_model_power_consumption' => true,
@@ -442,6 +447,7 @@ public function test_getHistorizableDiagnosis_when_computer_has_no_location()
'has_usage_profile' => true,
'has_location' => false,
'has_category' => true,
+ 'is__category_not_cloud' => true,
'has_carbon_intensity_zone' => false, // No location cascades this requirement to be not met
'has_model' => true,
'has_model_power_consumption' => true,
@@ -480,6 +486,7 @@ public function test_getHistorizableDiagnosis_when_computer_has_no_category()
'has_usage_profile' => true,
'has_location' => true,
'has_category' => false,
+ 'is__category_not_cloud' => true,
'has_carbon_intensity_zone' => true,
'has_model' => true,
'has_model_power_consumption' => true,
@@ -518,6 +525,7 @@ public function test_getHistorizableDiagnosis_when_computer_has_no_carbon_intens
'has_usage_profile' => true,
'has_location' => true,
'has_category' => true,
+ 'is__category_not_cloud' => true,
'has_carbon_intensity_zone' => false,
'has_model' => true,
'has_model_power_consumption' => true,
@@ -556,6 +564,7 @@ public function test_getHistorizableDiagnosis_when_computer_has_no_model()
'has_usage_profile' => true,
'has_location' => true,
'has_category' => true,
+ 'is__category_not_cloud' => true,
'has_carbon_intensity_zone' => true,
'has_model' => false,
'has_model_power_consumption' => false,
@@ -594,6 +603,7 @@ public function test_getHistorizableDiagnosis_when_computer_has_no_model_power_c
'has_usage_profile' => true,
'has_location' => true,
'has_category' => true,
+ 'is__category_not_cloud' => true,
'has_carbon_intensity_zone' => true,
'has_model' => true,
'has_model_power_consumption' => false,
@@ -632,6 +642,7 @@ public function test_getHistorizableDiagnosis_when_computer_has_no_type()
'has_usage_profile' => true,
'has_location' => true,
'has_category' => false,
+ 'is__category_not_cloud' => true,
'has_carbon_intensity_zone' => true,
'has_model' => true,
'has_model_power_consumption' => true,
@@ -670,6 +681,7 @@ public function test_getHistorizableDiagnosis_when_computer_has_no_type_power_co
'has_usage_profile' => true,
'has_location' => true,
'has_category' => true,
+ 'is__category_not_cloud' => true,
'has_carbon_intensity_zone' => true,
'has_model' => true,
'has_model_power_consumption' => true,
@@ -708,6 +720,7 @@ public function test_getHistorizableDiagnosis_when_computer_has_no_inventory_ent
'has_usage_profile' => true,
'has_location' => true,
'has_category' => true,
+ 'is__category_not_cloud' => true,
'has_carbon_intensity_zone' => true,
'has_model' => true,
'has_model_power_consumption' => true,
@@ -746,6 +759,7 @@ public function test_getHistorizableDiagnosis_when_computer_has_no_carbon_intens
'has_usage_profile' => true,
'has_location' => true,
'has_category' => true,
+ 'is__category_not_cloud' => true,
'has_carbon_intensity_zone' => true,
'has_model' => true,
'has_model_power_consumption' => true,
@@ -786,6 +800,7 @@ public function test_getHistorizableDiagnosis_when_computer_has_no_carbon_intens
'has_usage_profile' => true,
'has_location' => true,
'has_category' => true,
+ 'is__category_not_cloud' => true,
'has_carbon_intensity_zone' => true,
'has_model' => true,
'has_model_power_consumption' => true,
@@ -824,6 +839,7 @@ public function test_getHistorizableDiagnosis_when_computer_is_ignored()
'has_usage_profile' => true,
'has_location' => true,
'has_category' => true,
+ 'is__category_not_cloud' => true,
'has_carbon_intensity_zone' => true,
'has_model' => true,
'has_model_power_consumption' => true,
@@ -863,6 +879,7 @@ public function test_getHistorizableDiagnosis_when_computer_has_no_decommission_
'has_usage_profile' => true,
'has_location' => true,
'has_category' => true,
+ 'is__category_not_cloud' => true,
'has_carbon_intensity_zone' => true,
'has_model' => true,
'has_model_power_consumption' => true,
@@ -878,6 +895,46 @@ public function test_getHistorizableDiagnosis_when_computer_has_no_decommission_
$this->assertEquals($expected, $result);
}
+ public function test_getHistorizableDiagnosis_when_computer_has_cloud_category()
+ {
+ $history = new Computer();
+
+ [
+ $glpi_computer,
+ $glpi_location,
+ $location,
+ $source_zone,
+ $glpi_computer_model,
+ $glpi_computer_type,
+ $computer_type,
+ $infocom,
+ $usage_profile,
+ $zone,
+ ] = $this->getHistorizableComputer();
+ $this->updateItem($computer_type, ['category' => ComputerType::CATEGORY_CLOUD]);
+
+ $expected = [
+ 'is_deleted' => true,
+ 'is_template' => true,
+ 'has_usage_profile' => true,
+ 'has_location' => true,
+ 'has_category' => true,
+ 'is__category_not_cloud' => false,
+ 'has_carbon_intensity_zone' => true,
+ 'has_model' => true,
+ 'has_model_power_consumption' => true,
+ 'has_type' => true,
+ 'has_type_power_consumption' => true,
+ 'has_inventory_entry_date' => true,
+ 'ci_download_enabled' => true,
+ 'ci_fallback_available' => true,
+ 'not_is_ignore' => true,
+ 'has_decommission_date' => true,
+ ];
+ $result = $history->getHistorizableDiagnosis($glpi_computer);
+ $this->assertEquals($expected, $result);
+ }
+
public function testComputerWithEverythingIsHistorizable()
{
$history = new Computer();
@@ -932,6 +989,7 @@ public function testComputerWithEverythingIsHistorizable()
'has_type_power_consumption' => true,
'has_usage_profile' => true,
'has_category' => false,
+ 'is__category_not_cloud' => true,
'has_inventory_entry_date' => true,
'ci_download_enabled' => true,
'ci_fallback_available' => true,
diff --git a/tests/units/Impact/History/MonitorTest.php b/tests/units/Impact/History/MonitorTest.php
index 1fdeb0c5..bbefa3fd 100644
--- a/tests/units/Impact/History/MonitorTest.php
+++ b/tests/units/Impact/History/MonitorTest.php
@@ -34,10 +34,8 @@
use CommonDBTM;
use Computer as GlpiComputer;
-use Computer_Item;
use ComputerModel;
use ComputerType as GlpiComputerType;
-use DateTime;
use DBmysql;
use Glpi\Asset\Asset_PeripheralAsset;
use GlpiPlugin\Carbon\CarbonEmission;
@@ -57,6 +55,7 @@
use MonitorModel as GlpiMonitorModel;
use MonitorType as GlpiMonitorType;
use PHPUnit\Framework\Attributes\CoversClass;
+use Safe\DateTime;
#[CoversClass(Monitor::class)]
class MonitorTest extends CommonAsset
diff --git a/tests/units/Impact/History/NetworkEquipmentTest.php b/tests/units/Impact/History/NetworkEquipmentTest.php
index 4186f2ad..76a3192e 100644
--- a/tests/units/Impact/History/NetworkEquipmentTest.php
+++ b/tests/units/Impact/History/NetworkEquipmentTest.php
@@ -33,7 +33,6 @@
namespace GlpiPlugin\Carbon\Impact\History\Tests;
use CommonDBTM;
-use DateTime;
use GlpiPlugin\Carbon\CarbonEmission;
use GlpiPlugin\Carbon\Impact\History\NetworkEquipment;
use GlpiPlugin\Carbon\Location;
@@ -50,6 +49,7 @@
use NetworkEquipmentModel as GlpiNetworkEquipmentModel;
use NetworkEquipmentType as GlpiNetworkEquipmentType;
use PHPUnit\Framework\Attributes\CoversClass;
+use Safe\DateTime;
#[CoversClass(NetworkEquipment::class)]
class NetworkEquipmentTest extends CommonAsset
diff --git a/tests/units/Impact/Usage/EngineTest.php b/tests/units/Impact/Usage/EngineTest.php
index 69ba8e39..adbc725b 100644
--- a/tests/units/Impact/Usage/EngineTest.php
+++ b/tests/units/Impact/Usage/EngineTest.php
@@ -54,8 +54,7 @@ public function testGetEngineFromItemtypeForBoavizta()
$version_response = [
'1.3.11',
];
- $client_stub = $this->getMockBuilder(RestApiClient::class)
- ->getMock();
+ $client_stub = $this->createStub(RestApiClient::class);
$client_stub->method('request')->willReturn($version_response);
$item = $this->createItem(GlpiComputer::class);
diff --git a/tests/units/LocationTest.php b/tests/units/LocationTest.php
index 45a87514..99bc93b4 100644
--- a/tests/units/LocationTest.php
+++ b/tests/units/LocationTest.php
@@ -116,8 +116,7 @@ public function testOnGlpiLocationAdd()
$this->assertEquals('FRA', $location->fields['boavizta_zone']);
// Test the geocoding feature
- $geocoder = $this->getMockBuilder(Geocoder::class)
- ->getMock();
+ $geocoder = $this->createStub(Geocoder::class);
$geocoder->method('geocodeQuery')->willReturn(
new AddressCollection([
new NominatimAddress(
@@ -169,8 +168,7 @@ public function testOnGlpiLocationPreUpdate()
$this->assertEquals('FRA', $location->fields['boavizta_zone']);
// Test the geocoding feature
- $geocoder = $this->getMockBuilder(Geocoder::class)
- ->getMock();
+ $geocoder = $this->createStub(Geocoder::class);
$geocoder->method('geocodeQuery')->willReturn(
new AddressCollection([
new NominatimAddress(
diff --git a/tests/units/MonitorTypeTest.php b/tests/units/MonitorTypeTest.php
index 49010bfc..ccd4fa83 100644
--- a/tests/units/MonitorTypeTest.php
+++ b/tests/units/MonitorTypeTest.php
@@ -78,9 +78,7 @@ public function testUpdatePowerConsumption()
public function testShowMassiveActionsSubForm()
{
- $massive_action = $this->getMockBuilder(MassiveAction::class)
- ->disableOriginalConstructor()
- ->getMock();
+ $massive_action = $this->createStub(MassiveAction::class);
$massive_action->method('getAction')->willReturn('MassUpdatePower');
$massive_action->method('getItems')->willReturn([
MonitorType::class => $this->createItem(GlpiMonitorType::class),
@@ -106,9 +104,7 @@ public function testShowMassiveActionsSubForm()
});
$this->assertTrue($result);
- $massive_action = $this->getMockBuilder(MassiveAction::class)
- ->disableOriginalConstructor()
- ->getMock();
+ $massive_action = $this->createStub(MassiveAction::class);
$massive_action->method('getAction')->willReturn('');
$massive_action->method('getItems')->willReturn([
MonitorType::class => $this->createItem(GlpiMonitorType::class),
@@ -125,9 +121,7 @@ public function testShowMassiveActionsSubForm()
public function testProcessMassiveActionForOneItemtype()
{
// Test update power consumption
- $massive_action = $this->getMockBuilder(MassiveAction::class)
- ->disableOriginalConstructor()
- ->getMock();
+ $massive_action = $this->createStub(MassiveAction::class);
$massive_action->method('getAction')->willReturn('MassUpdatePower');
$glpi_monitor_type = $this->createItem(GlpiMonitorType::class);
$massive_action->POST = [
diff --git a/tests/units/NetworkEquipmentTypeTest.php b/tests/units/NetworkEquipmentTypeTest.php
index c502edee..782dbf6d 100644
--- a/tests/units/NetworkEquipmentTypeTest.php
+++ b/tests/units/NetworkEquipmentTypeTest.php
@@ -78,9 +78,7 @@ public function testUpdatePowerConsumption()
public function testShowMassiveActionsSubForm()
{
- $massive_action = $this->getMockBuilder(MassiveAction::class)
- ->disableOriginalConstructor()
- ->getMock();
+ $massive_action = $this->createStub(MassiveAction::class);
$massive_action->method('getAction')->willReturn('MassUpdatePower');
$massive_action->method('getItems')->willReturn([
NetworkEquipmentType::class => $this->createItem(GlpiNetworkEquipmentType::class),
@@ -106,9 +104,7 @@ public function testShowMassiveActionsSubForm()
});
$this->assertTrue($result);
- $massive_action = $this->getMockBuilder(MassiveAction::class)
- ->disableOriginalConstructor()
- ->getMock();
+ $massive_action = $this->createStub(MassiveAction::class);
$massive_action->method('getAction')->willReturn('');
$massive_action->method('getItems')->willReturn([
NetworkEquipmentType::class => $this->createItem(GlpiNetworkEquipmentType::class),
@@ -125,9 +121,7 @@ public function testShowMassiveActionsSubForm()
public function testProcessMassiveActionForOneItemtype()
{
// Test update power consumption
- $massive_action = $this->getMockBuilder(MassiveAction::class)
- ->disableOriginalConstructor()
- ->getMock();
+ $massive_action = $this->createStub(MassiveAction::class);
$massive_action->method('getAction')->willReturn('MassUpdatePower');
$glpi_networkequipment_type = $this->createItem(GlpiNetworkEquipmentType::class);
$networkequipment_type = $this->createItem(NetworkEquipmentType::class, [
diff --git a/tests/units/Source_ZoneTest.php b/tests/units/Source_ZoneTest.php
index 9b911743..e1e85909 100644
--- a/tests/units/Source_ZoneTest.php
+++ b/tests/units/Source_ZoneTest.php
@@ -71,6 +71,31 @@ public function testShowForSource()
$this->assertNotEmpty($output);
}
+ public function test_prepareInputForUpdate_toggles_the_download_flag()
+ {
+ $source = $this->createItem(Source::class, [
+ 'name' => 'foo',
+ ]);
+ $zone = $this->createItem(Zone::class, [
+ 'name' => 'bar',
+ ]);
+ $instance = $this->createItem(Source_Zone::class, [
+ $source::getForeignKeyField() => $source->getID(),
+ $zone::getForeignKeyField() => $zone->getID(),
+ 'is_download_enabled' => 0,
+ ]);
+
+ $input = ['_toggle_is_download_enabled' => 1];
+ $output = $instance->prepareInputForUpdate($input);
+ $this->assertEquals(1, $output['is_download_enabled']);
+
+ // Test toggling back to 0
+ $instance->fields['is_download_enabled'] = 1;
+ $input = ['_toggle_is_download_enabled' => 1];
+ $output = $instance->prepareInputForUpdate($input);
+ $this->assertEquals(0, $output['is_download_enabled']);
+ }
+
public function test_showForZone_shows_nothing_when_user_cannot_view_the_related_zone()
{
$source = $this->createItem(Source::class, [
diff --git a/tests/units/ToolboxTest.php b/tests/units/ToolboxTest.php
index 62cee2c8..94ea0bb4 100644
--- a/tests/units/ToolboxTest.php
+++ b/tests/units/ToolboxTest.php
@@ -34,8 +34,6 @@
use Computer as GlpiComputer;
use DateInterval;
-use DateTime;
-use DateTimeImmutable;
use GlpiPlugin\Carbon\CarbonIntensity;
use GlpiPlugin\Carbon\Source;
use GlpiPlugin\Carbon\Source_Zone;
@@ -44,6 +42,8 @@
use Infocom;
use Location;
use PHPUnit\Framework\Attributes\CoversClass;
+use Safe\DateTime;
+use Safe\DateTimeImmutable;
#[CoversClass(Toolbox::class)]
class ToolboxTest extends DbTestCase