mirror of
https://github.com/Cacti/cacti.git
synced 2026-11-03 02:27:13 +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.
140 lines
5.2 KiB
PHP
140 lines
5.2 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 |
|
|
+-------------------------------------------------------------------------+
|
|
*/
|
|
|
|
// Inline coordinate conversion — mirrors fixCoordinates() in cli/add_site.php
|
|
function convertCoordinates(string $lat, string $lng): array {
|
|
$utfCoord = mb_convert_encoding("$lat $lng", 'ISO-8859-1', 'UTF-8');
|
|
|
|
if (preg_match('/(\d+)\xB0(\d+)\'((?:[.]\d+|\d+(?:[.]\d*)?))"?([NS]) +(\d+)\xB0(\d+)\'((?:[.]\d+|\d+(?:[.]\d*)?))"?([EW])/', $utfCoord, $matches)) {
|
|
array_shift($matches);
|
|
[$degN, $minN, $secN, $NS, $degE, $minE, $secE, $EW] = $matches;
|
|
|
|
$lat = sprintf('%0.6f', ($NS === 'S' ? -1 : 1) * ((float) $degN + ((float) $minN / 60) + ((float) $secN / 3600)));
|
|
$lng = sprintf('%0.6f', ($EW === 'W' ? -1 : 1) * ((float) $degE + ((float) $minE / 60) + ((float) $secE / 3600)));
|
|
}
|
|
|
|
return [$lat, $lng];
|
|
}
|
|
|
|
// Inline guard — mirrors the (!$deviceId || !$siteId) check in doDeviceMap()
|
|
function shouldRejectMap(int $deviceId, int $siteId): bool {
|
|
return (!$deviceId || !$siteId);
|
|
}
|
|
|
|
// Fix #4/#5: DMS passthrough — already-decimal values are unchanged
|
|
test('coordinates unchanged when already decimal', function () {
|
|
[$lat, $lng] = convertCoordinates('51.5115172', '-0.0017868');
|
|
|
|
expect($lat)->toBe('51.5115172')
|
|
->and($lng)->toBe('-0.0017868');
|
|
});
|
|
|
|
test('converts DMS north-east to positive decimal', function () {
|
|
// 51°30'26"N 0°7'39"E
|
|
[$lat, $lng] = convertCoordinates("51\xc2\xb030'26\"N", "0\xc2\xb07'39\"E");
|
|
|
|
expect((float) $lat)->toBeGreaterThan(0.0)
|
|
->and((float) $lng)->toBeGreaterThan(0.0);
|
|
});
|
|
|
|
test('converts DMS south-west to negative decimal', function () {
|
|
// 33°52'0"S 151°12'36"W
|
|
[$lat, $lng] = convertCoordinates("33\xc2\xb052'0\"S", "151\xc2\xb012'36\"W");
|
|
|
|
expect((float) $lat)->toBeLessThan(0.0)
|
|
->and((float) $lng)->toBeLessThan(0.0);
|
|
});
|
|
|
|
test('DMS north result is positive, south result is negative', function () {
|
|
[$latN] = convertCoordinates("10\xc2\xb00'0\"N", "0\xc2\xb00'0\"E");
|
|
[$latS] = convertCoordinates("10\xc2\xb00'0\"S", "0\xc2\xb00'0\"E");
|
|
|
|
expect((float) $latN)->toBeGreaterThan(0.0)
|
|
->and((float) $latS)->toBeLessThan(0.0);
|
|
});
|
|
|
|
test('DMS east result is positive, west result is negative', function () {
|
|
[, $lngE] = convertCoordinates("0\xc2\xb00'0\"N", "10\xc2\xb00'0\"E");
|
|
[, $lngW] = convertCoordinates("0\xc2\xb00'0\"N", "10\xc2\xb00'0\"W");
|
|
|
|
expect((float) $lngE)->toBeGreaterThan(0.0)
|
|
->and((float) $lngW)->toBeLessThan(0.0);
|
|
});
|
|
|
|
// Fix #6: doDeviceMap() guard rejects zero deviceId or zero siteId
|
|
test('guard rejects when deviceId is zero', function () {
|
|
expect(shouldRejectMap(0, 1))->toBeTrue();
|
|
});
|
|
|
|
test('guard rejects when siteId is zero', function () {
|
|
expect(shouldRejectMap(1, 0))->toBeTrue();
|
|
});
|
|
|
|
test('guard rejects when both are zero', function () {
|
|
expect(shouldRejectMap(0, 0))->toBeTrue();
|
|
});
|
|
|
|
test('guard passes when both deviceId and siteId are non-zero', function () {
|
|
expect(shouldRejectMap(1, 1))->toBeFalse();
|
|
});
|
|
|
|
// Fix #3: regex escaping prevents dot from matching any character
|
|
test('regex escaping prevents dot from matching any character', function () {
|
|
$input = 'rtr.east';
|
|
$pattern = '/^' . preg_quote($input, '/') . '$/';
|
|
|
|
expect(preg_match($pattern, 'rtr.east'))->toBe(1)
|
|
->and(preg_match($pattern, 'rtrXeast'))->toBe(0);
|
|
});
|
|
|
|
test('regex escaping prevents plus from being treated as quantifier', function () {
|
|
$input = 'foo+bar';
|
|
$pattern = '/^' . preg_quote($input, '/') . '$/';
|
|
|
|
expect(preg_match($pattern, 'foo+bar'))->toBe(1)
|
|
->and(preg_match($pattern, 'foobar'))->toBe(0);
|
|
});
|
|
|
|
test('wildcard conversion escapes special chars then expands percent', function () {
|
|
$input = 'rtr-%-pe.1';
|
|
$parts = explode('%', $input);
|
|
$pattern = '/^' . implode('.*', array_map(fn($p) => preg_quote($p, '/'), $parts)) . '$/';
|
|
|
|
expect(preg_match($pattern, 'rtr-east-pe.1'))->toBe(1)
|
|
->and(preg_match($pattern, 'rtr-east-peX1'))->toBe(0);
|
|
});
|
|
|
|
// Fix #7: replaceSites flag controls update vs insert path
|
|
test('replaceSites true with existing data triggers update path', function () {
|
|
$siteData = [['id' => 5, 'name' => 'Test']];
|
|
$replaceSites = true;
|
|
|
|
expect($siteData && $replaceSites)->toBeTrue();
|
|
});
|
|
|
|
test('replaceSites false with existing data skips to insert path', function () {
|
|
$siteData = [['id' => 5, 'name' => 'Test']];
|
|
$replaceSites = false;
|
|
|
|
expect($siteData && $replaceSites)->toBeFalsy();
|
|
});
|
|
|
|
// Fix #10: curl_exec returns string|false; false signals failure
|
|
test('curl_exec false is handled as string|false', function () {
|
|
$buffer = false; // simulates curl_exec failure
|
|
|
|
expect($buffer)->toBeFalse()
|
|
->and($buffer === false)->toBeTrue();
|
|
});
|