mirror of
https://github.com/Cacti/cacti.git
synced 2026-11-02 01:57:17 +09:00
* refactor(tests): reorganize unit tests into domain category folders - Consolidate per-advisory GHSA regression tests into Security/ subfolders by vuln class - Group all 186 test files into domain folders: DataCollection/, Ui/, Core/, Database/, Installer/, Scripts/, Security/, Plugin/ - Strip GitHub issue/GHSA numbers from filenames; keep IDs in test descriptions - Fix all __DIR__ relative paths to match new folder nesting depth - Update CI workflow path triggers and phpunit XML configs for new file locations - Update .github/copilot-instructions.md with unit test organization guidelines - Add tests/vendor/ to .gitignore * add gaurds * fix up guard for unit tests * fix redeclaration of cacti_log in tests * fix updates to unit tests * fix test patjhs * fix: update test __DIR__ paths for reorganized test structure * fix: conditionally define read_user_setting to prevent redeclaration in tests * fix: conditionally define functions to prevent redeclaration in tests - Wrap clean_up_lines, raise_message, cacti_debug_backtrace, and get_debug_prefix with function_exists() checks to prevent conflicts when test stubs are loaded before lib/functions.php in the same PHP process * fix: add unit test bootstrap to prevent function redeclaration errors - Create tests/bootstrap-unit.php to load core libraries before tests - Ensures lib/functions.php loads before test stubs define stub functions - Test stubs use function_exists() checks, so they detect pre-loaded functions - Update phpunit.xml to use bootstrap-unit.php for Unit testsuite - Fixes 'Cannot redeclare read_user_setting()' errors when tests run in same process * fix: load test stubs before global.php in unit test bootstrap - Reorder bootstrap to load CactiStubs.php and UnitStubs.php first - Ensures stub functions like __() are available when global.php loads - global.php calls get_cacti_version_text() which needs __() for translations - Fixes 'Call to undefined function __()' error during bootstrap * fix: remove function conflicts from test stubs - Remove stub definitions for functions already in lib/functions.php: cacti_sizeof, cacti_log, cacti_strtolower, read_config_option, read_user_setting, cacti_count - Keep translation function stubs (__(), __esc()) needed by global.php - Update bootstrap to load lib/functions.php after stubs - This prevents function redeclaration errors while maintaining test isolation * fix: prevent constant and variable redeclaration in bootstrap - Remove explicit PHP_TESTING and CACTI_TEST_BOOTSTRAP defines from bootstrap (CactiStubs.php now handles this with guards) - Add guards to CactiStubs.php to prevent redefinition of PHP_TESTING - Only set CACTI_TEST_BOOTSTRAP env vars if not already set - Fixes PHP warnings about 'Constant X already defined' * fix: remove redundant lib/functions.php load from bootstrap include/global.php already loads lib/functions.php at lines 287-288. The bootstrap was trying to load it again after global.php, but global.php needs format_cacti_version() to be available on lines 293-294 to define CACTI_VERSION and CACTI_VERSION_FULL constants. Solution: Let global.php handle loading lib/functions.php itself, and don't load it separately in the bootstrap. * fix: remove more conflicting function stubs from test helpers - Remove stubs for functions also defined in lib/functions.php: raise_message, clean_up_lines, cacti_debug_backtrace, get_debug_prefix - Remove POLLER_ID constant stub (defined unconditionally by global.php) - Keep only translation functions and test-specific helpers - This prevents function/constant redeclaration errors * fix: minimize test stubs to only translation functions Remove ALL helper functions and constants from UnitStubs.php that are: - Defined in lib/functions.php (raise_message, clean_up_lines, etc.) - Defined in lib/html_utility.php (srv, set_request_var) - Defined in global_constants.php (POLLER_VERBOSITY_*, MESSAGE_LEVEL_*) - Defined in global.php (POLLER_ID) Keep ONLY translation functions (__(), __esc()) that are: - Called by global.php during initialization - Not defined elsewhere - Required for proper bootstrap sequence This eliminates all constant and function redeclaration errors. * fix: remove __esc stub - already defined in global_languages.php Keep only __() translation function stub, which is needed by global.php and not defined elsewhere in Cacti core. * fix: handle no-arg case in __() translation stub The __() function may be called with just a string and no format arguments. Previously, vsprintf() would fail with 'arguments array must contain 2 items'. Now, if no args are provided, return the text as-is.
120 lines
5.2 KiB
PHP
120 lines
5.2 KiB
PHP
<?php
|
|
declare(strict_types = 1);
|
|
/*
|
|
+-------------------------------------------------------------------------+
|
|
| Copyright (C) 2004-2026 The Cacti Group |
|
|
+-------------------------------------------------------------------------+
|
|
| Cacti: The Complete RRDtool-based Graphing Solution |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
/**
|
|
* Regression test for the GPRINT consolidation-function cache key in
|
|
* rrdtool_function_graph() (lib/rrd.php ~1812/1824).
|
|
*
|
|
* The $last_graph_cf cache records, for each drawn graph item (AREA/LINE/...),
|
|
* the CF that was used so a following GPRINT can reuse it. It was keyed by
|
|
* data_source_name plus local_data_template_rrd_id. local_data_template_rrd_id
|
|
* is the DATA TEMPLATE's rrd row, so two local data sources built from the same
|
|
* template (e.g. traffic_in on host A and host B inside one aggregate graph)
|
|
* share a key, and non-templated sources all collide on 0. The GPRINT then
|
|
* prints the wrong host's CF.
|
|
*
|
|
* The fix keys the cache by data_template_rrd_id (dtr.id), which is per graph
|
|
* item / per local data source, matching how the DEF cache ($cf_ds_cache) is
|
|
* already keyed. A GPRINT shares its AREA's task_item_id, hence the same
|
|
* data_template_rrd_id, so it resolves to its own item's CF.
|
|
*
|
|
* @group regression
|
|
*/
|
|
|
|
/**
|
|
* Build the $last_graph_cf cache for drawn items, then resolve the CF a GPRINT
|
|
* would reuse. $keyField selects the discriminator: 'data_template_rrd_id'
|
|
* (fixed, per-instance) or 'local_data_template_rrd_id' (buggy, template-scoped).
|
|
*
|
|
* @param array $items drawn items followed by GPRINTs, each carrying
|
|
* data_source_name, data_template_rrd_id,
|
|
* local_data_template_rrd_id and graph_cf
|
|
* @param string $keyField discriminator field to key the cache by
|
|
*
|
|
* @return array map of GPRINT index => resolved CF
|
|
*/
|
|
function gprint_cf_resolve(array $items, string $keyField): array {
|
|
$last_graph_cf = [];
|
|
$resolved = [];
|
|
|
|
foreach ($items as $idx => $item) {
|
|
if ($item['kind'] === 'draw') {
|
|
$last_graph_cf[$item['data_source_name']][$item[$keyField]] = $item['graph_cf'];
|
|
} elseif ($item['kind'] === 'gprint') {
|
|
$resolved[$idx] = $last_graph_cf[$item['data_source_name']][$item[$keyField]] ?? null;
|
|
}
|
|
}
|
|
|
|
return $resolved;
|
|
}
|
|
|
|
// Aggregate graph: two hosts, both traffic_in from the same data template.
|
|
// Host A draws AVERAGE (cf 1), host B draws MAX (cf 3). Aggregate graphs emit
|
|
// the AREA/STACK draw items grouped ahead of the GPRINT legend block, so by the
|
|
// time a GPRINT reads the cache a later same-key draw has already written it.
|
|
// Each GPRINT shares its AREA's task_item_id, hence the same data_template_rrd_id.
|
|
function two_host_aggregate(): array {
|
|
return [
|
|
// host A AREA/AVERAGE
|
|
['kind' => 'draw', 'data_source_name' => 'traffic_in',
|
|
'data_template_rrd_id' => 10, 'local_data_template_rrd_id' => 100, 'graph_cf' => 1],
|
|
// host B AREA/MAX
|
|
['kind' => 'draw', 'data_source_name' => 'traffic_in',
|
|
'data_template_rrd_id' => 20, 'local_data_template_rrd_id' => 100, 'graph_cf' => 3],
|
|
// host A GPRINT
|
|
['kind' => 'gprint', 'data_source_name' => 'traffic_in',
|
|
'data_template_rrd_id' => 10, 'local_data_template_rrd_id' => 100],
|
|
// host B GPRINT
|
|
['kind' => 'gprint', 'data_source_name' => 'traffic_in',
|
|
'data_template_rrd_id' => 20, 'local_data_template_rrd_id' => 100],
|
|
];
|
|
}
|
|
|
|
test('fixed key resolves each GPRINT to its own item CF', function () {
|
|
$resolved = gprint_cf_resolve(two_host_aggregate(), 'data_template_rrd_id');
|
|
|
|
// host A GPRINT at index 2 -> AVERAGE (1); host B GPRINT at index 3 -> MAX (3)
|
|
expect($resolved[2])->toBe(1);
|
|
expect($resolved[3])->toBe(3);
|
|
});
|
|
|
|
test('template-scoped key collides across instances of the same template', function () {
|
|
$resolved = gprint_cf_resolve(two_host_aggregate(), 'local_data_template_rrd_id');
|
|
|
|
// Both hosts share local_data_template_rrd_id 100, so host B's MAX overwrites
|
|
// host A's AVERAGE before either GPRINT reads, and both GPRINTs print MAX.
|
|
// This is the bug the fix removes.
|
|
expect($resolved[2])->toBe(3);
|
|
expect($resolved[3])->toBe(3);
|
|
});
|
|
|
|
test('non-templated sources do not collide under the fixed key', function () {
|
|
// Manually built data sources have local_data_template_rrd_id 0 for every
|
|
// item, so the template-scoped key collapses them all together.
|
|
$items = [
|
|
['kind' => 'draw', 'data_source_name' => 'in',
|
|
'data_template_rrd_id' => 5, 'local_data_template_rrd_id' => 0, 'graph_cf' => 1],
|
|
['kind' => 'draw', 'data_source_name' => 'in',
|
|
'data_template_rrd_id' => 6, 'local_data_template_rrd_id' => 0, 'graph_cf' => 2],
|
|
['kind' => 'gprint', 'data_source_name' => 'in',
|
|
'data_template_rrd_id' => 5, 'local_data_template_rrd_id' => 0],
|
|
['kind' => 'gprint', 'data_source_name' => 'in',
|
|
'data_template_rrd_id' => 6, 'local_data_template_rrd_id' => 0],
|
|
];
|
|
|
|
$fixed = gprint_cf_resolve($items, 'data_template_rrd_id');
|
|
expect($fixed[2])->toBe(1);
|
|
expect($fixed[3])->toBe(2);
|
|
|
|
$buggy = gprint_cf_resolve($items, 'local_data_template_rrd_id');
|
|
expect($buggy[2])->toBe(2);
|
|
expect($buggy[3])->toBe(2);
|
|
});
|