Merge pull request #806 from josaphatim/pb-failing-tests

Fixed phpunit failing tests
cypht-org · Oct 31, 2023 · 028c0db · 028c0db
2 parents 229ec17 + bbd4962
commit 028c0db
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/tests/phpunit/config.php b/tests/phpunit/config.php
@@ -129,7 +129,7 @@ public function test_decode_failed() {
      * @runInSeparateProcess
      */
     public function test_get_path() {
-        $this->assertEquals('./data/testuser.txt',  $this->config->get_path('testuser'));
+        $this->assertEquals(APP_PATH.'tests/phpunit/data/testuser.txt',  $this->config->get_path('testuser'));
     }
     /**
      * @preserveGlobalState disabled
@@ -181,15 +181,15 @@ public function test_get_modules() {
      * @runInSeparateProcess
      */
     public function test_site_load() {
-        $config = new Hm_Site_Config_File('./data/siteconfig.rc');
+        $config = new Hm_Site_Config_File(APP_PATH.'tests/phpunit/data/siteconfig.rc');
         $this->assertEquals(array('version' => VERSION, 'foo' => 'bar', 'default_setting_foo' => 'bar'), $config->dump());
     }
     /**
      * @preserveGlobalState disabled
      * @runInSeparateProcess
      */
     public function test_get_user_defaults() {
-        $config = new Hm_Site_Config_File('./data/siteconfig.rc');
+        $config = new Hm_Site_Config_File(APP_PATH.'tests/phpunit/data/siteconfig.rc');
         $this->assertEquals(array('version' => VERSION, 'foo' => 'bar', 'default_setting_foo' => 'bar'), $config->dump());
     }
     public function tearDown(): void {

diff --git a/tests/phpunit/mocks.php b/tests/phpunit/mocks.php
@@ -144,7 +144,7 @@ class Hm_Mock_Config {
     public $mods = array();
     public $user_defaults = array();
     public $data = array(
-        'user_settings_dir' => './data',
+        'user_settings_dir' => APP_PATH.'tests/phpunit/data',
         'default_language' => 'es',
         'default_setting_inline_message' => true
     );

diff --git a/tests/phpunit/modules.php b/tests/phpunit/modules.php
@@ -188,8 +188,8 @@ public function test_run_output_modules() {
      * @runInSeparateProcess
      */
     public function test_run_output_module() {
-        require '../../modules/core/setup.php';
-        require '../../modules/core/modules.php';
+        require APP_PATH.'/modules/core/setup.php';
+        require APP_PATH.'/modules/core/modules.php';
         $request = new Hm_Mock_Request('HTTP');
         $session = new Hm_Mock_Session();
         Hm_Output_Modules::add('test', 'date', false, false, false, true, 'core');
@@ -205,8 +205,8 @@ public function test_run_output_module() {
      * @runInSeparateProcess
      */
     public function test_run_handler_modules() {
-        require '../../modules/core/setup.php';
-        require '../../modules/core/modules.php';
+        require APP_PATH.'/modules/core/setup.php';
+        require APP_PATH.'/modules/core/modules.php';
         $request = new Hm_Mock_Request('HTTP');
         $session = new Hm_Mock_Session();
         Hm_Handler_Modules::add('test', 'date', false, false, false, true, 'core');

diff --git a/tests/phpunit/modules/core/functions.php b/tests/phpunit/modules/core/functions.php
@@ -5,7 +5,7 @@
 class Hm_Test_Core_Functions extends TestCase {
 
     public function setUp(): void {
-        require 'bootstrap.php';
+        require __DIR__.'/../../bootstrap.php';
         require APP_PATH.'modules/core/modules.php';
     }
     /**
@@ -228,7 +228,7 @@ class Hm_Test_Core_Functions_Debug extends TestCase {
 
     public function setUp(): void {
         define('DEBUG_MODE', true);
-        require 'bootstrap.php';
+        require __DIR__.'/../../bootstrap.php';
         require APP_PATH.'modules/core/modules.php';
     }
     /**
@@ -237,7 +237,7 @@ public function setUp(): void {
      */
     public function test_get_ini_debug() {
         $mock_config = new Hm_Mock_Config();
-        $mock_config->data['app_data_dir'] = './data';
+        $mock_config->data['app_data_dir'] = APP_PATH.'tests/phpunit/data';
         $mock_config->data['foo.ini'] = 'bar';
         $this->assertEquals(array('foo' => 'bar'), get_ini($mock_config, 'foo.ini'));
         $this->assertEquals(array(), get_ini($mock_config, 'no.ini'));

diff --git a/tests/phpunit/modules/core/message_functions.php b/tests/phpunit/modules/core/message_functions.php
@@ -5,7 +5,7 @@
 class Hm_Test_Core_Message_Functions extends TestCase {
 
     public function setUp(): void {
-        require 'bootstrap.php';
+        require __DIR__.'/../../bootstrap.php';
         require APP_PATH.'modules/core/modules.php';
     }
     /**

diff --git a/tests/phpunit/modules/core/message_list_functions.php b/tests/phpunit/modules/core/message_list_functions.php
@@ -6,7 +6,7 @@ class Hm_Test_Core_Message_List_Functions extends TestCase {
 
     public function setUp(): void {
         date_default_timezone_set('UTC');
-        require 'bootstrap.php';
+        require __DIR__.'/../../bootstrap.php';
         require APP_PATH.'modules/core/modules.php';
     }
     /**

diff --git a/tests/phpunit/modules/core/modules.php b/tests/phpunit/modules/core/modules.php
@@ -5,8 +5,8 @@
 class Hm_Test_Core_Handler_Modules extends TestCase {
 
     public function setUp(): void {
-        require 'bootstrap.php';
-        require 'helpers.php';
+        require __DIR__.'/../../bootstrap.php';
+        require __DIR__.'/../../helpers.php';
         require APP_PATH.'modules/core/modules.php';
     }
     /**
@@ -466,7 +466,7 @@ public function test_load_user_data() {
     public function test_save_user_data() {
         $test = new Handler_Test('save_user_data', 'core');
         $res = $test->run();
-        $this->assertEquals(array('user_settings_dir' => './data', 'default_language' => 'es', 'default_setting_inline_message' => true), $res->session->get('user_data'));
+        $this->assertEquals(array('user_settings_dir' => APP_PATH.'tests/phpunit/data', 'default_language' => 'es', 'default_setting_inline_message' => true), $res->session->get('user_data'));
     }
     /**
      * @preserveGlobalState disabled
@@ -567,8 +567,8 @@ public function test_process_search_terms() {
 class Hm_Test_Core_Output_Modules extends TestCase {
 
     public function setUp(): void {
-        require 'bootstrap.php';
-        require 'helpers.php';
+        require __DIR__.'/../../bootstrap.php';
+        require __DIR__.'/../../helpers.php';
         require APP_PATH.'modules/core/modules.php';
     }
     /**
@@ -1479,8 +1479,8 @@ public function test_message_list_end() {
 class Hm_Test_Core_Output_Modules_Debug extends TestCase {
     public function setUp(): void {
         define('DEBUG_MODE', true);
-        require 'bootstrap.php';
-        require 'helpers.php';
+        require __DIR__.'/../../bootstrap.php';
+        require __DIR__.'/../../helpers.php';
         require APP_PATH.'modules/core/modules.php';
     }
     /**

diff --git a/tests/phpunit/modules/imap/hm-imap.php b/tests/phpunit/modules/imap/hm-imap.php
@@ -6,7 +6,7 @@ class Hm_Test_Hm_IMAP extends TestCase {
 
     public function setUp(): void {
         define('IMAP_TEST', true);
-        require 'bootstrap.php';
+        require __DIR__.'/../../bootstrap.php';
         require APP_PATH.'modules/imap/hm-imap.php';
         require APP_PATH.'modules/core/message_functions.php';
         $this->create();