1 files changed, 28 insertions, 0 deletions
diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index 4d7cab5..4d1f824 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -1,6 +1,12 @@
 <?php
 include_once("../core/Plugin_Api.php");
 include_once("../core/LibOverride/genTokenOptions.php");
+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;
 
 class AppTest{
 	
@@ -10,6 +16,7 @@ class AppTest{
 	protected $tokenClass;
 	protected $tokenPost;
 	protected $output;
+	protected $errorClass;
 
 	public function __construct($args){
 
@@ -19,7 +26,15 @@ class AppTest{
 		$this->pluginsApi = plugin_api::getInstance();
 		$this->errorClass = new errorManagement($this);
 		$this->output = array();
+<<<<<<< HEAD
+<<<<<<< HEAD
+		$this->errorClass = new errorManagement($this);
+=======
 		$this->postParams = $_POST;
+>>>>>>> develop
+=======
+		$this->postParams = $_POST;
+>>>>>>> develop
 
 	}
 	
@@ -94,4 +109,17 @@ class AppTest{
 		return json_encode($this->output);
 	}
 	
+<<<<<<< HEAD
+<<<<<<< HEAD
+	public function getErrorInstance(){
+		
+		return $this->errorClass;
+		
+	}
+}
+=======
+}
+>>>>>>> develop
+=======
 }
+>>>>>>> develop