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

Tests also were modified + the whoisonline.php

Browse Source
skala
Julio Montoya 15 years ago
parent 5f8bc0710b
commit d831a332f2
3 changed files with 143 additions and 162 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. 46
      tests/main/inc/lib/online.inc.test.php
  2. 249
      tests/test_manager.inc.php
  3. 10
      whoisonline.php

46
tests/main/inc/lib/online.inc.test.php
Unescape View File

@ -21,8 +21,8 @@ class TestOnline extends UnitTestCase {
."</p>";
$res=chatcall();
if(!empty($message)){
$this->assertTrue(is_string($message));
if (!empty($message)) {
$this->assertTrue(is_string($message));
//var_dump($message);
} else {
@ -76,8 +76,8 @@ class TestOnline extends UnitTestCase {
$login_user_id= '';
$login_date= '';
array_push($rarray,$barray);
array_push($barray,$login_user_id);
array_push($barray,$login_date);
array_push($barray,$login_user_id);
array_push($barray,$login_date);
$res=who_is_online_in_this_course($uid, $valid, $coursecode=null);
if(!empty($barray)){
@ -90,11 +90,43 @@ class TestOnline extends UnitTestCase {
//var_dump($rarray);
}
function testWhoIsOnline() {
function testwho_is_online() {
$valid='';
$res=WhoIsOnline($valid);
$res=who_is_online($valid);
$this->assertTrue(is_array($res));
//var_dump($res);
//var_dump($res);
}
function testwho_is_online_in_this_course_count() {
/* $uid='';
$valid='';
$rarray = array();
$barray = array();
$login_user_id= '';
$login_date= '';
array_push($rarray,$barray);
array_push($barray,$login_user_id);
array_push($barray,$login_date);
$res=who_is_online_in_this_course_count($uid, $valid, $coursecode=null);
if(!empty($barray)){
$this->assertTrue(is_array($barray));
//var_dump($str);
} else {
$this->assertTrue(is_bool($barray));
//var_dump($rarray);
}
//var_dump($rarray);*/
}
function testwho_is_online_count() {
/* $valid='';
$res=who_is_online_count($valid);
$this->assertTrue(is_array($res));
//var_dump($res);*/
}
}
?>

249
tests/test_manager.inc.php
Unescape View File

@ -1,38 +1,30 @@
<?php
// $Id: test_manager.inc.php 2010-02-17 12:07:00Z aportugal $
/* For licensing terms, see /license.txt */
/* For licensing terms, see /chamilo_license.txt */
/**
==============================================================================
* Code library for load functions than are needed to test
*
* @author Arthur Portugal, Principal author
* @package chamilo.tests
==============================================================================
*/
/**
* @todo shouldn't these settings be moved to the test_suite.php
* if these are really configuration then we can make require_once in each tests
* file.
* if these are really configuration then we can make require_once in each tests file.
* @todo use this file to load in the setup in each file test.
* @todo use this file to destroy in the teardown in each file test.
* @todo check for duplication of "require_once" files with test_suite.php
* @author aportugal
* @author Arthur Portugal
*/
/*
==============================================================================
INIT SECTION
==============================================================================
*/
ini_set('memory_limit','256M');
ini_set('max_execution_time','0');
/*
-----------------------------------------------------------
Included libraries
-----------------------------------------------------------
*/
$maindir = dirname(__FILE__).'/../main/';
$incdir = dirname(__FILE__).'/../main/inc/';
@ -100,11 +92,7 @@ ob_end_clean();
class TestManager {
/**
==============================================================================
MAIN CODE
==============================================================================
*/
/* MAIN CODE */
/**
* This function create in the database a test course and will also load sessions.
@ -114,111 +102,86 @@ class TestManager {
*/
function create_test_course($course_code = 'COURSETEST') {
/* Table definitions */
$table_course = Database::get_main_table(TABLE_MAIN_COURSE);
$course_table = Database::get_main_table(TABLE_MAIN_COURSE);
$course_cat_table = Database::get_main_table(TABLE_MAIN_CATEGORY);
/*
-----------------------------------------------------------
Table definitions
-----------------------------------------------------------
*/
$table_course = Database::get_main_table(TABLE_MAIN_COURSE);
$course_table = Database::get_main_table(TABLE_MAIN_COURSE);
$course_cat_table = Database::get_main_table(TABLE_MAIN_CATEGORY);
global $_configuration, $_user, $_course, $cidReq;
$cidReq = $course_code;
/*
-----------------------------------------------------------
Check if the course exists
-----------------------------------------------------------
*/
$sql = "SELECT code FROM $table_course WHERE code = '$cidReq' ";
$rs = Database::query($sql, __FILE__, __LINE__);
$row = Database::fetch_row($rs);
/*
-----------------------------------------------------------
Create the course in the database
-----------------------------------------------------------
*/
if (empty($row[0])) {
// create a course
$course_datos = array(
'wanted_code'=> $cidReq,
'title'=>$cidReq,
'tutor_name'=>'John Doe',
'category_code'=>'LANG',
'course_language'=>'spanish',
'course_admin_id'=>'001',
'db_prefix'=> $_configuration['db_prefix'],
'firstExpirationDelay'=>'999'
);
$res = create_course($course_datos['wanted_code'], $course_datos['title'],
$course_datos['tutor_name'], $course_datos['category_code'],
$course_datos['course_language'],$course_datos['course_admin_id'],
$course_datos['db_prefix'], $course_datos['firstExpirationDelay']);
}
$sql = "SELECT course.*, course_category.code faCode, course_category.name faName
FROM $course_table
LEFT JOIN $course_cat_table
ON course.category_code = course_category.code
WHERE course.code = '$cidReq'";
$result = Database::query($sql,__FILE__,__LINE__);
/*
-----------------------------------------------------------
Create the session
-----------------------------------------------------------
*/
if (Database::num_rows($result)>0) {
$cData = Database::fetch_array($result);
$_cid = $cData['code' ];
$_course = array();
$_course['id' ] = $cData['code' ]; //auto-assigned integer
$_course['name' ] = $cData['title' ];
$_course['official_code'] = $cData['visual_code' ]; // use in echo
$_course['sysCode' ] = $cData['code' ]; // use as key in db
$_course['path' ] = $cData['directory' ]; // use as key in path
$_course['dbName' ] = $cData['db_name' ]; // use as key in db list
$_course['dbNameGlu' ] = $_configuration['table_prefix'] . $cData['db_name'] . $_configuration['db_glue']; // use in all queries
$_course['titular' ] = $cData['tutor_name' ];
$_course['language' ] = $cData['course_language' ];
$_course['extLink' ]['url' ] = $cData['department_url' ];
$_course['extLink' ]['name'] = $cData['department_name' ];
$_course['categoryCode'] = $cData['faCode' ];
$_course['categoryName'] = $cData['faName' ];
$_course['visibility' ] = $cData['visibility' ];
$_course['subscribe_allowed'] = $cData['subscribe' ];
$_course['unubscribe_allowed'] = $cData['unsubscribe' ];
api_session_register('_cid');
api_session_register('_course');
}
/*
-----------------------------------------------------------
Load the session
-----------------------------------------------------------
*/
$_SESSION['_user']['user_id'] = 1;
$_SESSION['is_courseAdmin'] = 1;
$_SESSION['show'] = showall;
/*
-----------------------------------------------------------
Load the user
-----------------------------------------------------------
*/
$_user['user_id'] = $_SESSION['_user']['user_id'];
global $_configuration, $_user, $_course, $cidReq;
$cidReq = $course_code;
/* Check if the course exists */
$sql = "SELECT code FROM $table_course WHERE code = '$cidReq' ";
$rs = Database::query($sql, __FILE__, __LINE__);
$row = Database::fetch_row($rs);
/* Create the course in the database */
if (empty($row[0])) {
// Create a course
$course_datos = array(
'wanted_code'=> $cidReq,
'title'=>$cidReq,
'tutor_name'=>'John Doe',
'category_code'=>'LANG',
'course_language'=>'spanish',
'course_admin_id'=>'001',
'db_prefix'=> $_configuration['db_prefix'],
'firstExpirationDelay'=>'999'
);
$res = create_course($course_datos['wanted_code'], $course_datos['title'],
$course_datos['tutor_name'], $course_datos['category_code'],
$course_datos['course_language'],$course_datos['course_admin_id'],
$course_datos['db_prefix'], $course_datos['firstExpirationDelay']);
}
$sql = "SELECT course.*, course_category.code faCode, course_category.name faName
FROM $course_table
LEFT JOIN $course_cat_table
ON course.category_code = course_category.code
WHERE course.code = '$cidReq'";
$result = Database::query($sql,__FILE__,__LINE__);
/* Create the session */
if (Database::num_rows($result)>0) {
$cData = Database::fetch_array($result);
$_cid = $cData['code' ];
$_course = array();
$_course['id' ] = $cData['code' ]; //auto-assigned integer
$_course['name' ] = $cData['title' ];
$_course['official_code'] = $cData['visual_code' ]; // use in echo
$_course['sysCode' ] = $cData['code' ]; // use as key in db
$_course['path' ] = $cData['directory' ]; // use as key in path
$_course['dbName' ] = $cData['db_name' ]; // use as key in db list
$_course['dbNameGlu' ] = $_configuration['table_prefix'] . $cData['db_name'] . $_configuration['db_glue']; // use in all queries
$_course['titular' ] = $cData['tutor_name' ];
$_course['language' ] = $cData['course_language' ];
$_course['extLink' ]['url' ] = $cData['department_url' ];
$_course['extLink' ]['name'] = $cData['department_name' ];
$_course['categoryCode'] = $cData['faCode' ];
$_course['categoryName'] = $cData['faName' ];
$_course['visibility' ] = $cData['visibility' ];
$_course['subscribe_allowed'] = $cData['subscribe' ];
$_course['unubscribe_allowed'] = $cData['unsubscribe' ];
api_session_register('_cid');
api_session_register('_course');
}
/* Load the session */
$_SESSION['_user']['user_id'] = 1;
$_SESSION['is_courseAdmin'] = 1;
$_SESSION['show'] = showall;
/* Load the user */
$_user['user_id'] = $_SESSION['_user']['user_id'];
}
/**
@ -228,37 +191,25 @@ $_user['user_id'] = $_SESSION['_user']['user_id'];
*/
function delete_test_course($course_code) {
$code = $course_code;
$code = $course_code;
$res = CourseManager::delete_course($code);
$path = api_get_path(SYS_PATH).'archive';
/*
-----------------------------------------------------------
Delete the course
-----------------------------------------------------------
*/
$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);
if ($handle = opendir($path)) {
while (false !== ($file = readdir($handle))) {
if (strpos($file,$code)!==false) {
if (is_dir($path.'/'.$file)) {
rmdirr($path.'/'.$file);
}
}
}
closedir($handle);
}
closedir($handle);
}
/*
-----------------------------------------------------------
Check api session destroy
-----------------------------------------------------------
*/
if (!headers_sent() && session_id() != "") {
$res=api_session_destroy();
// Check api session destroy
if (!headers_sent() && session_id() != "") {
$res=api_session_destroy();
}
}
}
}

10
whoisonline.php
Unescape View File

@ -119,16 +119,14 @@ if ($_GET['chatid'] != '') {
if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) || ((api_get_setting('showonline', 'users') == 'true' || api_get_setting('showonline', 'course') == 'true') && $_user['user_id'])) {
if(isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) {
$user_list = Who_is_online_in_this_course($_user['user_id'], api_get_setting('time_limit_whosonline'), $_GET['cidReq']);
$user_list = who_is_online_in_this_course($_user['user_id'], api_get_setting('time_limit_whosonline'), $_GET['cidReq']);
} else {
$user_list = WhoIsOnline(api_get_setting('time_limit_whosonline'));
$user_list = who_is_online(api_get_setting('time_limit_whosonline'));
}
$total = count($user_list);
if (!isset($_GET['id'])) {
Display::display_header(get_lang('UsersOnLineList'));
if (api_get_setting('allow_social_tool') == 'true') {
if (!api_is_anonymous()) {
echo '<div id="social-content-left">';
@ -139,7 +137,7 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
if ($_GET['id'] == '') {
echo '<p><a class="refresh" href="javascript:window.location.reload()">'.get_lang('Refresh').'</a></p>';
//echo '<p><a class="refresh" href="javascript:window.location.reload()">'.get_lang('Refresh').'</a></p>';
} /*else {
if (0) {
// if ($_user['user_id'] && $_GET["id"] != $_user['user_id']) {
@ -161,7 +159,7 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
if (!api_is_anonymous()) {
echo UserManager::get_search_form($_GET['q']);
}
}
}
SocialManager::display_user_list($user_list);
echo '</div>';
} else {

Write Preview
Loading…
Cancel
Save