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

Modified the test of the blog's test file to eliminated the exceptions, Modified the load_global adding user admin by default.

Browse Source
skala
Ricardo Rodriguez 15 years ago
parent 8137af0bf9
commit b95a59e6c9
3 changed files with 217 additions and 163 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. 19
      main/inc/lib/blog.lib.php
  2. 1
      tests/load_global.php
  3. 360
      tests/main/inc/lib/blog.lib.test.php

19
main/inc/lib/blog.lib.php
Unescape View File

@ -224,8 +224,8 @@ class Blog {
public static function create_post ($title, $full_text, $file_comment, $blog_id) {
global $_user;
global $_course;
global $blog_table_attachment;
$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
$upload_ok=true;
$has_attachment=false;
$current_date=date('Y-m-d H:i:s',time());
@ -2878,14 +2878,13 @@ class Blog {
*/
function get_blog_attachment($blog_id, $post_id=null,$comment_id=null)
{
global $blog_table_attachment;
$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
$blog_id = Database::escape_string($blog_id);
$comment_id = Database::escape_string($comment_id);
$post_id = Database::escape_string($post_id);
$row=array();
$where='';
if (!empty ($post_id) && is_numeric($post_id))
{
$where.=' AND post_id ="'.$post_id.'" ';
@ -2899,9 +2898,9 @@ function get_blog_attachment($blog_id, $post_id=null,$comment_id=null)
}
$where.=' comment_id ="'.$comment_id.'" ';
}
$sql = 'SELECT path, filename, comment FROM '. $blog_table_attachment.' WHERE blog_id ="'.intval($blog_id).'" '.$where;
$result=Database::query($sql, __FILE__, __LINE__);
if (Database::num_rows($result)!=0)
{
@ -2921,9 +2920,9 @@ function get_blog_attachment($blog_id, $post_id=null,$comment_id=null)
function delete_all_blog_attachment($blog_id,$post_id=null,$comment_id=null)
{
global $blog_table_attachment;
global $_course;
global $_course;
$blog_table_attachment = Database::get_course_table(TABLE_BLOGS_ATTACHMENT);
$blog_id = Database::escape_string($blog_id);
$comment_id = Database::escape_string($comment_id);
$post_id = Database::escape_string($post_id);

1
tests/load_global.php
Unescape View File

@ -62,5 +62,6 @@
}
$_SESSION['_user']['user_id'] = 1;
$_SESSION['is_courseAdmin'] = 1;
?>

360
tests/main/inc/lib/blog.lib.test.php
Unescape View File

@ -2,10 +2,10 @@
require_once(api_get_path(LIBRARY_PATH).'blog.lib.php');
ob_start();
require_once (api_get_path(INCLUDE_PATH).'lib/fckeditor/fckeditor.php');
require_once(api_get_path(LIBRARY_PATH).'course.lib.php');
//require_once(api_get_path(SYS_CODE_PATH).'permissions/blog_permissions.inc.php');
ob_end_clean();
class TestBlog extends UnitTestCase
{
@ -21,11 +21,50 @@ class TestBlog extends UnitTestCase
public function setUp()
{
$this-> oblog = new Blog();
global $_configuration;
$course_code = 'COURSEX';
// check if course exists
$table_course = Database::get_main_table(TABLE_MAIN_COURSE);
$sql = "SELECT code FROM $table_course WHERE code = '$course_code' ";
$rs = Database::query($sql, __FILE__, __LINE__);
$row = Database::fetch_row($rs);
require_once api_get_path(SYS_PATH).'tests/main/inc/lib/add_course.lib.inc.test.php';
if (empty($row[0])) {
// create a course
$course_datos = array(
'wanted_code'=> 'COURSEX',
'title'=>'COURSEX',
'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']);
}
}
public function tearDown()
{
$this->oblog = null;
$res1 = CourseManager::delete_course('COURSEX');
$path = api_get_path(SYS_PATH).'archive';
if ($handle = opendir($path)) {
while (false !== ($file = readdir($handle))) {
if (strpos($file,'COURSEX')!==false) {
if (is_dir($path.'/'.$file)) {
rmdirr($path.'/'.$file);
}
}
}
closedir($handle);
}
}
/*
@ -80,68 +119,65 @@ class TestBlog extends UnitTestCase
/**
* Test about get Title to a Blog
*/
// EXCEPTION
public function testGetBlogTitle(){
$res = $this->oblog->get_Blog_title(11);
$this->assertFalse($this->oblog->get_Blog_title(11)===String);
$this->assertTrue(is_String($res));
}
// EXCEPTION
public function testGetBlogSubtitle(){
$res = $this->oblog->get_Blog_subtitle(0);
$this->assertFalse($this->oblog->get_Blog_subtitle(0)=== null);
$this->assertTrue(is_String($res));
$this->assertNotNull($res);
}
// EXCEPTION
public function testGetBlogUsers(){
$res = $this->oblog->get_Blog_users(11);
$this->assertTrue($this->oblog->get_Blog_users(1110)===array());
$this->assertTrue(is_array($res));
}
// EXCEPTION
public function testCreateBlog(){
global $_user;
$res = $this->oblog->create_Blog('testingBlog','pass');
$this->assertTrue(is_null($res));
$this->assertNull($res);
$this->assertFalse($res);
}
// EXCEPTION
public function testEditBlog(){
global $_user;
$_user = array('Blog_id'=>1,'title'=>'TestBlog','subtitle'=>'testing');
$res = $this->oblog->edit_Blog($_user);
$blog_id = 1;
$title = 'titulo1';
$subtitle = 'subtitulo1';
$res = $this->oblog->edit_Blog($blog_id, $title, $subtitle);
$this->assertNull($res);
$this->assertTrue($this->oblog->edit_Blog($_user)=== $res);
$this->assertTrue($this->oblog->edit_Blog($blog_id, $title, $subtitle)=== $res);
$this->assertFalse($res);
}
// EXCEPTION
public function testDeleteBlog(){
$res = $this->oblog->delete_Blog(1);
$blog_id = 1;
$res = $this->oblog->delete_Blog($blog_id);
$this->assertTrue(is_null($res));
$this->assertNotNull($this->oblog->edit_Blog(1)===null);
$this->assertFalse(is_array($res));
}
// EXCEPTION
public function testCreatePost(){
global $_user, $_course, $Blog_table_attachment;
$Blog_table_attachment = array('title' => 'xxxxtestxxxx',
'full_text'=>'xxxxx',
'file_comment'=>'xxxxx',
'Blog_id'=>11
);
$res = $this->oblog->create_post($Blog_table_attachment);
$this->assertTrue($this->oblog->create_post($Blog_table_attachment)=== null);
global $_user, $_course;
$title = 'xxxxtestxxxx';
$full_text = 'xxxxx';
$file_comment = 'xxxxx';
$blog_id = 1;
$res = $this->oblog->create_post($title, $full_text, $file_comment, $blog_id);
$this->assertTrue($this->oblog->create_post($title, $full_text, $file_comment, $blog_id)=== null);
$this->assertNotNull(is_null,$res);
$this->assertFalse($res);
}
// EXCEPTION
public function testEditPost(){
ob_start();
$post_id =3;
@ -155,7 +191,7 @@ class TestBlog extends UnitTestCase
$this->assertTrue(is_null($res));
//var_dump($res);
}
// EXCEPTION
public function testDeletePost(){
$Blog_id = 11;
$post_id = 21;
@ -172,9 +208,8 @@ class TestBlog extends UnitTestCase
$this->assertNotNull($this->oblog->create_comment('tesingBlog','xxxxxxx','xxx',12,1,null)===null);
$this->assertTrue(is_null($res));
$this->assertFalse($res);
}
// EXCEPTION
public function testDeleteComment(){
$res = $this->oblog->delete_comment(11,12,2);
$this->assertNotNull($this->oblog->delete_comment(11,12,2)===null);
@ -187,87 +222,100 @@ class TestBlog extends UnitTestCase
$this->assertTrue(is_null($res));
$this->assertFalse($res);
$this->assertFalse(null,$res);
}
// EXCEPTION
public function testEditTask() {
$res = $this->oblog->edit_task();
$blog_id = 1;
$task_id = 2;
$title = 'xxxxxx';
$description = 'xx';
$articleDelete = 'aaa';
$articleEdit = 'axa';
$commentsDelete = 'xax';
$color = 'red';
$res = $this->oblog->edit_task($blog_id, $task_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color);
//$res = Blog::edit_task();
$this->assertTrue($this->oblog->edit_task()===null);
$this->assertTrue($this->oblog->edit_task($blog_id, $task_id, $title, $description, $articleDelete, $articleEdit, $commentsDelete, $color)===null);
$this->assertTrue(is_null($res));
$this->assertFalse(is_string($res));
$this->assertNull($res);
}
// EXCEPTION
public function testDeleteTask(){
$res = $this->oblog->delete_task();
$this->assertTrue($this->oblog->delete_task()===null);
$blog_id = 1;
$task_id = 2;
$res = $this->oblog->delete_task($blog_id, $task_id);
$this->assertTrue($this->oblog->delete_task($blog_id, $task_id)===null);
$this->assertTrue(is_null($res));
}
public function testDeleteAssignedTask(){
$res = $this->oblog->delete_assigned_task();
$this->assertTrue($this->oblog->delete_assigned_task()===null);
$blog_id = 1;
$task_id = 2;
$user_id = 1;
$res = $this->oblog->delete_assigned_task($blog_id, $task_id,$user_id);
$this->assertTrue($this->oblog->delete_assigned_task($blog_id, $task_id,$user_id)===null);
$this->assertNotNull(is_null($res));
$this->assertFalse($res);
}
public function testGetPersonalTaskList(){
global $_user;
ob_start();
$res = Blog::get_personal_task_list('a');
$this->assertEqual($this->oblog->get_personal_task_list(1)===1);
$this->assertFalse($res);
ob_end_clean();
}
public function testChangeBlogVisibility(){
$res = $this->oblog->change_blog_visibility();
$this->assertTrue($this->oblog->change_blog_visibility()=== null);
$blog_id = 1;
$res = $this->oblog->change_blog_visibility($blog_id);
$this->assertTrue($this->oblog->change_blog_visibility($blog_id)=== null);
$this->assertTrue(is_null($res));
}
public function testDisplayBlogPosts(){
ob_start();
$res = $this->oblog->display_blog_posts(10,null,null);
$this->assertTrue($this->oblog->display_blog_posts(10,null,null)=== null);
$blog_id = 1;
$filter = '1=1';
$max_number_of_posts = 20;
$res = BLog::display_blog_posts($blog_id, $filter, $max_number_of_posts);
$this->assertTrue($this->oblog->display_blog_posts($blog_id, $filter, $max_number_of_posts)=== null);
ob_end_clean();
$this->assertNull($res);
$this->assertTrue(is_null($res));
$this->assertFalse(null, $res);
ob_end_clean();
}
public function testDisplaySearchResults(){
ob_start();
$res = $this->oblog->display_search_results(11,null);
$this->assertTrue($this->oblog->display_search_results(11,null)===null);
$blog_id = 1;
$query_string = '"SELECT post.*, user.lastname, user.firstname FROM $tbl_blogs_posts"';
$res = $this->oblog->display_search_results($blog_id, $query_string);
ob_end_clean();
$this->assertTrue(is_null($res));
$this->assertNull($res);
}
public function testDisplayDayResults(){
ob_start();
$res = $this->oblog->display_day_results(12,null);
$this->assertTrue($this->oblog->display_day_results(12,null)===null);
$blog_id = 1;
$query_string = '01-01-2010';
$res = $this->oblog->display_day_results($blog_id, $query_string);
ob_end_clean();
$this->assertTrue(is_null($res));
$this->assertFalse($res);
$this->assertNull(null,$res);
ob_end_clean();
}
public function testDisplayPost(){
ob_start();
$res = $this->oblog->display_post(12,11);
$this->assertTrue($this->oblog->display_post(12,11)===null);
$this->assertFalse($res);
$this->assertTrue(is_null($res));
$blog_id = 1;
$post_id = 2;
$res = $this->oblog->display_post($blog_id, $post_id);
ob_end_clean();
$this->assertTrue(is_null($res));
$this->assertFalse($res);
}
public function testAddRating(){
@ -276,7 +324,6 @@ class TestBlog extends UnitTestCase
$this->assertFalse($this->oblog->add_rating(null,11,2,5)=== bool);
$this->assertTrue(is_bool($res));
$this->assertFalse(null,$res);
}
public function testDisplayRating(){
@ -286,7 +333,6 @@ class TestBlog extends UnitTestCase
$this->assertTrue(is_numeric($res));
$this->assertFalse($res);
ob_end_clean();
}
public function testDisplayRatingForm(){
@ -295,43 +341,40 @@ class TestBlog extends UnitTestCase
$this->assertFalse($this->oblog->display_rating_form('xxx',11,1,null)===null);
$this->assertTrue(is_string($res));
$this->assertNotNull($res,null);
}
public function testGetThreadedComments(){
ob_start();
$current = 0;
$current_level = 0;
$blog_id = 1;
$post_id = 2;
$task_id = 0;
global $charset, $dataFormatLong;
$res = $this->oblog->get_threaded_comments(null,null,11,2,null);
$this->assertFalse($res);
$this->assertTrue($this->oblog->get_threaded_comments(null,null,11,2,null)===null);
$res = $this->oblog->get_threaded_comments($current, $current_level, $blog_id, $post_id, $task_id);
ob_end_clean();
$this->assertFalse($res);
$this->assertTrue(is_null($res));
}
/**
* this function have will be testing with mocks
*/ /* usando mock */
/* public function testDisplayFormNewPost(){
// $mock = new Mock('FCKeditor');
ob_start();
$res = $this->oblog->display_form_new_post(12);
//$res = ob_get_contents();
// $mock->expectOnce('FCKeditor','post_full_text');
$this->assertTrue($this->oblog->display_form_new_post(12));
$this->assertTrue(is_string($res));
$this->assertNotNull($res);
ob_end_clean();
public function testDisplayFormNewPost(){
ob_start();
$blog_id = 1;
$res = Blog::display_form_new_post($blog_id);
$this->assertTrue(is_null($res));
$this->assertNull($res);
ob_end_clean();
}
/* usando mock */
public function testDisplayFormEditPost(){
ob_start();
$res = $this->oblog->display_form_edit_post(null);
$blog_id = 1;
$post_id = 2;
$res = $this->oblog->display_form_edit_post($blog_id, $post_id);
$this->assertNotNull(is_null($res));
$this->assertFalse($res);
ob_end_clean();
//var_dump($res);
}
public function testDisplayTaskList(){
@ -339,9 +382,8 @@ class TestBlog extends UnitTestCase
$res = $this->oblog->display_task_list(11);
$this->assertTrue($this->oblog->display_task_list(11)===null);
ob_end_clean();
}
// exceptions
public function testDisplayAssignedTaskList(){
ob_start();
global $charset, $color2;
@ -349,7 +391,6 @@ class TestBlog extends UnitTestCase
$this->assertTrue($this->oblog->display_assigned_task_list(11)===null);
$this->assertFalse($res);
ob_end_clean();
}
public function testDisplayNewTaskForm(){
@ -360,7 +401,7 @@ class TestBlog extends UnitTestCase
ob_end_clean();
}
// exceptions /*
public function testDisplayEditTaskForm(){
ob_start();
$res = $this->oblog->display_edit_task_form(11,12);
@ -370,7 +411,7 @@ class TestBlog extends UnitTestCase
$this->assertFalse($res);
}
// exceptions
public function testDisplayAssignTaskForm(){
ob_start();
$res = $this->oblog->display_assign_task_form(11);
@ -379,7 +420,7 @@ class TestBlog extends UnitTestCase
$this->assertTrue(is_null($res));
ob_end_clean();
}
// exceptions
public function testDisplayEditAssignedTaskForm(){
global $MonthsLong;
ob_start();
@ -389,7 +430,7 @@ class TestBlog extends UnitTestCase
$this->assertFalse($res);
}
// excetions
public function testAssignTask(){
ob_start();
$res = $this->oblog->assign_task(11,1,12,null);
@ -397,9 +438,8 @@ class TestBlog extends UnitTestCase
$this->assertFalse(is_numeric($res));
$this->assertNull(null,$res);
ob_end_clean();
}
// exceptions
public function testEditAssignedTask(){
$task = array('blog_id'=>11,
'user_id'=>1,
@ -409,12 +449,11 @@ class TestBlog extends UnitTestCase
'old_task_id'=>11,
'old_target_date'=>'xxxzxxx'
);
$res = $this->oblog->edit_assigned_task();
$this->assertTrue($this->oblog->edit_assigned_task()===null);
$res = $this->oblog->edit_assigned_task($task['blog_id'],$task['user_id'], $task['task_id'], $task['target_date'], $task['old_user_id'], $task['old_task_id'], $task['old_target_date']);
$this->assertNull($res);
$this->assertTrue(is_null($res));
}
// EXCEPTIONS
public function testDisplaySelectTaskPost(){
ob_start();
$res = $this->oblog->display_select_task_post(11,12);
@ -422,25 +461,22 @@ class TestBlog extends UnitTestCase
$this->assertTrue(is_null($res));
$this->assertFalse($res);
ob_end_clean();
}
}
public function testSetUserSubscribed(){
$res = $this->oblog->set_user_subscribed(11,12);
$this->assertTrue($this->oblog->set_user_subscribed(11,12)===null);
$this->assertFalse($res);
$this->assertTrue(is_null($res));
}
}
public function testUserUnsubscribed(){
$res = $this->oblog->set_user_unsubscribed(11,12);
$this->assertTrue($this->oblog->set_user_unsubscribed(11,12)===null);
$this->assertFalse($res);
$this->assertTrue(is_null($res));
}
// exception
public function testDisplayFormUserSubscribe(){
ob_start();
$res = $this->oblog->display_form_user_subscribe(12);
@ -448,31 +484,24 @@ class TestBlog extends UnitTestCase
$this->assertNotNull(is_null($res));
$this->assertFalse($res);
ob_end_clean();
}
/**
* this function have been tested modified the function
* display_form_user_unsubscribe in the blog.lib.php
* main_table and course_table.
*
*/ /* usando mocks *//* ERROR
*/public function testDisplayFormUserUnsubscribe(){
/**
* this function have been tested modified the function
* display_form_user_unsubscribe in the blog.lib.php
* main_table and course_table.
*
*/
public function testDisplayFormUserUnsubscribe(){
global $_user;
ob_start();
$blog_id = '1';
$res = Blog::display_form_user_unsubscribe($blog_id);
$this->assertTrue(($res)===false);
$this->assertTrue(is_bool($res));
$this->assertTrue(is_null($res));
$this->assertNull($res);
ob_end_clean();
var_dump($res);
//$this->assertFalse($this->oblog->display_form_user_unsubscribe($blog_id,$course_id)==='0001');
//$this->assertFalse($res);
//$this->assertTrue(is_null($res));
//$this->assertTrue(is_array($res));
}
public function testDisplayFormUserRights(){
@ -482,31 +511,30 @@ class TestBlog extends UnitTestCase
$this->assertFalse($res);
ob_end_clean();
}
/* usando mocks ERROR */
public function testDisplayNewCommentForm(){
$blog_id = '12';
$post_id='1';
$title='test';
ob_start();
$res =$this->oblog->display_new_comment_form($blog_id,$post_id,$title);
//$res = ob_get_contents();
//$this->assertTrue($this->oblog->display_new_comment_form(12,1,'comment_text')===null);
$this->assertFalse($res);
$this->assertNotNull(is_null($res));
ob_end_clean();
//var_dump($res);
}
// exception
public function testDisplayMinimonthcalendar(){
global $_user,$DaysShort, $MonthsLong;
ob_start();
$res = $this->oblog->display_minimonthcalendar();
$this->assertTrue($this->oblog->display_minimonthcalendar()=== null);
$month = 12;
$year = 2010;
$blog_id = 1;
$res = $this->oblog->display_minimonthcalendar($month, $year, $blog_id);
$this->assertTrue($this->oblog->display_minimonthcalendar($month, $year, $blog_id)=== null);
$this->assertTrue(is_null($res));
ob_end_clean();
}
public function testDisplayNewBlogForm(){
ob_start();
$res = $this->oblog->display_new_blog_form();
@ -514,16 +542,14 @@ class TestBlog extends UnitTestCase
$this->assertTrue(is_null($res));
$this->assertTrue($this->oblog->display_new_blog_form()===null);
ob_end_clean();
}
// exception
public function testDisplayEditBlogForm(){
ob_start();
$res = $this->oblog->display_edit_blog_form(12);
$this->assertTrue($this->oblog->display_edit_blog_form(12)===null);
$this->assertTrue(is_null($res));
ob_end_clean();
}
public function testDisplayBlogList(){
@ -533,37 +559,65 @@ class TestBlog extends UnitTestCase
$this->assertTrue(is_null($res));
ob_end_clean();
}
// EXCEPTION
public function testGetBlogAttachment(){
ob_start();
global $blog_table_attachment;
$oblog_table_attachment = array('blog_id'=>12);
$res=get_blog_attachment();
ob_end_clean();
global $_configuration;
$blog_id = '0';
$post_id = null;
$comment_id = null;
$res = get_blog_attachment($blog_id, $post_id,$comment_id);
$this->assertFalse($res);
$this->assertTrue(is_array($res));
ob_end_clean();
}
// EXCEPTION
public function testDeleteAllBlogAttachment(){
global $blog_table_attachment, $_course;
$res = delete_all_blog_attachment(12,null,null);
global $_course,$_configuration;
$blog_id = 1;
$post_id=null;
$comment_id=null;
$res = delete_all_blog_attachment($blog_id,$post_id,$comment_id);
$this->assertFalse($res);
$this->assertNull($res);
}
// EXCEPTION
}
public function testGetBlogPostFromUser(){
$res = get_blog_post_from_user('mate',2);
global $_configuration;
$res = get_blog_post_from_user('chamilo_COURSEX',1);
$this->assertFalse($res);
$this->assertTrue(is_string($res));
}
// EXCEPTION
public function testGetBlogCOmmentFromUser(){
$res = get_blog_comment_from_user('mate',2);
public function testGetBlogCommentFromUser(){
global $_configuration;
$course_datos['wanted_code'] = 'chamilo_COURSEX';
$user_id = 1;
$res = get_blog_comment_from_user($course_datos['wanted_code'],1);
$this->assertFalse($res);
$this->assertTrue(is_string($res));
$path = api_get_path(SYS_PATH).'archive';
if ($handle = opendir($path)) {
while (false !== ($file = readdir($handle))) {
if (strpos($file,'COURSEX')!==false) {
if (is_dir($path.'/'.$file)) {
rmdirr($path.'/'.$file);
}
}
}
closedir($handle);
}
}
public function testDeleteCourse() {
global $cidReq;
$resu = CourseManager::delete_course($cidReq);
}
}
?>
}
?>
Write Preview
Loading…
Cancel
Save