Test fixes.

aarpon · Jan 24, 2017 · cdfcb08 · cdfcb08
1 parent 0007ca5
commit cdfcb08
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 3 deletions.
diff --git a/tests/php/ActiveDirUserTest.php b/tests/php/ActiveDirUserTest.php
@@ -11,7 +11,7 @@
 use hrm\user\UserManager;
 use hrm\user\UserV2;
 
-require_once dirname(__FILE__) . '/../inc/bootstrap.php';
+require_once dirname(__FILE__) . '/../../inc/bootstrap.php';
 
 /*
     Configuration file for the test. Copy:
@@ -214,6 +214,11 @@ public function testChangingUserStatus()
         # Make sure the User is disabled
         $user = UserManager::reload($user);
         $this->assertTrue($user->status() == UserConstants::STATUS_DISABLED);
+
+        # Now re-enable the User
+        $this->assertTrue(
+            UserManager::enableUser($user->name())
+        );
     }
 
 }
diff --git a/tests/php/IntegratedUserTest.php b/tests/php/IntegratedUserTest.php
@@ -11,7 +11,7 @@
 use hrm\user\UserManager;
 use hrm\user\UserV2;
 
-require_once dirname(__FILE__) . '/../inc/bootstrap.php';
+require_once dirname(__FILE__) . '/../../inc/bootstrap.php';
 
 class IntegratedUserTest extends PHPUnit_Framework_TestCase
 {

diff --git a/tests/php/SetupTest.php b/tests/php/SetupTest.php
@@ -3,7 +3,7 @@
 // Copyright and license notice: see license.txt
 
 // Bootstrap
-require_once dirname(__FILE__) . '/../inc/bootstrap.php';
+require_once dirname(__FILE__) . '/../../inc/bootstrap.php';
 
 /**
  * This test makes sure that the structure of the project is correct.

diff --git a/tests/php/TestLogger.php b/tests/php/TestLogger.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: pontia
+ * Date: 1/24/17
+ * Time: 10:45 AM
+ */
+
+use hrm\Log;
+
+require_once dirname(__FILE__) . '/../../inc/bootstrap.php';
+
+class TestLogger extends PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Test info logging
+     */
+    public function testInfoLogging()
+    {
+        global $log_verbosity;
+        $log_verbosity = 2;
+        Log::info("This is an INFO log.");
+    }
+
+    /**
+     * Test warning logging
+     */
+    public function testWarningLogging()
+    {
+        global $log_verbosity;
+        $log_verbosity = 2;
+        Log::warning("This is a WARNING log.");
+    }
+
+    /**
+     * Test error logging
+     */
+    public function testErrorLogging()
+    {
+        global $log_verbosity;
+        $log_verbosity = 2;
+        Log::error("This is an ERROR log.");
+    }
+
+}