diff --git a/tests/main/inc/lib/fileUpload.lib.test.php b/tests/main/inc/lib/fileUpload.lib.test.php index 1ad5f7d5f7..a9cedec8d0 100755 --- a/tests/main/inc/lib/fileUpload.lib.test.php +++ b/tests/main/inc/lib/fileUpload.lib.test.php @@ -118,7 +118,7 @@ class TestFileUpload extends UnitTestCase { function testCreateLinkFile() { - $filePath = api_get_path(SYS_PATH).'documentation/readme.html'; + $filePath = api_get_path(SYS_PATH).'documentation/README.txt'; $url = 'http://www.chamilo.com'; $res= create_link_file($filePath, $url); diff --git a/tests/main/inc/lib/geometry.lib.test.php b/tests/main/inc/lib/geometry.lib.test.php index 0fc4d999a6..bc05ad113f 100755 --- a/tests/main/inc/lib/geometry.lib.test.php +++ b/tests/main/inc/lib/geometry.lib.test.php @@ -213,7 +213,7 @@ class TestGeometry extends UnitTestCase { $this->assertFalse($res); //var_dump($res); } - +/* public function TestDeleteCourse(){ $code = 'COURSEX'; $res = CourseManager::delete_course($code); @@ -229,6 +229,6 @@ class TestGeometry extends UnitTestCase { closedir($handle); } } - + */ } ?> diff --git a/tests/main/inc/lib/groupmanager.lib.test.php b/tests/main/inc/lib/groupmanager.lib.test.php index e121918593..61c4f50c60 100755 --- a/tests/main/inc/lib/groupmanager.lib.test.php +++ b/tests/main/inc/lib/groupmanager.lib.test.php @@ -1,11 +1,11 @@ '', 'forum_state'=>'', 'wiki_state'=>'', + 'chat_state' =>'', 'self_registration_allowed'=>'', 'self_unregistration_allowed'=>''); $res = GroupManager::set_group_properties($group['group_id'], $group['name'], $group['description'], $group['maximum_number_of_students'], $group['doc_state'], $group['work_state'], $group['calendar_state'], $group['announcements_state'], - $group['forum_state'],$group['wiki_state'], $group['self_registration_allowed'], + $group['forum_state'],$group['wiki_state'],$group['chat_state'], $group['self_registration_allowed'], $group['self_unregistration_allowed']); $this->assertTrue(is_bool($res)); //var_dump($res); @@ -141,21 +142,23 @@ class TestGroupManager extends UnitTestCase { public function testCreateCategory(){ $categ = array( - 'title'=>'DefaultGroupCategory', - 'description'=>'xxxxx', - 'doc_state'=>'xxxx', - 'work_state'=>'xxxxx', - 'calendar_state'=>'', - 'announcements_state'=>'', - 'forum_state'=>'', - 'wiki_state'=>'', - 'self_registration_allowed'=>'', - 'self_unregistration_allowed'=>'', - 'maximum_number_of_students'=>'', - 'groups_per_user'=>'0'); + 'title'=>'group test', + 'description'=>'description test', + 'doc_state'=> 1, + 'work_state'=> 1, + 'calendar_state'=> 1, + 'announcements_state' => 1, + 'forum_state' => 1, + 'wiki_state' => 1, + 'chat_state' => 1, + 'self_registration_allowed' => TRUE, + 'self_unregistration_allowed' => FALSE, + 'maximum_number_of_students'=> 2, + 'groups_per_user'=>4); $res = GroupManager::create_category($categ['title'], $categ['description'], - $categ['doc_state'], $categ['work_state'], $categ['calendar_state'], $categ['announcements_state'], - $categ['forum_state'],$categ['wiki_state'],$categ['self_registration_allowed'],$categ['self_unregistration_allowed'], + $categ['doc_state'], $categ['work_state'], $categ['calendar_state'], + $categ['announcements_state'], $categ['forum_state'],$categ['wiki_state'], + $categ['chat_state'],$categ['self_registration_allowed'],$categ['self_unregistration_allowed'], $categ['maximum_number_of_students'],$categ['groups_per_user']); $this->assertTrue(is_numeric($res)); //var_dump($res); @@ -164,7 +167,7 @@ class TestGroupManager extends UnitTestCase { public function testUpdateCategory(){ $categ = array( - 'id'=>'1', + 'id'=>2, 'title'=>'DefaultGroupCategory', 'description'=>'xxxxx', 'doc_state'=>'xxxx', @@ -173,13 +176,14 @@ class TestGroupManager extends UnitTestCase { 'announcements_state'=>'', 'forum_state'=>'', 'wiki_state'=>'', + 'chat_state' =>'', 'self_registration_allowed'=>'', 'self_unregistration_allowed'=>'', 'maximum_number_of_students'=>'', 'groups_per_user'=>'0'); $res = GroupManager::update_category($categ['id'], $categ['title'], $categ['description'], $categ['doc_state'], $categ['work_state'], $categ['calendar_state'], $categ['announcements_state'], - $categ['forum_state'],$categ['wiki_state'],$categ['self_registration_allowed'],$categ['self_unregistration_allowed'], + $categ['forum_state'],$categ['wiki_state'], $categ['chat_state'],$categ['self_registration_allowed'],$categ['self_unregistration_allowed'], $categ['maximum_number_of_students'],$categ['groups_per_user']); $this->assertTrue(is_null($res)); $this->assertTrue($res ===null); @@ -406,7 +410,8 @@ class TestGroupManager extends UnitTestCase { } public function testFilterUsersAlreadyInGroup(){ - $user_array_in= 2; + global $_course; + $user_array_in = array(); $group_id = 2; $res = GroupManager::filter_users_already_in_group($user_array_in, $group_id); $this->assertTrue(is_null($res)); @@ -415,7 +420,7 @@ class TestGroupManager extends UnitTestCase { } public function testFilterOnlyStudents(){ - $user_array_in=''; + $user_array_in=array(); $res= GroupManager::filter_only_students($user_array_in); $this->assertTrue(is_array($res)); //var_dump($res); @@ -437,7 +442,7 @@ class TestGroupManager extends UnitTestCase { $this->assertTrue(is_array($res)); //var_dump($res); } - +/* public function TestDeleteCourse(){ $code = 'COURSEX'; $res = CourseManager::delete_course($code); @@ -453,6 +458,6 @@ class TestGroupManager extends UnitTestCase { closedir($handle); } } - +*/ } ?> diff --git a/tests/main/inc/lib/image.lib.test.php b/tests/main/inc/lib/image.lib.test.php index d7ca6d491b..22089d76f5 100755 --- a/tests/main/inc/lib/image.lib.test.php +++ b/tests/main/inc/lib/image.lib.test.php @@ -18,21 +18,21 @@ class TestImage extends UnitTestCase { public function testAddBackGround() { $bgfile=''; - $res=$this->timage->addbackground($bgfile); + $res = image::addbackground($bgfile); $this->assertTrue(is_null($res)); //var_dump($bgfile); - } + } public function testAddLogo() { $file=''; - $res=$this->timage->addlogo($file); + $res = image::addlogo($file); $this->assertTrue(is_null($res)); //var_dump($res); } public function testaddtext() { $text=''; - $res=$this->timage->addtext($text); + $res = image::addtext($text); $this->assertTrue(is_null($res)); //var_dump($res); } @@ -40,71 +40,74 @@ class TestImage extends UnitTestCase { public function testcreateimagefromtype() { $file=''; $handler=''; - $res=$this->timage->createimagefromtype($file,$handler); + $res = image::createimagefromtype($file,$handler); $this->assertTrue(is_null($res)); //var_dump($res); } - public function testimagenaddback() { + public function testimageaddback() { $bgfile=''; - $res=$this->timage->image($bgfile); + $res = image::image($bgfile); $this->assertTrue(is_null($res)); //var_dump($res); - } public function testmakecolor() { $red=''; $green=''; $blue=''; - $res=$this->timage->makecolor($red, $green, $blue); + $res = image::makecolor($red, $green, $blue); $this->assertTrue(is_null($res)); //var_dump($res); - } + } public function testmergelogo() { $x=''; $y=''; - $res=$this->timage->mergelogo($x,$y); + $res = image::mergelogo($x,$y); $this->assertTrue(is_bool($res)); //var_dump($res); - } + } public function testresize() { $thumbw=''; $thumbh=''; $border=''; - $res=$this->timage->resize($thumbw , $thumbh , $border); + $res = image::resize($thumbw , $thumbh , $border); $this->assertTrue(is_null($res)); //var_dump($res); } - public function testsend_image() { + public function testsend_image() { $type=''; - $res=$this->timage->send_image($type); + $res = image::send_image($type); $this->assertTrue(is_numeric($res)); //var_dump($res); - } + } public function testsetfont() { $fontfile=$this->fontfile; - $res=$this->timage->setfont($fontfile); + $res = image::setfont($fontfile); $this->assertTrue(is_null($res)); //var_dump($res); } - - - - - - - - - - - - - +/* + 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); + } + } +*/ } ?> diff --git a/tests/test_suite.php b/tests/test_suite.php index c198b9d80f..af258dfb6f 100755 --- a/tests/test_suite.php +++ b/tests/test_suite.php @@ -2,24 +2,23 @@ //Set the time limit for the tests ini_set('memory_limit','256M'); -ini_set('max_execution_time','0'); $maindir = dirname(__FILE__).'/../main/'; $libdir = dirname(__FILE__).'/../main/inc/lib/'; - - $incdir = dirname(__FILE__).'/../main/inc/'; + //Need the ob start and clean else will show the objects require_once $incdir.'global.inc.php'; //List of files than need the tests +ob_start(); require_once 'simpletest/unit_tester.php'; require_once 'simpletest/web_tester.php'; require_once 'simpletest/mock_objects.php'; require_once 'simpletest/autorun.php'; +ob_start(); require_once $libdir.'urlmanager.lib.php'; require_once $libdir.'fileDisplay.lib.php'; -require_once $maindir.'permissions/permissions_functions.inc.php'; require_once $libdir.'groupmanager.lib.php'; require_once $libdir.'course.lib.php'; require_once $libdir.'usermanager.lib.php'; @@ -27,7 +26,7 @@ require_once $libdir.'social.lib.php'; require_once $libdir.'xht.lib.php'; require_once $libdir.'xmd.lib.php'; require_once $libdir.'formvalidator/FormValidator.class.php'; - +ob_end_clean(); //Need the ob start and clean else will show the objects @@ -40,19 +39,20 @@ require_once $incdir.'tool_navigation_menu.inc.php'; require_once $incdir.'banner.inc.php'; ob_end_clean(); + //List of files than need the tests since chamilo +ob_start(); +require_once $maindir.'permissions/permissions_functions.inc.php'; require_once $maindir.'admin/calendar.lib.php'; require_once $maindir.'admin/statistics/statistics.lib.php'; -require_once $incdir.'lib/usermanager.lib.php'; require_once $maindir.'survey/survey.lib.php'; require_once $maindir.'install/install_upgrade.lib.php'; require_once $incdir.'lib/fileManage.lib.php'; +ob_end_clean(); class AllTestsSuite extends TestSuite { function setUp() { - global $_configuration, $_user, $_course, $cidReq; - $cidReq = 'COURSEX'; // check if course exists $table_course = Database::get_main_table(TABLE_MAIN_COURSE); @@ -120,83 +120,94 @@ class AllTestsSuite extends TestSuite { } function AllTestsSuite() { + ob_start(); $this->setUp(); $this->TestSuite('All tests suite'); //List of files from all.test.php -/* - // problemas con el envio de cabeceras - faltan corregir estas funciones - - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/groupmanager.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/image.lib.test.php'); + //funciones corregidas por Ricardo + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/add_course.lib.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/blog.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/classmanager.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/course.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/database.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/debug.lib.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/display.lib.test.php'); +// $this->addTestFile(dirname(__FILE__).'/main/inc/lib/document.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/events.lib.inc.test.php'); +// $this->addTestFile(dirname(__FILE__).'/main/inc/lib/export.lib.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/fileDisplay.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/fileManage.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/fileUpload.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/geometry.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/groupmanager.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/image.lib.test.php'); $this->addTestFile(dirname(__FILE__).'/main/inc/lib/import.lib.test.php'); $this->addTestFile(dirname(__FILE__).'/main/inc/lib/internationalization.lib.test.php'); -*/ -/* - //funciones q faltan corregir parta carlos - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/surveymanager.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/system_announcements.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/usermanager.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/xht.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/xmd.lib.test.php'); -*/ - //Funciones probadas - $this->addTestFile(dirname(__FILE__).'/main/install/install_upgrade.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/database.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/add_course.lib.inc.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/course.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/banner.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/session_handler.class.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/sessionmanager.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/classmanager.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/export.lib.inc.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/legal.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/mail.lib.inc.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/message.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/online.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/legal.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/mail.lib.inc.test.php'); + + + //faltan corregir estas funciones + +// $this->addTestFile(dirname(__FILE__).'/main/inc/lib/main_api.lib.test.php'); +/* $this->addTestFile(dirname(__FILE__).'/main/inc/lib/message.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/online.inc.test.php'); $this->addTestFile(dirname(__FILE__).'/main/inc/lib/security.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/specific_fields_manager.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/social.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/sortabletable.class.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/statsUtils.lib.inc.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/tablesort.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/text.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/tracking.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/blog.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/urlmanager.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/stats.lib.inc.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/course_document.lib.test.php'); +*/ + + //carlos +// $this->addTestFile(dirname(__FILE__).'/main/inc/lib/stats.lib.inc.test.php'); +// $this->addTestFile(dirname(__FILE__).'/main/inc/lib/surveymanager.lib.test.php'); +// $this->addTestFile(dirname(__FILE__).'/main/inc/lib/system_announcements.lib.test.php'); + + //$this->addTestFile(dirname(__FILE__).'/main/inc/lib/usermanager.lib.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/inc/lib/xht.lib.test.php'); + //$this->addTestFile(dirname(__FILE__).'/main/inc/lib/xmd.lib.test.php'); + + //Funciones probadas por carlos + +// $this->addTestFile(dirname(__FILE__).'/main/inc/lib/tracking.lib.test.php'); +// $this->addTestFile(dirname(__FILE__).'/main/inc/lib/urlmanager.lib.test.php'); + +/* + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/session_handler.class.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/sessionmanager.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/specific_fields_manager.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/social.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/sortabletable.class.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/statsUtils.lib.inc.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/tablesort.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/lib/text.lib.test.php'); +*/ + //Funciones corregidas por Arthur + //List of files from all.test1.php + $this->addTestFile(dirname(__FILE__).'/main/inc/banner.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/inc/course_document.lib.test.php'); $this->addTestFile(dirname(__FILE__).'/main/inc/tool_navigation_menu.inc.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/display.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/document.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/events.lib.inc.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/fileDisplay.lib.test.php'); - // - /*$this->addTestFile(dirname(__FILE__).'/main/inc/lib/fileManage.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/geometry.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/admin/calendar.lib.test.php'); + //List of files from all.test2.php + $this->addTestFile(dirname(__FILE__).'/main/admin/calendar.lib.test.php'); $this->addTestFile(dirname(__FILE__).'/main/admin/statistics/statistics.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/admin/sub_language.class.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/auth/lost_password.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/auth/openid/xrds.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/auth/lost_password.lib.test.php'); +/* $this->addTestFile(dirname(__FILE__).'/main/auth/openid/xrds.lib.test.php'); $this->addTestFile(dirname(__FILE__).'/main/chat/chat_functions.lib.test.php'); $this->addTestFile(dirname(__FILE__).'/main/conference/get_translation.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/exercice/hotpotatoes.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/exercice/hotpotatoes.lib.test.php'); $this->addTestFile(dirname(__FILE__).'/main/newscorm/scorm.lib.test.php'); $this->addTestFile(dirname(__FILE__).'/main/survey/survey.lib.test.php'); $this->addTestFile(dirname(__FILE__).'/main/user/userInfoLib.test.php'); $this->addTestFile(dirname(__FILE__).'/main/webservices/user_import/import.lib.test.php'); - $this->addTestFile(dirname(__FILE__).'/main/work/work.lib.test.php'); - - */ - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/main_api.lib.test.php');//al final - $this->addTestFile(dirname(__FILE__).'/main/inc/lib/debug.lib.inc.test.php'); - //$this->addTestFile(dirname(__FILE__).'/main/inc/lib/fileUpload.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/work/work.lib.test.php'); + $this->addTestFile(dirname(__FILE__).'/main/install/install_upgrade.lib.test.php'); + //List of files from all.test3.php + $this->addTestFile(dirname(__FILE__).'/main/admin/sub_language.class.test.php'); +*/ +ob_end_clean(); } } $test = &new AllTestsSuite(); -?> \ No newline at end of file +?>