Maj Library

1 files changed, 21 insertions, 0 deletions

diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index 6685ec7..b398088 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -1,6 +1,7 @@
 <?php

 include_once("../core/Plugin_Api.php");

 include_once("../core/LibOverride/genTokenOptions.php");

+<<<<<<< HEAD
 <<<<<<< Updated upstream
 =======
 include_once("../core/ErrorManagement.php");

@@ -10,6 +11,14 @@ use OpenCloud\Common\Error\BaseError;
 use OpenCloud\Common\Error\NotImplementedError;

 use OpenCloud\Common\Error\UserInputError;

 >>>>>>> Stashed changes
+=======
+include_once("../core/ErrorManagement.php");

+

+use OpenStack\Common\Error\BadResponseError;

+use OpenStack\Common\Error\BaseError;

+use OpenStack\Common\Error\NotImplementedError;

+use OpenStack\Common\Error\UserInputError;

+>>>>>>> develop
 

 class AppTest{

 	

@@ -19,6 +28,7 @@ class AppTest{
 	protected $tokenClass;

 	protected $tokenPost;

 	protected $output;

+	protected $errorClass;

 

 	public function __construct($args){

 

@@ -28,6 +38,9 @@ class AppTest{
 		$this->pluginsApi = plugin_api::getInstance();

 		$this->errorClass = new errorManagement($this);

 		$this->output = array();

+

+		$this->errorClass = new errorManagement($this);

+

 		$this->postParams = $_POST;

 

 	}

@@ -103,4 +116,12 @@ class AppTest{
 		return json_encode($this->output);

 	}

 	

+

+	public function getErrorInstance(){

+		

+		return $this->errorClass;

+		

+	}

 }

+

+