Continued:

[core.git] / application / tests / class_ApplicationHelper.php

diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php
index 31600a7ba61f87b2054f7a18bc6d0dae43a0fc61..161f9fc2faa71748d86fbf8bc26f91236918520d 100644 (file)
--- a/application/tests/class_ApplicationHelper.php
+++ b/application/tests/class_ApplicationHelper.php
@@ -8,9 +8,10 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Loader\ClassLoader;
 use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
+use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware;
 use Org\Mxchange\CoreFramework\Registry\Registerable;
 use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
-use Org\Mxchange\CoreFramework\Utils\String\StringUtils;
+use Org\Mxchange\CoreFramework\Utils\Strings\StringUtils;
 
 /**
  * A class holding general data about the application and some methods for
@@ -35,7 +36,7 @@ use Org\Mxchange\CoreFramework\Utils\String\StringUtils;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -57,7 +58,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
         *
         * @return      void
         */
-       protected function __construct () {
+       private function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
        }
@@ -96,9 +97,6 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
         * @return      void
         */
        public function initApplication () {
-               // Get config instance
-               $cfg = FrameworkBootstrap::getConfigurationInstance();
-
                // Initialize output system
                self::createDebugInstance('ApplicationHelper');
 
@@ -107,15 +105,6 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                 * method.
                 */
                FrameworkBootstrap::initDatabaseInstance();
-
-               // Register core tests
-               ClassLoader::registerTestsPath('framework/main/tests');
-
-               // Register own tests
-               ClassLoader::registerTestsPath('application/tests/tests');
-
-               // Scan for them now
-               ClassLoader::scanTestsClasses();
        }
 
        /**
@@ -159,9 +148,9 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
                $this->getControllerInstance()->handleRequest($requestInstance, $responseInstance);
 
                // -------------------------- Shutdown phase --------------------------
-               self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: Shutdown in progress ...');
+               self::createDebugInstance(__CLASS__, __LINE__)->debugMessage('MAIN: Shutdown in progress ...');
                $this->getControllerInstance()->executeShutdownFilters($requestInstance, $responseInstance);
-               self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: Shutdown completed. (This is the last line.)');
+               self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('MAIN: Shutdown completed. (This is the last line.)');
        }
 
        /**
@@ -195,7 +184,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication
         * @todo        Nothing to add?
         */
        public function assignExtraTemplateData (CompileableTemplate $templateInstance) {
-               $this->partialStub('Unfinished method. templateInstance=' . $templateInstance->__toString());
+               DebugMiddleware::getSelfInstance()->partialStub('Unfinished method. templateInstance=' . $templateInstance->__toString());
        }
 
 }