fixed test failure and removed useless tests

main/inc/lib/usermanager.lib.php

@@ -2188,7 +2188,7 @@ class UserManager
     /**
      * @param   int     user ID (defaults to the results of api_get_user_id())
      * @param   string	API key's internal ID
-     * @return  int		row ID, not return a boolean
+     * @return  int	row ID, not return a boolean
      */
     public static function get_api_key_id($user_id, $api_service) {
     	if ($user_id != strval(intval($user_id))) return false;

tests/main/inc/lib/usermanager.lib.test.php

@@ -1,50 +1,30 @@
-<?php //$id$
+<?php
 //require_once('../../../simpletest/autorun.php');
 require_once (api_get_path(LIBRARY_PATH).'urlmanager.lib.php');
 require_once(api_get_path(LIBRARY_PATH).'usermanager.lib.php');
 
-class TestUserManager extends UnitTestCase
+class TestUserManager extends UnitTestCase {
-
+        public function __construct() {
-{
+            $this->UnitTestCase('User Manager library - main/inc/lib/usermanager.lib.test.php');
-/*
+        }
-    function testCreateUserReturnsInt() {
+    	public function testCreateUser() {
-		$user = array('username' => 'ywarnier',
+	    	$firstName='test_first';
-	   				  'pass' => 'ywarnier',
+	    	$lastName='test_last';
-	  				  'firstname' => 'Yannick',
+	    	$status='1';
-	    			  'lastname' => 'Warnier',
+	    	$email='test@chamilo.org';
-	  				  'auth_source' => 'platform',
+	    	$loginName='testlogin';
-	  				  'email' => 'yannick.warnier@testdokeos.com',
+	    	$password='testlogin';
-	  				  'status' => 6,
+    		$official_code='testcode';
-	  				  'creator_id' => 1,
+    		$language='english';
-	   				  'active' => 1,
+    		$phone = '';
-					 );
+    		$picture_uri ='';
-    	$res = UserManager::create_user($user['firstname'],$user['lastname'],$user['status'],$user['email'],$user['username'],$user['pass'],null,null,null,null,$user['auth_source'],null,$user['active']);
+    		global $_user, $userPasswordCrypted;
-    	//var_dump($res);
+    		ob_start();
-    	$this->assertTrue(is_bool($res));
+    		$res= ob_get_contents();
-        $res = UserManager::delete_user($res);
+    		UserManager::create_user($firstName, $lastName, $status, $email, $loginName, $password, $official_code, $language, $phone, $picture_uri);
-    }
+    		ob_end_clean();
-*/
+        	$this->assertTrue(is_string($res));
-
+    	}
-    function testCreateUser() {
-    	$firstName='test_first';
-    	$lastName='test_last';
-    	$status='1';
-    	$email='test@chamilo.org';
-    	$loginName='testlogin';
-    	$password='testlogin';
-    	$official_code='testcode';
-    	$language='english';
-    	$phone = '';
-    	$picture_uri ='';
-    	global $_user, $userPasswordCrypted;
-    	ob_start();
-    	$res= ob_get_contents();
-    	UserManager::create_user($firstName, $lastName, $status, $email, $loginName, $password, $official_code, $language, $phone, $picture_uri);
-    	ob_end_clean();
-        //var_dump($res);
-        $this->assertTrue(is_string($res));
-    }
-
 /*
     function testDeleteUserReturnsTrue() {
         $user = array('username' => 'ywarnier',
@@ -147,19 +127,13 @@ class TestUserManager extends UnitTestCase
 	}
 
 	function testGetApiKeyId() {
-		$api_service= '';
+		$api_service = '';
-		$res=UserManager::get_api_key_id(1,$api_service);
+		$res = UserManager::get_api_key_id(1,$api_service);
-		if(!$res === NULL) {
+		$this->assertTrue(is_int($res));
-			$this->assertTrue(is_bool($res));
-		} else {
-			$this->assertTrue(is_null($res));
-			$this->assertFalse($res);
-		}
 	}
 
 	function testGetApiKeys() {
 		$res=UserManager::get_api_keys();
-		//var_dump($res);
 		$this->assertTrue(is_bool($res));
 	}