mirror of
https://github.com/Cacti/cacti.git
synced 2026-10-27 23:27:44 +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.
177 lines
6.1 KiB
PHP
177 lines
6.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 |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
/*
|
|
* Tests for the initializeSpikekill() user/default assignment logic.
|
|
*
|
|
* Issue #5266: the six if/else branches in initializeSpikekill() were
|
|
* inverted, assigning the system default when a user setting existed
|
|
* and vice versa. This caused operator-configured spikekill parameters
|
|
* to be silently discarded.
|
|
*
|
|
* These tests use inline stubs that mirror the production assignment
|
|
* pattern without requiring a live database or the full spikekill class.
|
|
*
|
|
* See: https://github.com/Cacti/cacti/issues/5266
|
|
*/
|
|
|
|
/**
|
|
* Mirrors the fixed initializeSpikekill() assignment logic for one field.
|
|
* $current: the value passed to the constructor (empty string if unset).
|
|
* $user_setting: the value from read_user_setting() (empty string if unset).
|
|
* $default: the system default from read_config_option().
|
|
*
|
|
* Returns the resolved value that would be assigned to the field.
|
|
*/
|
|
function resolve_spikekill_field(string $current, string $user_setting, string $default): string {
|
|
if ($current == '') {
|
|
if (!empty($user_setting)) {
|
|
return $user_setting;
|
|
} else {
|
|
return $default;
|
|
}
|
|
}
|
|
|
|
return $current;
|
|
}
|
|
|
|
/**
|
|
* Mirrors the BUGGY (pre-fix) assignment logic where user/default were swapped.
|
|
*/
|
|
function resolve_spikekill_field_buggy(string $current, string $user_setting, string $default): string {
|
|
if ($current == '') {
|
|
if (!empty($user_setting)) {
|
|
return $default;
|
|
} else {
|
|
return $user_setting;
|
|
}
|
|
}
|
|
|
|
return $current;
|
|
}
|
|
|
|
// The six spikekill fields and their system defaults (from spikekill class properties)
|
|
define('SPIKEKILL_FIELDS', [
|
|
'avgnan' => 'last',
|
|
'method' => '1',
|
|
'numspike' => '10',
|
|
'stddev' => '10',
|
|
'dsfilter' => '',
|
|
'absmax' => '1000000000',
|
|
]);
|
|
|
|
// --- User settings take priority over defaults ---
|
|
|
|
test('user setting is used when constructor value is empty', function () {
|
|
foreach (SPIKEKILL_FIELDS as $field => $default) {
|
|
$user_value = "user_{$field}_custom";
|
|
|
|
$result = resolve_spikekill_field('', $user_value, $default);
|
|
|
|
expect($result)->toBe($user_value, "Field '{$field}' should use user setting '{$user_value}', got '{$result}'");
|
|
}
|
|
});
|
|
|
|
// --- Default values are used when user settings are empty ---
|
|
|
|
test('default is used when both constructor and user setting are empty', function () {
|
|
foreach (SPIKEKILL_FIELDS as $field => $default) {
|
|
$result = resolve_spikekill_field('', '', $default);
|
|
|
|
expect($result)->toBe($default, "Field '{$field}' should fall back to default '{$default}', got '{$result}'");
|
|
}
|
|
});
|
|
|
|
// --- Constructor value is preserved when non-empty ---
|
|
|
|
test('constructor value is preserved when already set', function () {
|
|
foreach (SPIKEKILL_FIELDS as $field => $default) {
|
|
$constructor_value = "explicit_{$field}";
|
|
$user_value = "user_{$field}";
|
|
|
|
$result = resolve_spikekill_field($constructor_value, $user_value, $default);
|
|
|
|
expect($result)->toBe($constructor_value, "Field '{$field}' should keep constructor value '{$constructor_value}', got '{$result}'");
|
|
}
|
|
});
|
|
|
|
// --- Buggy logic produces wrong results (regression guard) ---
|
|
|
|
test('buggy logic assigns default when user setting exists', function () {
|
|
foreach (SPIKEKILL_FIELDS as $field => $default) {
|
|
$user_value = "user_{$field}_custom";
|
|
|
|
$buggy_result = resolve_spikekill_field_buggy('', $user_value, $default);
|
|
$fixed_result = resolve_spikekill_field('', $user_value, $default);
|
|
|
|
/* The bug: when a user setting exists, the buggy code returns the default */
|
|
expect($buggy_result)->toBe($default, "Buggy logic for '{$field}' should return default")
|
|
->and($fixed_result)->toBe($user_value, "Fixed logic for '{$field}' should return user setting")
|
|
->and($buggy_result)->not->toBe($fixed_result, "Buggy and fixed results for '{$field}' should differ when user setting is non-empty");
|
|
}
|
|
});
|
|
|
|
test('buggy logic assigns empty string when user setting is absent', function () {
|
|
foreach (SPIKEKILL_FIELDS as $field => $default) {
|
|
if ($default === '') {
|
|
continue; /* dsfilter default is empty, so buggy and fixed produce the same result */
|
|
}
|
|
|
|
$buggy_result = resolve_spikekill_field_buggy('', '', $default);
|
|
$fixed_result = resolve_spikekill_field('', '', $default);
|
|
|
|
/* The bug: when no user setting exists, the buggy code returns '' instead of the default */
|
|
expect($buggy_result)->toBe('', "Buggy logic for '{$field}' should return empty string")
|
|
->and($fixed_result)->toBe($default, "Fixed logic for '{$field}' should return default '{$default}'");
|
|
}
|
|
});
|
|
|
|
// --- All six fields are individually verified ---
|
|
|
|
test('avgnan resolves user setting over default', function () {
|
|
$result = resolve_spikekill_field('', 'nan', 'last');
|
|
|
|
expect($result)->toBe('nan');
|
|
});
|
|
|
|
test('method resolves user setting over default', function () {
|
|
$result = resolve_spikekill_field('', '2', '1');
|
|
|
|
expect($result)->toBe('2');
|
|
});
|
|
|
|
test('numspike resolves user setting over default', function () {
|
|
$result = resolve_spikekill_field('', '5', '10');
|
|
|
|
expect($result)->toBe('5');
|
|
});
|
|
|
|
test('stddev resolves user setting over default', function () {
|
|
$result = resolve_spikekill_field('', '3', '10');
|
|
|
|
expect($result)->toBe('3');
|
|
});
|
|
|
|
test('dsfilter resolves user setting over default', function () {
|
|
$result = resolve_spikekill_field('', 'traffic_in', '');
|
|
|
|
expect($result)->toBe('traffic_in');
|
|
});
|
|
|
|
test('absmax resolves user setting over default', function () {
|
|
$result = resolve_spikekill_field('', '500000', '1000000000');
|
|
|
|
expect($result)->toBe('500000');
|
|
});
|