Feature #539 - Shallow cleaning other files. The leading tabs have been converted to spaces.

skala
Ivan Tcholakov 15 years ago
parent 3c2f08101c
commit 2559adbb4b
  1. 1
      main/webservices/index.html
  2. 6918
      main/webservices/registration.soap.php
  3. 265
      tests/main/announcements/announcements.inc.test.php
  4. 282
      tests/main/inc/lib/add_course.lib.inc.test.php

@ -1,6 +1,5 @@
<html>
<head>
<meta http-equiv="refresh" content="0; url=../gradebook.php">
</head>
<body>
</body>

File diff suppressed because it is too large Load Diff

@ -1,136 +1,137 @@
<?php
require_once(api_get_path(SYS_CODE_PATH).'announcements/announcements.inc.php');
require_once(api_get_path(LIBRARY_PATH).'course.lib.php');
require_once(api_get_path(LIBRARY_PATH).'add_course.lib.inc.php');
require_once(api_get_path(LIBRARY_PATH).'groupmanager.lib.php');
/* For licensing terms, see /license.txt */
require_once api_get_path(SYS_CODE_PATH).'announcements/announcements.inc.php';
require_once api_get_path(LIBRARY_PATH).'course.lib.php';
require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'groupmanager.lib.php';
class TestAnnouncements extends UnitTestCase {
function TestAnnouncements(){
$this->UnitTestCase('Displays one specific announcement test');
}
/*public function Testdisplay_announcement(){
global $_user, $dateFormatLong, $_course;
global $defaultVisibilityForANewCourse, $error_msg;
ob_start();
//create course
$courseSysCode= '142';
$courseScreenCode='142';
$courseRepository='142';
$courseDbName='dokeos_142';
$titular='R. F. Wolfgan';
$category='1';
$title='prueba111';
$course_language='english';
$uidCreator='1';
global $course_code;
$course_code = $courseSysCode;
prepare_course_repository($courseRepository,$courseSysCode);
update_Db_course($courseDbName);
$pictures_array=fill_course_repository($courseRepository);
fill_Db_course($courseDbName, $courseRepository, $course_language,$pictures_array);
$res1 = register_course($courseSysCode, $courseScreenCode, $courseRepository, $courseDbName, $titular, $category, $title, $course_language, $uidCreator, $expiration_date = "", $teachers=array());
$_course = api_get_course_info($courseSysCode);
// display announcement in the course added
$announcements_id= 1;
$res2 = display_announcement($announcements_id);
ob_end_clean();
$this->assertTrue(is_numeric($res1));
$res3 = CourseManager::delete_course($courseSysCode);
//var_dump($res1);
//var_dump($res2);
}
public function Testshow_to_form(){
$to_already_selected = "";
$_SESSION['_cid'] = 'CURSO1';
$res = show_to_form($to_already_selected);
$this->assertTrue(is_null($res));
//var_dump($res);
}*/
public function Testconstruct_not_selected_select_form(){
$courseSysCode= '123';
$course_code = $courseSysCode;
ob_start();
$to_already_selected="";
$_SESSION['_cid'] = 'CURSO1';
$user_list = array( 0=>array(
0 => '1','user_id' => '1',
1 =>'Doe','lastname' =>'Doe',
2 =>'John','firstname' =>'John',
3 => 'admin','username' =>'admin'
));
$res = construct_not_selected_select_form($group_list=null, $user_list,$to_already_selected);
ob_end_clean();
$this->assertTrue(is_null($res));
//var_dump($res);
}
public function Testconstruct_selected_select_form(){
$to_already_selected="";
ob_start();
$res = construct_selected_select_form($group_list=null, $user_list=null,$to_already_selected);
ob_end_clean();
$this->assertTrue(is_null($res));
//var_dump($res);
}
public function Testshow_to_form_group(){
ob_start();
$group_id=1;
$group_users=GroupManager::get_subscribed_users($group_id);
$res = show_to_form_group($group_id);
ob_end_clean();
$this->assertTrue(is_null($res));
//var_dump($res);
}
public function Testget_course_users(){
$_SESSION['id_session'] = 'CURSO1';
$user_list = CourseManager::get_real_and_linked_user_list(api_get_course_id(), true, $_SESSION['id_session']);
$res = get_course_users();
if($res = array($res)){
$this->assertTrue(is_array($res));
} else {
$this->assertTrue(is_null($res));
}
//var_dump($res);
}
public function Testget_course_groups(){
$_SESSION['id_session']='CURSO1';
$new_group_list = CourseManager::get_group_list_of_course(api_get_course_id(), intval($_SESSION['id_session']));
$res = get_course_groups();
$this->assertFalse($res);
$this->assertTrue(is_array($res));
var_dump($res);
}
public function Testload_edit_users(){
$_SESSION['id_session']='CURSO1';
global $_course;
global $tbl_item_property;
$tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
$tool = '';
$id = '';
$res = load_edit_users($tool, $id);
$this->assertTrue(is_null($res));
var_dump($res);
}
/*
public function Testsent_to_form(){
$group_names=get_course_groups();
$sent_to_array='';
$res = sent_to_form($sent_to_array);
$this->assertTrue(is_null($res));
var_dump($res);
}*/
function TestAnnouncements(){
$this->UnitTestCase('Displays one specific announcement test');
}
/*public function Testdisplay_announcement(){
global $_user, $dateFormatLong, $_course;
global $defaultVisibilityForANewCourse, $error_msg;
ob_start();
//create course
$courseSysCode= '142';
$courseScreenCode='142';
$courseRepository='142';
$courseDbName='dokeos_142';
$titular='R. F. Wolfgan';
$category='1';
$title='prueba111';
$course_language='english';
$uidCreator='1';
global $course_code;
$course_code = $courseSysCode;
prepare_course_repository($courseRepository,$courseSysCode);
update_Db_course($courseDbName);
$pictures_array=fill_course_repository($courseRepository);
fill_Db_course($courseDbName, $courseRepository, $course_language,$pictures_array);
$res1 = register_course($courseSysCode, $courseScreenCode, $courseRepository, $courseDbName, $titular, $category, $title, $course_language, $uidCreator, $expiration_date = "", $teachers=array());
$_course = api_get_course_info($courseSysCode);
// display announcement in the course added
$announcements_id= 1;
$res2 = display_announcement($announcements_id);
ob_end_clean();
$this->assertTrue(is_numeric($res1));
$res3 = CourseManager::delete_course($courseSysCode);
//var_dump($res1);
//var_dump($res2);
}
public function Testshow_to_form(){
$to_already_selected = "";
$_SESSION['_cid'] = 'CURSO1';
$res = show_to_form($to_already_selected);
$this->assertTrue(is_null($res));
//var_dump($res);
}*/
public function Testconstruct_not_selected_select_form(){
$courseSysCode= '123';
$course_code = $courseSysCode;
ob_start();
$to_already_selected="";
$_SESSION['_cid'] = 'CURSO1';
$user_list = array( 0=>array(
0 => '1','user_id' => '1',
1 =>'Doe','lastname' =>'Doe',
2 =>'John','firstname' =>'John',
3 => 'admin','username' =>'admin'
));
$res = construct_not_selected_select_form($group_list=null, $user_list,$to_already_selected);
ob_end_clean();
$this->assertTrue(is_null($res));
//var_dump($res);
}
public function Testconstruct_selected_select_form(){
$to_already_selected="";
ob_start();
$res = construct_selected_select_form($group_list=null, $user_list=null,$to_already_selected);
ob_end_clean();
$this->assertTrue(is_null($res));
//var_dump($res);
}
public function Testshow_to_form_group(){
ob_start();
$group_id=1;
$group_users=GroupManager::get_subscribed_users($group_id);
$res = show_to_form_group($group_id);
ob_end_clean();
$this->assertTrue(is_null($res));
//var_dump($res);
}
public function Testget_course_users(){
$_SESSION['id_session'] = 'CURSO1';
$user_list = CourseManager::get_real_and_linked_user_list(api_get_course_id(), true, $_SESSION['id_session']);
$res = get_course_users();
if($res = array($res)){
$this->assertTrue(is_array($res));
} else {
$this->assertTrue(is_null($res));
}
//var_dump($res);
}
public function Testget_course_groups(){
$_SESSION['id_session']='CURSO1';
$new_group_list = CourseManager::get_group_list_of_course(api_get_course_id(), intval($_SESSION['id_session']));
$res = get_course_groups();
$this->assertFalse($res);
$this->assertTrue(is_array($res));
var_dump($res);
}
public function Testload_edit_users(){
$_SESSION['id_session']='CURSO1';
global $_course;
global $tbl_item_property;
$tbl_item_property = Database::get_course_table(TABLE_ITEM_PROPERTY);
$tool = '';
$id = '';
$res = load_edit_users($tool, $id);
$this->assertTrue(is_null($res));
var_dump($res);
}
/*
public function Testsent_to_form(){
$group_names=get_course_groups();
$sent_to_array='';
$res = sent_to_form($sent_to_array);
$this->assertTrue(is_null($res));
var_dump($res);
}*/
}
?>

@ -1,168 +1,170 @@
<?php
require_once(api_get_path(LIBRARY_PATH).'add_course.lib.inc.php');
require_once(api_get_path(LIBRARY_PATH).'course.lib.php');
/* For licensing terms, see /license.txt */
require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
require_once api_get_path(LIBRARY_PATH).'course.lib.php';
class TestAddCourse extends UnitTestCase {
function TestAddCourse() {
function TestAddCourse() {
$this->UnitTestCase('Courses creation - main/inc/lib/add_course.lib.inc.test.php');
}
function TestCreateCourse(){
global $_configuration;
$course_datos = array(
'wanted_code'=> 'testcourse',
'title'=>'prueba01',
'tutor_name'=>'John Doe',
'category_code'=>'Lang',
'course_language'=>'english',
'course_admin_id'=>'1',
'db_prefix'=> $_configuration['db_prefix'],
'firstExpirationDelay'=>'120'
);
$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']);
//should be code string if succeeded (false if failed)
$this->assertTrue(is_string($res));
global $_configuration;
$course_datos = array(
'wanted_code'=> 'testcourse',
'title'=>'prueba01',
'tutor_name'=>'John Doe',
'category_code'=>'Lang',
'course_language'=>'english',
'course_admin_id'=>'1',
'db_prefix'=> $_configuration['db_prefix'],
'firstExpirationDelay'=>'120'
);
$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']);
//should be code string if succeeded (false if failed)
$this->assertTrue(is_string($res));
}
function testRegisterCourse() {
global $_configuration;
global $_configuration;
$course = array(
'courseSysCode'=> 'testcourse',
'courseScreenCode' =>'testcourse',
'courseRepository' =>'testcourse',
'courseDbName' => $_configuration['db_prefix'].'testcourse',
'titular' =>'John Doe',
'category' =>'Lang',
'title' =>'test course',
'course_language' =>'english',
'uidCreator'=> '1',
);
$res = register_course($course['courseSysCode'],$course['courseScreenCode'],
$course['courseRepository'],$course['courseDbName'],
$course['titular'],$course['category'],$course['title'],
$course['course_language'],$course['uidCreator'],
null,null
);
$this->assertTrue($res === 0);
$res = CourseManager::delete_course($course['courseSysCode']);
'courseSysCode'=> 'testcourse',
'courseScreenCode' =>'testcourse',
'courseRepository' =>'testcourse',
'courseDbName' => $_configuration['db_prefix'].'testcourse',
'titular' =>'John Doe',
'category' =>'Lang',
'title' =>'test course',
'course_language' =>'english',
'uidCreator'=> '1',
);
$res = register_course($course['courseSysCode'],$course['courseScreenCode'],
$course['courseRepository'],$course['courseDbName'],
$course['titular'],$course['category'],$course['title'],
$course['course_language'],$course['uidCreator'],
null,null
);
$this->assertTrue($res === 0);
$res = CourseManager::delete_course($course['courseSysCode']);
}
function TestGenerateCourseCode(){
global $charset;
$course_title = 'testcourse';
$res = generate_course_code($course_title);
$this->assertTrue($res);
}
global $charset;
$course_title = 'testcourse';
$res = generate_course_code($course_title);
$this->assertTrue($res);
}
function TestDefineCourseKeys(){
global $prefixAntiNumber, $_configuration;
$wantedCode = generate_course_code($wantedCode);
$res = define_course_keys(generate_course_code($wantedCode), null, null, null,null, null);
$this->assertTrue($res);
}
function TestDefineCourseKeys(){
global $prefixAntiNumber, $_configuration;
$wantedCode = generate_course_code($wantedCode);
$res = define_course_keys(generate_course_code($wantedCode), null, null, null,null, null);
$this->assertTrue($res);
}
/* // 26 excepciones
function TestPrepareCourseRepository(){
//umask(0); // This function is not thread-safe.
$perm = '0777';
$courseRepository = 'C16';
$courseId = 'COD16';
$res = prepare_course_repository($courseRepository, $courseId);
$res1 = CourseManager::delete_course('C16');
$this->assertTrue($res===0);
}
// Problemas con este archivo - falta analizar esta función
function TestUpdateDbCourse(){
global $_configuration;
$dbcourse = array('courseDbName'=> 'COD16');
$res = update_Db_course($dbcourse['courseDbName']);
$this->assertTrue($res===0);
//var_dump($res);
}
function TestPrepareCourseRepository(){
//umask(0); // This function is not thread-safe.
$perm = '0777';
$courseRepository = 'C16';
$courseId = 'COD16';
$res = prepare_course_repository($courseRepository, $courseId);
$res1 = CourseManager::delete_course('C16');
$this->assertTrue($res===0);
}
// Problemas con este archivo - falta analizar esta función
function TestUpdateDbCourse(){
global $_configuration;
$dbcourse = array('courseDbName'=> 'COD16');
$res = update_Db_course($dbcourse['courseDbName']);
$this->assertTrue($res===0);
//var_dump($res);
}
*/
function TestBrowseFolders(){
$browse = array('path'=>'','file'=>'','media'=>'');
$res = browse_folders($browse['path'], $browse['files'],$browse['media']);
$this->assertFalse($res);
}
/*
// 1 excepcion
function TestSortPictures(){
$picture = array('files'=>'science.jpg', 'type'=>'jpg');
$res = sort_pictures($picture['file'],$picture['type']);
$this->assertTrue(is_array($res));
//var_dump($res);
}
*/
/*
function TestFillCourseRepository(){
$courseRepository = 'testcourse';
$res = fill_course_repository($courseRepository);
$this->assertTrue($res);
}
function TestBrowseFolders(){
$browse = array('path'=>'','file'=>'','media'=>'');
$res = browse_folders($browse['path'], $browse['files'],$browse['media']);
$this->assertFalse($res);
}
/*
// 1 excepcion
function TestSortPictures(){
$picture = array('files'=>'science.jpg', 'type'=>'jpg');
$res = sort_pictures($picture['file'],$picture['type']);
$this->assertTrue(is_array($res));
//var_dump($res);
}
*/
/*
function TestFillCourseRepository(){
$courseRepository = 'testcourse';
$res = fill_course_repository($courseRepository);
$this->assertTrue($res);
}
*/
function TestLang2db(){
$string = 'test';
$res = lang2db($string);
$this->assertTrue($res);
}
function TestFillDbCourse(){
global $_configuration, $clarolineRepositoryWeb, $_user;
$courseDbName = $_configuration['table_prefix'].$courseDbName.$_configuration['db_glue'];
$courseRepository = (api_get_path(SYS_COURSE_PATH).$courseRepository . "/dropbox/.htaccess");
$language = 'english';
$language_interface = $language;
$default_document_array = array();
$sys_course_path = api_get_path(SYS_COURSE_PATH);
$courseDbName = $_configuration['db_prefix'].$courseDbName.$_configuration['db_glue'];
$courseRepository = 'testcourse';
$language = 'english';
$default_document_array ='testdocument';
$res = fill_Db_course($courseDbName, $courseRepository, $language,array());
$this->assertTrue($res === 0);
}
function TestString2Binary(){
$variable = true;
$res = string2binary($variable);
$this->assertTrue($res);
}
function TestCheckArchive(){
$dirarchive = api_get_path(SYS_PATH);
$pathToArchive = $dirarchive.'archive';
$res = checkArchive($pathToArchive);
$this->assertTrue($res === TRUE);
}
function TestLang2db(){
$string = 'test';
$res = lang2db($string);
$this->assertTrue($res);
}
function TestFillDbCourse(){
global $_configuration, $clarolineRepositoryWeb, $_user;
$courseDbName = $_configuration['table_prefix'].$courseDbName.$_configuration['db_glue'];
$courseRepository = (api_get_path(SYS_COURSE_PATH).$courseRepository . "/dropbox/.htaccess");
$language = 'english';
$language_interface = $language;
$default_document_array = array();
$sys_course_path = api_get_path(SYS_COURSE_PATH);
$courseDbName = $_configuration['db_prefix'].$courseDbName.$_configuration['db_glue'];
$courseRepository = 'testcourse';
$language = 'english';
$default_document_array ='testdocument';
$res = fill_Db_course($courseDbName, $courseRepository, $language,array());
$this->assertTrue($res === 0);
}
function TestString2Binary(){
$variable = true;
$res = string2binary($variable);
$this->assertTrue($res);
}
function TestCheckArchive(){
$dirarchive = api_get_path(SYS_PATH);
$pathToArchive = $dirarchive.'archive';
$res = checkArchive($pathToArchive);
$this->assertTrue($res === TRUE);
}
public function TestDeleteCourse(){
$code = 'testcourse';
$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);
}
}
$code = 'testcourse';
$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);
}
}
}

Loading…
Cancel
Save