mirror of
https://github.com/Cacti/plugin_thold.git
synced 2026-11-02 18:17:24 +09:00
* INFO: set compat to 1.2.32 * docs: update Copilot instructions Cacti baseline to 1.2.32 (matches INFO compat) * INFO: back off compat to 1.2.29 * Add manifest.json + upgrade-time file pruning * Prune phpunit.xml on upgrade and ignore markdown-lint configs phpunit.xml ships in the repo for CI but is a dev-only test artifact, so it is removed from manifest.json 'expected', pruned from installs on upgrade (like tests/), and excluded from the manifest drift check. The retired markdown-lint configs (.mdlrc, .md_style.rb) are deleted, and .md* is now ignored like .git*: protected from pruning and excluded from drift if it reappears. * Move thold_functions.php and thold_webapi.php into includes/; flatten css The main threshold library becomes includes/functions.php and the web API helper becomes includes/webapi.php; every caller (setup.php, includes/*, the CLI/poller/notify entry points and the test suite) loads them from includes/. Each per-theme stylesheet css/<theme>/main.css becomes css/<theme>.css so users can drop their own css/<theme>.css into the css base, and the page_head hook looks there. Old paths are tombstoned so existing installs drop the stale copies on upgrade. * Regenerate cacti.pot for the includes/ file relocations Moving the plugin's library files into includes/ changed the source-reference lines in the translation template; regenerate it so the 'Verify translation template' CI check passes. * Harden the hook-include test and make RPN integer ops explicit The HookFunctionsIncludeTest invokes real hooks with placeholder input purely to execute their relocated include_once lines; it now swallows engine notices/warnings/deprecations during those calls (and restores the error handler and config afterward) so it cannot trip the suite's failOnDeprecation or leak state into other tests. The RPN % and ^ operators now cast their operands to int explicitly, matching their long-standing integer-truncation behaviour while silencing the implicit float-to-int conversion deprecation. * Harden prune against tampered-manifest path traversal The upgrade-time prune now rejects any tombstone containing '.'/'..' segments (which could escape the plugin directory or resolve to its root) and treats ancestors of whitelist entries as protected, so a tombstone on a parent directory can no longer delete a whitelisted file beneath it. * docs: update and align the Project Structure block Point the structure tree at the relocated files (libraries now under includes/, data files under docs/, stylesheets under css/) and align the trailing '# ...' comments to a single column so they no longer drift right. * docs/tests: standardize test header and correct manifest-contract notes - Use the full license header (from the plugin's own setup.php) in tests/Unit/PruneFilesTest.php instead of the abbreviated copyright banner. - Document that the manifest drift check and the upgrade-time prune also handle phpunit.xml and .md* files, matching the implemented behavior. * refactor: rename prune helpers to the plugin-slug function prefix The repository naming contract reserves the plugin_<name>_ prefix for plugin lifecycle / hook-registration functions; all other functions use the plain <name>_ prefix. Rename the internal upgrade helpers accordingly: plugin_<name>_prune_files() -> <name>_prune_files() plugin_<name>_rmtree() -> <name>_rmtree() The call site, unit tests, and the copilot-instructions.md references are updated to match. No behavioral change. * chore: set the Cacti compatibility floor to 1.2.29 Align the compat metadata (and the contributor-guide references) with the team decision to standardize the minimum supported Cacti version at 1.2.29; the previously proposed 1.2.32 floor was not adopted. --------- Co-authored-by: Copilot <copilot@users.noreply.github.com>
177 lines
5.1 KiB
PHP
177 lines
5.1 KiB
PHP
<?php
|
|
/*
|
|
+-------------------------------------------------------------------------+
|
|
| Copyright (C) 2004-2026 The Cacti Group |
|
|
| |
|
|
| This program is free software; you can redistribute it and/or |
|
|
| modify it under the terms of the GNU General Public License |
|
|
| as published by the Free Software Foundation; either version 2 |
|
|
| of the License, or (at your option) any later version. |
|
|
+-------------------------------------------------------------------------+
|
|
| Cacti: The Complete RRDtool-based Graphing Solution |
|
|
+-------------------------------------------------------------------------+
|
|
| http://www.cacti.net/ |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
/**
|
|
* The pair that moves a threshold bound between what an operator types and
|
|
* what is stored.
|
|
*
|
|
* They have to be inverses. A threshold is read out of the database, rendered
|
|
* into the form, and written back on every save, so any disagreement between
|
|
* them compounds each time the form is opened.
|
|
*/
|
|
final class TholdUnitSuffixTest extends TestCase {
|
|
/**
|
|
* @return void
|
|
*/
|
|
public static function setUpBeforeClass(): void {
|
|
self::loadPluginSource('includes/functions.php');
|
|
}
|
|
|
|
/**
|
|
* @return array<string, array{0: string, 1: float}>
|
|
*/
|
|
public static function suffixProvider() {
|
|
return [
|
|
'yocto' => ['5y', 5.0e-24],
|
|
'zepto' => ['5z', 5.0e-21],
|
|
'atto' => ['5a', 5.0e-18],
|
|
'femto' => ['5f', 5.0e-15],
|
|
'pico' => ['5p', 5.0e-12],
|
|
'nano' => ['5n', 5.0e-9],
|
|
'micro' => ['5u', 5.0e-6],
|
|
'milli' => ['5m', 5.0e-3],
|
|
'kilo' => ['5K', 5.0e3],
|
|
'mega' => ['5M', 5.0e6],
|
|
'giga' => ['5G', 5.0e9],
|
|
'tera' => ['5T', 5.0e12],
|
|
'peta' => ['5P', 5.0e15],
|
|
'exa' => ['5E', 5.0e18],
|
|
'zetta' => ['5Z', 5.0e21],
|
|
'yotta' => ['5Y', 5.0e24],
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @dataProvider suffixProvider
|
|
*
|
|
* @param string $typed
|
|
* @param float $stored
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testEachSuffixScalesByItsSiFactor($typed, $stored): void {
|
|
$this->assertEqualsWithDelta($stored, thold_display_to_raw($typed, 'thold_hi'), abs($stored) * 1.0e-9);
|
|
}
|
|
|
|
/**
|
|
* @dataProvider suffixProvider
|
|
*
|
|
* @param string $typed
|
|
* @param float $stored
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testEachStoredValueRendersWithItsSiSuffix($typed, $stored): void {
|
|
$this->assertSame($typed, thold_raw_to_display($stored));
|
|
}
|
|
|
|
/**
|
|
* Opening a threshold and saving it again must not change it. This is the
|
|
* failure that mattered: a value stored at 1e-12 rendered as 5f, which
|
|
* parsed back as 1e-15, so every visit to the form divided it by a
|
|
* thousand.
|
|
*
|
|
* @dataProvider suffixProvider
|
|
*
|
|
* @param string $typed
|
|
* @param float $stored
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testAValueSurvivesBeingDisplayedAndReEntered($typed, $stored): void {
|
|
$round_tripped = thold_display_to_raw(thold_raw_to_display($stored), 'thold_hi');
|
|
|
|
$this->assertEqualsWithDelta($stored, $round_tripped, abs($stored) * 1.0e-9);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testAPlainNumberIsLeftAlone(): void {
|
|
$this->assertSame('42', thold_display_to_raw('42', 'thold_hi'));
|
|
$this->assertSame('42', thold_raw_to_display(42));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testZeroIsLeftAlone(): void {
|
|
$this->assertSame('0', thold_raw_to_display(0));
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testNegativeValuesKeepTheirSign(): void {
|
|
$this->assertSame('-5K', thold_raw_to_display(-5000));
|
|
$this->assertEqualsWithDelta(-5000, thold_display_to_raw('-5K', 'thold_hi'), 1.0e-6);
|
|
}
|
|
|
|
/**
|
|
* @return array<string, array{0: string}>
|
|
*/
|
|
public static function rejectedInputProvider() {
|
|
return [
|
|
'unknown suffix' => ['5x'],
|
|
'letters only' => ['abc'],
|
|
'empty' => [''],
|
|
];
|
|
}
|
|
|
|
/**
|
|
* @dataProvider rejectedInputProvider
|
|
*
|
|
* @param string $typed
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testUnusableInputIsRejectedAndFlagged($typed): void {
|
|
$this->assertFalse(thold_display_to_raw($typed, 'thold_hi'));
|
|
$this->assertArrayHasKey('thold_hi', $_SESSION['sess_error_fields']);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testNonNumericInputHasNoDisplayForm(): void {
|
|
$this->assertFalse(thold_raw_to_display('abc'));
|
|
}
|
|
|
|
/**
|
|
* Beyond the largest and smallest suffix there is nothing left to index,
|
|
* and the old code read past the end of the pattern and dropped the
|
|
* magnitude entirely.
|
|
*
|
|
* @return void
|
|
*/
|
|
public function testMagnitudesBeyondTheLargestSuffixKeepTheirScale(): void {
|
|
$rendered = thold_raw_to_display(5.0e27);
|
|
|
|
$this->assertNotSame('5', $rendered);
|
|
$this->assertEqualsWithDelta(5.0e27, (float) thold_display_to_raw($rendered, 'thold_hi'), 5.0e18);
|
|
}
|
|
|
|
/**
|
|
* @return void
|
|
*/
|
|
public function testMagnitudesBelowTheSmallestSuffixKeepTheirScale(): void {
|
|
$rendered = thold_raw_to_display(5.0e-18);
|
|
|
|
$this->assertNotSame('5', $rendered);
|
|
$this->assertEqualsWithDelta(5.0e-18, (float) thold_display_to_raw($rendered, 'thold_hi'), 5.0e-27);
|
|
}
|
|
}
|