From 7ec4ea0e6603f3e02c31f0123c1611ef4a862d25 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sat, 28 Jan 2023 09:13:52 +0100 Subject: [PATCH] Add TEST_PATH for out of source tests Signed-off-by: William Desportes --- test/bootstrap-dist.php | 8 ++++++++ test/classes/ConfigTest.php | 4 ++-- test/classes/FileListingTest.php | 4 ++-- test/classes/ThemeTest.php | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/test/bootstrap-dist.php b/test/bootstrap-dist.php index 969c6f9a53..57cc42a7b1 100644 --- a/test/bootstrap-dist.php +++ b/test/bootstrap-dist.php @@ -8,6 +8,14 @@ if (! defined('ROOT_PATH')) { // phpcs:enable } +if (! defined('TEST_PATH')) { + // This is used at Debian because tests + // can be in a different place than the source code + // phpcs:disable PSR1.Files.SideEffects + define('TEST_PATH', ROOT_PATH); + // phpcs:enable +} + /** * Set precision to sane value, with higher values * things behave slightly unexpectedly, for example diff --git a/test/classes/ConfigTest.php b/test/classes/ConfigTest.php index 68864504b5..ffde0d711f 100644 --- a/test/classes/ConfigTest.php +++ b/test/classes/ConfigTest.php @@ -923,11 +923,11 @@ class ConfigTest extends AbstractTestCase { return [ [ - ROOT_PATH . 'test/test_data/config.inc.php', + TEST_PATH . 'test/test_data/config.inc.php', true, ], [ - ROOT_PATH . 'test/test_data/config-nonexisting.inc.php', + TEST_PATH . 'test/test_data/config-nonexisting.inc.php', false, ], ]; diff --git a/test/classes/FileListingTest.php b/test/classes/FileListingTest.php index 9e0a61cc94..94431e1f91 100644 --- a/test/classes/FileListingTest.php +++ b/test/classes/FileListingTest.php @@ -28,7 +28,7 @@ class FileListingTest extends AbstractTestCase { $this->assertFalse($this->fileListing->getDirContent('nonexistent directory')); - $fixturesDir = ROOT_PATH . 'test/classes/_data/file_listing'; + $fixturesDir = TEST_PATH . 'test/classes/_data/file_listing'; $dirContent = $this->fileListing->getDirContent($fixturesDir); if (is_bool($dirContent)) { @@ -46,7 +46,7 @@ class FileListingTest extends AbstractTestCase public function testGetFileSelectOptions(): void { - $fixturesDir = ROOT_PATH . 'test/classes/_data/file_listing'; + $fixturesDir = TEST_PATH . 'test/classes/_data/file_listing'; $this->assertFalse($this->fileListing->getFileSelectOptions('nonexistent directory')); diff --git a/test/classes/ThemeTest.php b/test/classes/ThemeTest.php index 51c7a41c25..65721da9ab 100644 --- a/test/classes/ThemeTest.php +++ b/test/classes/ThemeTest.php @@ -80,7 +80,7 @@ class ThemeTest extends AbstractTestCase */ public function testCheckImgPathFull(): void { - $this->object->setFsPath(ROOT_PATH . 'test/classes/_data/gen_version_info/'); + $this->object->setFsPath(TEST_PATH . 'test/classes/_data/gen_version_info/'); $this->assertTrue($this->object->loadInfo()); $this->assertEquals('Test Theme', $this->object->getName()); $this->assertEquals('5.1', $this->object->getVersion());