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

Fixed the files session_handler, session_manager,social,specific_fields and table_sort, for the integration test suite CT#191

Browse Source
skala
Carlos Vargas 15 years ago
parent 3f7431a976
commit 53ea5d28b1
5 changed files with 22 additions and 69 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. 1
      tests/main/inc/lib/session_handler.class.test.php
  2. 24
      tests/main/inc/lib/sessionmanager.lib.test.php
  3. 57
      tests/main/inc/lib/social.lib.test.php
  4. 5
      tests/main/inc/lib/specific_fields_manager.lib.test.php
  5. 4
      tests/main/inc/lib/tablesort.lib.test.php

1
tests/main/inc/lib/session_handler.class.test.php
Unescape View File

@ -1,5 +1,4 @@
<?php <?php
// To can run this test you need comment the line 94 "exit"
require_once(api_get_path(LIBRARY_PATH).'session_handler.class.php'); require_once(api_get_path(LIBRARY_PATH).'session_handler.class.php');
class TestSessionHandler extends UnitTestCase { class TestSessionHandler extends UnitTestCase {

24
tests/main/inc/lib/sessionmanager.lib.test.php
Unescape View File

@ -2,17 +2,13 @@
require_once(api_get_path(LIBRARY_PATH).'sessionmanager.lib.php'); require_once(api_get_path(LIBRARY_PATH).'sessionmanager.lib.php');
Mock::generate('Database');
Mock::generate('api_failure');
class TestSessionManager extends UnitTestCase { class TestSessionManager extends UnitTestCase {
function testadd_courses_to_session() { function testadd_courses_to_session() {
$id_session=''; $id_session='';
$course_list=''; $course_list='';
ob_start(); ob_start();
$res=SessionManager::add_courses_to_session(); $res=SessionManager::add_courses_to_session($id_session,$course_list);
if(!empty($res)) { if(!empty($res)) {
$this->assertTrue(is_null($res)); $this->assertTrue(is_null($res));
} else { } else {
@ -23,7 +19,6 @@ class TestSessionManager extends UnitTestCase {
} }
function testcreate_session() { function testcreate_session() {
$idsesion = new MockDatabase();
global $_user; global $_user;
$sname=''; $sname='';
$syear_start=''; $syear_start='';
@ -36,15 +31,15 @@ class TestSessionManager extends UnitTestCase {
$snb_days_acess_after=''; $snb_days_acess_after='';
$nolimit=''; $nolimit='';
$coach_username=''; $coach_username='';
$id_session_category='';
$id_visibility='';
$id_session=Database::insert_id(); $id_session=Database::insert_id();
ob_start(); ob_start();
$res=SessionManager::create_session($sname,$syear_start,$smonth_start,$sday_start,$syear_end,$smonth_end,$sday_end,$snb_days_acess_before,$snb_days_acess_after,$nolimit,$coach_username); $res=SessionManager::create_session($sname,$syear_start,$smonth_start,$sday_start,$syear_end,$smonth_end,$sday_end,$snb_days_acess_before,$snb_days_acess_after,$nolimit,$coach_username,$id_session_category,$id_visibility);
$idsesion->expectOnce(Database::insert_id());
$this->assertTrue(is_object($idsesion));
$this->assertTrue(is_numeric($id_session)); $this->assertTrue(is_numeric($id_session));
$this->assertTrue(is_string($res)); $this->assertTrue(is_string($res));
ob_end_clean(); ob_end_clean();
//var_dump($idsesion); //var_dump($id_session);
} }
function testcreate_session_extra_field() { function testcreate_session_extra_field() {
@ -74,7 +69,6 @@ class TestSessionManager extends UnitTestCase {
*/ */
function testedit_session() { function testedit_session() {
$idsesion = new MockDatabase();
global $_user; global $_user;
$id=1; $id=1;
$name=''; $name='';
@ -88,9 +82,9 @@ class TestSessionManager extends UnitTestCase {
$nb_days_acess_after=''; $nb_days_acess_after='';
$nolimit=''; $nolimit='';
$id_coach=''; $id_coach='';
$res=SessionManager::edit_session($id,$name,$year_start,$month_start,$day_start,$year_end,$month_end,$day_end,$nb_days_acess_before,$nb_days_acess_after,$nolimit,$id_coach); $id_session_category='';
$idsesion->expectOnce(Database::escape_string($name)); $id_visibility='';
$this->assertTrue(is_object($idsesion)); $res=SessionManager::edit_session($id,$name,$year_start,$month_start,$day_start,$year_end,$month_end,$day_end,$nb_days_acess_before,$nb_days_acess_after,$nolimit,$id_coach, $id_session_category, $id_visibility);
$this->assertTrue(is_numeric($id)); $this->assertTrue(is_numeric($id));
$this->assertTrue(is_string($res)); $this->assertTrue(is_string($res));
//var_dump($id); //var_dump($id);
@ -104,7 +98,7 @@ class TestSessionManager extends UnitTestCase {
} }
function testrelation_session_course_exist() { function testrelation_session_course_exist() {
$session_id=''; $session_id=1;
$course_id=''; $course_id='';
$res=SessionManager::relation_session_course_exist($session_id, $course_id); $res=SessionManager::relation_session_course_exist($session_id, $course_id);
if(!is_numeric($res)) $this->assertTrue(is_bool($res)); if(!is_numeric($res)) $this->assertTrue(is_bool($res));

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

@ -39,32 +39,28 @@ class TestSocial extends UnitTestCase{
} }
*/ */
/*
//Remove or deprecate
public function testRemovedFriend(){ public function testRemovedFriend(){
$instans= new MockDatabase(); //$instans= new MockDatabase();
$instans1= 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,'' ); $instans->expectCallCount(Database,8,'' );
$instans1->expectMaximumCallCount(Database,10,''); $instans1->expectMaximumCallCount(Database,10,'');
$this->assertTrue(is_object($instans)); //$this->assertTrue(is_object($instans));
$this->assertTrue(is_object($instans1)); //$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($instans);
//var_dump($instans1); //var_dump($instans1);
} }
*/
public function testShowListTypeFriends(){ public function testShowListTypeFriends(){
$instans= new MockDatabase();
$instans1= new MockDatabase();
$res =SocialManager::show_list_type_friends(); $res =SocialManager::show_list_type_friends();
$instans->expectOnce(Database);
$instans1->expectMaximumCallCount(Database,10,'');
$this->assertTrue(is_object($instans) || is_object($instans1));
$this->assertTrue($res); $this->assertTrue($res);
$this->assertTrue(is_array($res)); $this->assertTrue(is_array($res));
$this->assertTrue($instans);
//var_dump($res); //var_dump($res);
//var_dump($instans1); //var_dump($instans1);
} }
@ -80,22 +76,13 @@ class TestSocial extends UnitTestCase{
} }
public function testGetRelationBetweenContacts (){ public function testGetRelationBetweenContacts (){
$instans= new MockDatabase();
$instans1= new MockDatabase();
$instans2= new MockDatabase();
$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);
$instans->expectOnce(Database);
$instans1->expectMinimumCallCount(Database);
$instans2->expectMaximumCallCount(Database);
if(!is_numeric($res)): if(!is_numeric($res)):
$this->assertTrue(is_string($res)); $this->assertTrue(is_string($res));
$this->assertTrue($res); $this->assertTrue($res);
endif; endif;
$this->assertTrue(is_object($instans));
$this->assertTrue(is_object($instans1));
$this->assertTrue(is_object($instans2));
//var_dump($res); //var_dump($res);
//var_dump($instans); //var_dump($instans);
//var_dump($instans1); //var_dump($instans1);
@ -116,14 +103,11 @@ class TestSocial extends UnitTestCase{
} }
*/ */
public function testGetListPathWebByUserId(){ public function testGetListPathWebByUserId(){
$instans = new MockUserManager();
$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);
$instans->expectOnce(UserManager::get_user_picture_path_by_id($values_ids['friend_user_id'],'web',false,true));
if(!($res===true)): if(!($res===true)):
$this->assertTrue(is_object($instans));
$this->assertTrue(is_array($res)); $this->assertTrue(is_array($res));
endif; endif;
//var_dump($res); //var_dump($res);
@ -131,84 +115,62 @@ class TestSocial extends UnitTestCase{
} }
public function testGetListWebPathUserInvitationByUserId(){ public function testGetListWebPathUserInvitationByUserId(){
$instans = new MockUserManager();
$user_id=1; $user_id=1;
$res = SocialManager::get_list_web_path_user_invitation_by_user_id($user_id); $res = SocialManager::get_list_web_path_user_invitation_by_user_id($user_id);
$instans->expectOnce(UserManager::get_user_picture_path_by_id($values_ids['user_sender_id'],'web',false,true));
if(is_array($res)) if(is_array($res))
$this->assertTrue(is_array($res)); $this->assertTrue(is_array($res));
else else
$this->assertTrue(is_null($res)); $this->assertTrue(is_null($res));
$this->assertTrue(is_object($instans));
//var_dump($res); //var_dump($res);
//var_dump($instans); //var_dump($instans);
} }
public function testSendInvitationFriend(){ public function testSendInvitationFriend(){
$instans = new MockDatabase();
$user_id=1; $user_id=1;
$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);
$instans->expectMaximumCallCount(Database);
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;
$this->assertTrue(is_object($instans));
//var_dump($res); //var_dump($res);
//var_dump($instans); //var_dump($instans);
} }
public function testGetMessageNumberInvitationByUserId(){ public function testGetMessageNumberInvitationByUserId(){
$instans = new MockDatabase();
$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);
$instans->expectMaximumCallCount(Database);
if(is_string($res)): if(is_string($res)):
$this->assertTrue(is_numeric($res)); $this->assertTrue(is_numeric($res));
endif; endif;
$this->assertTrue(is_object($instans));
//var_dump($res); //var_dump($res);
//var_dump($instans); //var_dump($instans);
} }
public function testGetListInvitationOfFriendsByUserId(){ public function testGetListInvitationOfFriendsByUserId(){
$instans = new MockDatabase();
$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);
$instans->expectCallCount(Database,3,'');
$this->assertTrue(is_array($res)); $this->assertTrue(is_array($res));
$this->assertTrue(is_object($instans));
//var_dump($res); //var_dump($res);
//var_dump($instans); //var_dump($instans);
} }
public function testInvitationAccepted(){ public function testInvitationAccepted(){
$instans = new MockDatabase();
$instans1= new MockDatabase();
$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);
$instans->expectOnce(Database::get_main_table(TABLE_MAIN_MESSAGE));
$instans1->expectOnce(Database::query($sql,__FILE__,__LINE__));
$this->assertTrue(is_null($res)); $this->assertTrue(is_null($res));
$this->assertTrue(is_object($instans));
$this->assertTrue(is_object($instans1));
//var_dump($res); //var_dump($res);
//var_dump($instans); //var_dump($instans);
//var_dump($instans1); //var_dump($instans1);
} }
public function testInvitationDenied(){ public function testInvitationDenied(){
$instans = new MockDatabase();
$user_send_id=1; $user_send_id=1;
$user_receiver_id=3; $user_receiver_id=3;
$res = SocialManager::invitation_denied($user_send_id,$user_receiver_id); $res = SocialManager::invitation_denied($user_send_id,$user_receiver_id);
$instans->expectOnce(Database::query($sql,__FILE__,__LINE__));
$this->assertTrue(is_object($instans));
$this->assertTrue(is_null($res)); $this->assertTrue(is_null($res));
//var_dump($res); //var_dump($res);
//var_dump($instans); //var_dump($instans);
@ -217,13 +179,10 @@ class TestSocial extends UnitTestCase{
public function testQualifyFriend(){ public function testQualifyFriend(){
$instans = new MockDatabase();
$id_friend_qualify=2; $id_friend_qualify=2;
$type_qualify=1; $type_qualify=1;
$res = SocialManager::qualify_friend($id_friend_qualify,$type_qualify); $res = SocialManager::qualify_friend($id_friend_qualify,$type_qualify);
$instans->expectOnce(Database::query($sql,__FILE__,__LINE__));
$this->assertTrue(is_null($res)); $this->assertTrue(is_null($res));
$this->assertTrue(is_object($instans));
//var_dump($res); //var_dump($res);
} }
/* /*

5
tests/main/inc/lib/specific_fields_manager.lib.test.php
Unescape View File

@ -36,7 +36,8 @@ class TestSpecificFieldsManager extends UnitTestCase {
$course_id=''; $course_id='';
$tool_id=''; $tool_id='';
$ref_id=''; $ref_id='';
$res=delete_all_specific_field_value($course_id, $tool_id, $ref_id); $id_specific_field='';
$res=delete_all_specific_field_value($course_id, $id_specific_field, $tool_id, $ref_id);
$this->assertTrue(is_null($res)); $this->assertTrue(is_null($res));
//var_dump($res); //var_dump($res);
} }
@ -79,7 +80,7 @@ class TestSpecificFieldsManager extends UnitTestCase {
$prefix=''; $prefix='';
$course_code=''; $course_code='';
$tool_id=''; $tool_id='';
$ref_id=''; $ref_id=1;
$table_sf = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD); $table_sf = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD);
$table_sfv = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD_VALUES); $table_sfv = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD_VALUES);
$sql = sprintf($sql, $table_sf, $table_sfv, $prefix, $course_code, $tool_id, $ref_id); $sql = sprintf($sql, $table_sf, $table_sfv, $prefix, $course_code, $tool_id, $ref_id);

4
tests/main/inc/lib/tablesort.lib.test.php
Unescape View File

@ -49,7 +49,7 @@ class TestTablesort extends UnitTestCase{
} }
public function testIsDateColumn(){ public function testIsDateColumn(){
$data=''; $data=array();
$column=''; $column='';
$res = TableSort::is_date_column($data, $column); $res = TableSort::is_date_column($data, $column);
if(is_bool($res)) if(is_bool($res))
@ -61,7 +61,7 @@ class TestTablesort extends UnitTestCase{
} }
public function testIsImageColumn(){ public function testIsImageColumn(){
$data=''; $data=array();
$column=''; $column='';
$res = TableSort::is_image_column($data, $column); $res = TableSort::is_image_column($data, $column);
if(is_bool($res)){ if(is_bool($res)){

Write Preview
Loading…
Cancel
Save