X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=application%2Ftests%2Fclass_ApplicationHelper.php;h=8eab367f3f7fa74d1d4578682733ef109bd7b0bb;hb=adcdfc000eba8fac128786adcb8cb480085e7e76;hp=c82b00d63e5c293995ce90881412b2977fefa2c8;hpb=cabd0c2cdd08b8eaf49197ea3fb370f60af53dc4;p=core.git

diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php
index c82b00d6..8eab367f 100644
--- a/application/tests/class_ApplicationHelper.php
+++ b/application/tests/class_ApplicationHelper.php
@@ -1,14 +1,15 @@
 <?php
-// Own namespace
-namespace CoreFramework\Helper\Application;
+// Must be this namespace, else the launcher cannot find the class.
+namespace Org\Mxchange\CoreFramework\Helper\Application;
 
 // Import framework stuff
-use CoreFramework\Manager\ManageableApplication;
-use CoreFramework\Object\BaseFrameworkSystem;
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Registerable;
-use CoreFramework\Registry\Generic\Registry;
-use CoreFramework\Template\CompileableTemplate;
+use Org\Mxchange\CoreFramework\Application\BaseApplication;
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
+use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Loader\ClassLoader;
+use Org\Mxchange\CoreFramework\Manager\ManageableApplication;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
+use Org\Mxchange\CoreFramework\Template\CompileableTemplate;
 
 /**
  * A class holding general data about the application and some methods for
@@ -33,7 +34,7 @@ use CoreFramework\Template\CompileableTemplate;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  *
  * This program is free software: you can redistribute it and/or modify
@@ -49,7 +50,7 @@ use CoreFramework\Template\CompileableTemplate;
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplication, Registerable {
+class ApplicationHelper extends BaseApplication implements ManageableApplication, Registerable {
 	/**
 	 * The version number of this application
 	 */
@@ -155,37 +156,54 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	}
 
 	/**
-	 * Launches the test suite
+	 * 1) Setups application data
 	 *
 	 * @return	void
 	 */
-	public final function entryPoint () {
-		// Set this application in registry
-		Registry::getRegistry()->addInstance('app', $this);
+	public function setupApplicationData () {
+		// Set all application data
+		$this->setAppName('Unit tests and more');
+		$this->setAppVersion('0.0.0');
+		$this->setAppShortName('tests');
+	}
 
-		// Default response is console
-		$response = self::getResponseTypeFromSystem();
-		$responseType = self::getResponseTypeFromSystem();
+	/**
+	 * 2) Does initial stuff before starting the application
+	 *
+	 * @return	void
+	 */
+	public function initApplication () {
+		// Get config instance
+		$cfg = FrameworkBootstrap::getConfigurationInstance();
 
-		// Create a new request object
-		$requestInstance = ObjectFactory::createObjectByName(sprintf('CoreFramework\Request\%sRequest', self::convertToClassName($response)));
+		// Initialize output system
+		self::createDebugInstance('ApplicationHelper');
 
-		// Remember request instance here
-		$this->setRequestInstance($requestInstance);
+		/*
+		 * This application needs a database connection then simply call init
+		 * method.
+		 */
+		FrameworkBootstrap::initDatabaseInstance();
 
-		// Do we have another response?
-		if ($requestInstance->isRequestElementSet('request')) {
-			// Then use it
-			$response = strtolower($requestInstance->getRequestElement('request'));
-			$responseType = $response;
-		} // END - if
+		// Register core tests
+		ClassLoader::registerTestsPath('framework/main/tests');
 
-		// ... and a new response object
-		$responseClass = sprintf('CoreFramework\Response\%sResponse', self::convertToClassName($response));
-		$responseInstance = ObjectFactory::createObjectByName($responseClass, array($this));
+		// Register own tests
+		ClassLoader::registerTestsPath('application/tests/tests');
 
-		// Remember response instance here
-		$this->setResponseInstance($responseInstance);
+		// Scan for them now
+		ClassLoader::scanTestsClasses();
+	}
+
+	/**
+	 * 3) Launches the application
+	 *
+	 * @return	void
+	 */
+	public function launchApplication () {
+		// Get request/response instances
+		$requestInstance  = FrameworkBootstrap::getRequestInstance();
+		$responseInstance = FrameworkBootstrap::getResponseInstance();
 
 		// Get the parameter from the request
 		$commandName = $requestInstance->getRequestElement('command');
@@ -201,14 +219,14 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 
 		// Get a controller resolver
 		$resolverClass = sprintf(
-			'CoreFramework\Tests\Resolver\Controller\%s',
+			'Org\Mxchange\CoreFramework\Tests\Resolver\Controller\%s',
 			self::convertToClassName(sprintf(
 				'%s_%s_controller_resolver',
 				$this->getAppShortName(),
-				$responseType
+				FrameworkBootstrap::getRequestTypeFromSystem()
 			))
 		);
-		$resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this));
+		$resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName));
 
 		// Get a controller instance as well
 		$this->setControllerInstance($resolverInstance->resolveController());
@@ -217,9 +235,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 		$this->getControllerInstance()->handleRequest($requestInstance, $responseInstance);
 
 		// -------------------------- Shutdown phase --------------------------
-		// Shutting down the hub by saying "good bye" to all connected peers
-		// and other hubs, flushing all queues and caches.
-		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: Shutdown in progress, main loop exited.');
+		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: Shutdown in progress ...');
 		$this->getControllerInstance()->executeShutdownFilters($requestInstance, $responseInstance);
 		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MAIN: Shutdown completed. (This is the last line.)');
 	}
@@ -244,7 +260,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica
 	 * @return	$masterTemplateName		Name of the master template
 	 */
 	public function buildMasterTemplateName () {
-		return 'node_main';
+		return 'tests_main';
 	}
 
 	/**