Fix errors in tests

refs #6011

test/php/application/forms/Config/Authentication/DbBackendFormTest.php

@@ -4,6 +4,10 @@
 
 namespace Tests\Icinga\Form\Config\Authentication;
 
+// Necessary as some of these tests disable phpunit's preservation
+// of the global state (e.g. autoloaders are in the global state)
+require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php');
+
 use Mockery;
 use Icinga\Test\BaseTestCase;
 use Icinga\Form\Config\Authentication\DbBackendForm;
@@ -18,6 +22,7 @@ class DbBackendFormTest extends BaseTestCase
 
     /**
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      */
     public function testValidBackendIsValid()
     {
@@ -40,6 +45,7 @@ class DbBackendFormTest extends BaseTestCase
 
     /**
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      */
     public function testInvalidBackendIsNotValid()
     {

test/php/application/forms/Config/Authentication/LdapBackendFormTest.php

@@ -4,6 +4,10 @@
 
 namespace Tests\Icinga\Form\Config\Authentication;
 
+// Necessary as some of these tests disable phpunit's preservation
+// of the global state (e.g. autoloaders are in the global state)
+require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php');
+
 use Mockery;
 use Icinga\Test\BaseTestCase;
 use Icinga\Form\Config\Authentication\LdapBackendForm;
@@ -18,6 +22,7 @@ class LdapBackendFormTest extends BaseTestCase
 
     /**
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      */
     public function testValidBackendIsValid()
     {
@@ -40,6 +45,7 @@ class LdapBackendFormTest extends BaseTestCase
 
     /**
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      */
     public function testInvalidBackendIsNotValid()
     {

test/php/application/forms/Config/Resource/ResourceFormTest.php

@@ -4,6 +4,10 @@
 
 namespace Tests\Icinga\Form\Config\Resource;
 
+// Necessary as some of these tests disable phpunit's preservation
+// of the global state (e.g. autoloaders are in the global state)
+require_once realpath(dirname(__FILE__) . '/../../../../bootstrap.php');
+
 use Mockery;
 use Zend_Config;
 use Icinga\Test\BaseTestCase;
@@ -64,6 +68,7 @@ class ResourceFormTest extends BaseTestCase
 
     /**
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      */
     public function testValidDbResourceIsValid()
     {
@@ -80,6 +85,7 @@ class ResourceFormTest extends BaseTestCase
 
     /**
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      */
     public function testInvalidDbResourceIsNotValid()
     {
@@ -96,6 +102,7 @@ class ResourceFormTest extends BaseTestCase
 
     /**
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      */
     public function testValidLdapResourceIsValid()
     {
@@ -112,6 +119,7 @@ class ResourceFormTest extends BaseTestCase
 
     /**
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      */
     public function testInvalidLdapResourceIsNotValid()
     {
@@ -128,6 +136,7 @@ class ResourceFormTest extends BaseTestCase
 
     /**
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      */
     public function testValidLivestatusResourceIsValid()
     {
@@ -145,6 +154,7 @@ class ResourceFormTest extends BaseTestCase
 
     /**
      * @runInSeparateProcess
+     * @preserveGlobalState disabled
      */
     public function testInvalidLivestatusResourceIsNotValid()
     {

test/php/library/Icinga/Application/ConfigTest.php

@@ -30,7 +30,7 @@ class ConfigTest extends BaseTestCase
 
     public function testAppConfig()
     {
-        $config = IcingaConfig::app();
+        $config = IcingaConfig::app('config', true);
         $this->assertEquals(1, $config->logging->enable, 'Unexpected value retrieved from config file');
         // Test non-existent property where null is the default value
         $this->assertEquals(
@@ -70,28 +70,28 @@ class ConfigTest extends BaseTestCase
             $config->backend->db->toArray()
         );
         // Test singleton
-        $this->assertEquals($config, IcingaConfig::app());
+        $this->assertEquals($config, IcingaConfig::app('config'));
         $this->assertEquals(array('logging', 'backend'), $config->keys());
         $this->assertEquals(array('enable'), $config->keys('logging'));
     }
 
     public function testAppExtraConfig()
     {
-        $extraConfig = IcingaConfig::app('extra');
+        $extraConfig = IcingaConfig::app('extra', true);
         $this->assertEquals(1, $extraConfig->meta->version);
         $this->assertEquals($extraConfig, IcingaConfig::app('extra'));
     }
 
     public function testModuleConfig()
     {
-        $moduleConfig = IcingaConfig::module('amodule');
+        $moduleConfig = IcingaConfig::module('amodule', 'config', true);
         $this->assertEquals(1, $moduleConfig->menu->get('breadcrumb'));
         $this->assertEquals($moduleConfig, IcingaConfig::module('amodule'));
     }
 
     public function testModuleExtraConfig()
     {
-        $moduleExtraConfig = IcingaConfig::module('amodule', 'extra');
+        $moduleExtraConfig = IcingaConfig::module('amodule', 'extra', true);
         $this->assertEquals(
             'inetOrgPerson',
             $moduleExtraConfig->ldap->user->get('ldap_object_class')