Rewrite:

[core.git] / tests / framework / config / FrameworkConfigurationTest.php

diff --git a/tests/framework/config/FrameworkConfigurationTest.php b/tests/framework/config/FrameworkConfigurationTest.php
index 4de7bbccd70c528dbdbb0f982c1cb0c78e83620b..42040b706dc7e6f846995ef30ca4d82fdf868526 100644 (file)
--- a/tests/framework/config/FrameworkConfigurationTest.php
+++ b/tests/framework/config/FrameworkConfigurationTest.php
@@ -1,9 +1,10 @@
 <?php
-
 // Same namespace as target class
 namespace CoreFramework\Configuration;
 
 // Inport framework stuff
+use CoreFramework\Bootstrap\FrameworkBootstrap;
+use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Loader\ClassLoader;
 use CoreFramework\Generic\NullPointerException;
 use CoreFramework\Generic\UnsupportedOperationException;
@@ -64,7 +65,7 @@ class FrameworkConfigurationTest extends TestCase {
                parent::setUpBeforeClass();
 
                // Init instance
-               self::$configInstance = FrameworkConfiguration::getSelfInstance();
+               self::$configInstance = FrameworkBootstrap::getConfigurationInstance();
 
                /*
                 * Disable strict naming-convention check in own class loader, because
@@ -92,7 +93,7 @@ class FrameworkConfigurationTest extends TestCase {
         */
        public function testGettingSelfConfigInstance () {
                // Get instance
-               $dummyInstance = FrameworkConfiguration::getSelfInstance();
+               $dummyInstance = FrameworkBootstrap::getConfigurationInstance();
 
                // Should be equal to own instance
                $this->assertEquals(self::$configInstance, $dummyInstance);
@@ -103,7 +104,7 @@ class FrameworkConfigurationTest extends TestCase {
         */
        public function testEqualsConfigInstance () {
                // Get instance
-               $dummyInstance = FrameworkConfiguration::getSelfInstance();
+               $dummyInstance = new FrameworkConfiguration();
 
                // Should return TRUE
                $this->assertTrue(self::$configInstance->equals($dummyInstance));
@@ -114,7 +115,7 @@ class FrameworkConfigurationTest extends TestCase {
         */
        public function testHashCodeConfigInstance () {
                // Get instance
-               $dummyInstance = FrameworkConfiguration::getSelfInstance();
+               $dummyInstance = FrameworkBootstrap::getConfigurationInstance();
 
                // Get hash code from both
                $hashCodeExpected = self::$configInstance->hashCode();
@@ -152,7 +153,7 @@ class FrameworkConfigurationTest extends TestCase {
         */
        public function testSameConfigurationArrayGetter () {
                // Get instance
-               $dummyInstance = FrameworkConfiguration::getSelfInstance();
+               $dummyInstance = FrameworkBootstrap::getConfigurationInstance();
 
                // Get it from both instances
                $config1 = self::$configInstance->getConfigurationArray();