chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Eliminated mock object and added new function testSendInvitationFriendUser , change the exit by return false in the function Send_Invitation_Friend_User in social line 313

Browse Source
skala
Ricardo Rodriguez 16 years ago
parent 1b6d5baf70
commit 95614cdf1e
2 changed files with 77 additions and 80 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 5
      main/inc/lib/social.lib.php
  2. 152
      tests/main/inc/lib/social.lib.test.php

5
main/inc/lib/social.lib.php
Unescape View File

@ -181,7 +181,7 @@ class SocialManager extends UserManager {
$res_exist=Database::query($sql_exist,__FILE__,__LINE__); $res_exist=Database::query($sql_exist,__FILE__,__LINE__);
$row_exist=Database::fetch_array($res_exist,'ASSOC'); $row_exist=Database::fetch_array($res_exist,'ASSOC');
if ($row_exist['count']==0) { if ($row_exist['count']==0) {
$sql='INSERT INTO '.$tbl_message.'(user_sender_id,user_receiver_id,msg_status,send_date,title,content) VALUES('.$user_id.','.$friend_id.','.MESSAGE_STATUS_INVITATION_PENDING.',"'.$current_date.'","'.$message_title.'","'.$message_content.'")'; $sql='INSERT INTO '.$tbl_message.'(user_sender_id,user_receiver_id,msg_status,send_date,title,content) VALUES('.$user_id.','.$friend_id.','.MESSAGE_STATUS_INVITATION_PENDING.',"'.$current_date.'","'.$message_title.'","'.$message_content.'")';
Database::query($sql,__FILE__,__LINE__); Database::query($sql,__FILE__,__LINE__);
@ -298,7 +298,6 @@ class SocialManager extends UserManager {
*/ */
public static function send_invitation_friend_user ($userfriend_id,$subject_message='',$content_message='') { public static function send_invitation_friend_user ($userfriend_id,$subject_message='',$content_message='') {
global $charset; global $charset;
//$id_user_friend=array(); //$id_user_friend=array();
$user_info = array(); $user_info = array();
$user_info = api_get_user_info($userfriend_id); $user_info = api_get_user_info($userfriend_id);
@ -311,7 +310,7 @@ class SocialManager extends UserManager {
} else { } else {
echo Display::display_error_message($succes,true); echo Display::display_error_message($succes,true);
} }
exit; return false;
} elseif (isset($userfriend_id) && !isset($subject_message)) { } elseif (isset($userfriend_id) && !isset($subject_message)) {
$count_is_true=false; $count_is_true=false;
$count_number_is_true=0; $count_number_is_true=0;

152
tests/main/inc/lib/social.lib.test.php
Unescape View File

@ -2,10 +2,6 @@
require_once(api_get_path(LIBRARY_PATH).'social.lib.php'); require_once(api_get_path(LIBRARY_PATH).'social.lib.php');
require_once(api_get_path(LIBRARY_PATH).'usermanager.lib.php'); require_once(api_get_path(LIBRARY_PATH).'usermanager.lib.php');
require_once(api_get_path(LIBRARY_PATH).'main_api.lib.php'); require_once(api_get_path(LIBRARY_PATH).'main_api.lib.php');
Mock::generate('Database');
Mock::generate('Display');
Mock::generate('UserManager');
Mock::generate('MessageManager');
class TestSocial extends UnitTestCase{ class TestSocial extends UnitTestCase{
/* /*
@ -24,94 +20,90 @@ class TestSocial extends UnitTestCase{
} }
*/ */
//@todo this function was moved to usermanager //@todo this function was moved to usermanager
/*
/**
* this function has been eliminated of this file, this functionality has been implemented in other file
*/
/* DEPRECATED
public function testRegisterFriend(){ public function testRegisterFriend(){
$instans= new MockDatabase();
$friend_id=4; $friend_id=4;
$my_user_id=1; $my_user_id=1;
$relation_type=2; $relation_type=2;
$res= SocialManager::register_friend ($friend_id,$my_user_id,$relation_type); $res= SocialManager::register_friend ($friend_id,$my_user_id,$relation_type);
$instans->expectCallCount(Database);
$this->assertTrue(is_object($instans));
$this->assertTrue(is_null($res)); $this->assertTrue(is_null($res));
$this->assertNull($res); $this->assertNull($res);
//var_dump($res); //var_dump($res);
} }
*/
/*
//Remove or deprecate //Remove or deprecate
public function testRemovedFriend(){
public function testRemovedFriend(){
//$instans= new MockDatabase();
//$instans1= new MockDatabase();
$friend_id=4; $friend_id=4;
$res = SocialManager::removed_friend ($friend_id); $res = SocialManager::removed_friend($friend_id);
$instans->expectCallCount(Database,8,'' );
$instans1->expectMaximumCallCount(Database,10,'');
//$this->assertTrue(is_object($instans));
//$this->assertTrue(is_object($instans1));
$this->assertTrue(is_null($res)); $this->assertTrue(is_null($res));
//var_dump($res); //var_dump($res);
//var_dump($instans);
//var_dump($instans1);
} }
*/ */
public function testShowListTypeFriends(){ public function testShowListTypeFriends(){
$res =SocialManager::show_list_type_friends(); $res =SocialManager::show_list_type_friends();
$this->assertTrue($res); $this->assertTrue($res);
$this->assertTrue(is_array($res)); $this->assertTrue(is_array($res));
//var_dump($res); //var_dump($res);
//var_dump($instans1);
} }
public function testGetRelationTypeByName (){ public function testGetRelationTypeByName (){
$relation_type_name=1; $relation_type_name=1;
$res = SocialManager::get_relation_type_by_name ($relation_type_name); $res = SocialManager::get_relation_type_by_name($relation_type_name);
if(!is_null($res)): if(is_null($res))
$this->assertTrue(is_numeric($res)); {
$this->assertTrue($res); $this->assertNull($res);
endif; $this->assertTrue(is_null($res));
} else
{
$this->assertTrue(is_numeric($res));
$this->assertTrue($res);
}
//var_dump($res); //var_dump($res);
} }
public function testGetRelationBetweenContacts (){ public function testGetRelationBetweenContacts (){
$user_id=1; $user_id=1;
$user_friend=3; $user_friend=3;
$res =SocialManager::get_relation_between_contacts ($user_id,$user_friend); $res =SocialManager::get_relation_between_contacts($user_id,$user_friend);
if(!is_numeric($res)): if(is_numeric($res)){
$this->assertTrue(is_string($res)); $this->assertFalse($res);
$this->assertTrue($res); $this->assertTrue(is_numeric($res));
endif; } else
{
$this->assertTrue(is_string($res));
$this->assertTrue($res);
}
//var_dump($res); //var_dump($res);
//var_dump($instans);
//var_dump($instans1);
//var_dump($instans2);
} }
/* /**
* This function has been DEPRECATED AND REMOVED
*/
/* DEPRECATED
public function testGetListIdFriendsByUserId (){ public function testGetListIdFriendsByUserId (){
$instans= new MockDatabase();
$user_id = 1; $user_id = 1;
$id_group=3; $id_group=3;
$search_name='group'; $search_name='group';
$res = SocialManager::get_friends_id ($user_id,$id_group,$search_name); $res = SocialManager::get_friends_id($user_id,$id_group,$search_name);
$instans->expectOnce(Database);
$this->assertTrue(is_array($res)); $this->assertTrue(is_array($res));
$this->assertTrue(is_object($instans));
//var_dump($res); //var_dump($res);
//var_dump($instans);
} }
*/ */
public function testGetListPathWebByUserId(){ public function testGetListPathWebByUserId(){
$user_id=1; $user_id=1;
$id_group=null; $id_group=null;
$search_name=null; $search_name=null;
$res = SocialManager::get_list_path_web_by_user_id ($user_id,$id_group,$search_name); $res = SocialManager::get_list_path_web_by_user_id($user_id,$id_group,$search_name);
if(!($res===true)): if(!($res===true)):
$this->assertTrue(is_array($res)); $this->assertTrue(is_array($res));
endif; endif;
//var_dump($res); //var_dump($res);
//var_dump($instans);
} }
public function testGetListWebPathUserInvitationByUserId(){ public function testGetListWebPathUserInvitationByUserId(){
@ -122,7 +114,6 @@ class TestSocial extends UnitTestCase{
else else
$this->assertTrue(is_null($res)); $this->assertTrue(is_null($res));
//var_dump($res); //var_dump($res);
//var_dump($instans);
} }
public function testSendInvitationFriend(){ public function testSendInvitationFriend(){
@ -130,41 +121,36 @@ class TestSocial extends UnitTestCase{
$friend_id=3; $friend_id=3;
$message_title='hello'; $message_title='hello';
$message_content='hola'; $message_content='hola';
$res = SocialManager ::send_invitation_friend ($user_id,$friend_id,$message_title,$message_content); $res = SocialManager::send_invitation_friend($user_id,$friend_id,$message_title,$message_content);
if(!is_null($res)): if(!is_null($res)):
$this->assertTrue(is_bool($res)); $this->assertTrue(is_bool($res));
$this->assertTrue(is_bool($res===true || $res === false)); $this->assertTrue(is_bool($res===true || $res === false));
endif; endif;
//var_dump($res); //var_dump($res);
//var_dump($instans);
} }
public function testGetMessageNumberInvitationByUserId(){ public function testGetMessageNumberInvitationByUserId(){
$user_receiver_id=3; $user_receiver_id=3;
$res = SocialManager::get_message_number_invitation_by_user_id ($user_receiver_id); $res = SocialManager::get_message_number_invitation_by_user_id($user_receiver_id);
if(is_string($res)): if(is_string($res)):
$this->assertTrue(is_numeric($res)); $this->assertTrue(is_numeric($res));
endif; endif;
//var_dump($res); //var_dump($res);
//var_dump($instans);
} }
public function testGetListInvitationOfFriendsByUserId(){ public function testGetListInvitationOfFriendsByUserId(){
$user_id=1; $user_id=1;
$res = SocialManager::get_list_invitation_of_friends_by_user_id ($user_id); $res = SocialManager::get_list_invitation_of_friends_by_user_id($user_id);
$this->assertTrue(is_array($res)); $this->assertTrue(is_array($res));
//var_dump($res); //var_dump($res);
//var_dump($instans);
} }
public function testInvitationAccepted(){ public function testInvitationAccepted(){
$user_send_id=1; $user_send_id=1;
$user_receiver_id=3; $user_receiver_id=3;
$res = SocialManager::invitation_accepted ($user_send_id,$user_receiver_id); $res = SocialManager::invitation_accepted($user_send_id,$user_receiver_id);
$this->assertTrue(is_null($res)); $this->assertTrue(is_null($res));
//var_dump($res); //var_dump($res);
//var_dump($instans);
//var_dump($instans1);
} }
public function testInvitationDenied(){ public function testInvitationDenied(){
@ -173,11 +159,8 @@ class TestSocial extends UnitTestCase{
$res = SocialManager::invitation_denied($user_send_id,$user_receiver_id); $res = SocialManager::invitation_denied($user_send_id,$user_receiver_id);
$this->assertTrue(is_null($res)); $this->assertTrue(is_null($res));
//var_dump($res); //var_dump($res);
//var_dump($instans);
} }
public function testQualifyFriend(){ public function testQualifyFriend(){
$id_friend_qualify=2; $id_friend_qualify=2;
$type_qualify=1; $type_qualify=1;
@ -185,25 +168,40 @@ class TestSocial extends UnitTestCase{
$this->assertTrue(is_null($res)); $this->assertTrue(is_null($res));
//var_dump($res); //var_dump($res);
} }
/*
public function testSendInvitationFriendUser(){ public function testSendInvitationFriendUser(){
$instans = new MockDisplay(); global $_course, $charset;
$instans1 = new MockDatabase(); ob_start();
//$instans2 = new MockMessageManager(); $userfriend_id = 1;
$userfriend_id=1; $subject_message = 'test';
$subject_message=''; $content_message = 'this message is a test';
$content_message=''; $res = SocialManager::send_invitation_friend_user ($userfriend_id,$subject_message,$content_message);
$res = MessageManager::send_invitation_friend_user($userfriend_id,$subject_message,$content_message); ob_end_clean();
$instans = expectOnce(Display); if(is_string($res)){
$instans1 = expectOnce(Database); $this->assertTrue($res);
//$instans2 = expectOnce(MessageManager); $this->assertTrue(is_string($res));
$this->assertTrue(is_string($res)); } else {
$this->assertTrue(is_object($instans)); $this->assertTrue(is_bool($res));
$this->assertTrue(is_object($instans1)); $this->assertTrue($res === false);
// $this->assertTrue(is_object($instans2)); }
var_dump($res); //var_dump($res);
var_dump($instans); }
var_dump($instans1); /*
}*/ public function TestDeleteCourse(){
$code = 'COURSEX';
$res = CourseManager::delete_course($code);
$path = api_get_path(SYS_PATH).'archive';
if ($handle = opendir($path)) {
while (false !== ($file = readdir($handle))) {
if (strpos($file,$code)!==false) {
if (is_dir($path.'/'.$file)) {
rmdirr($path.'/'.$file);
}
}
}
closedir($handle);
}
}
*/
} }
?> ?>

Write Preview
Loading…
Cancel
Save