merge

main/inc/lib/usermanager.lib.php

@@ -874,7 +874,7 @@ class UserManager
 	 */
 	public static function remove_user_production($user_id, $production) {
 		$production_path = self::get_user_picture_path_by_id($user_id, 'system', true);
-		unlink($production_path['dir'].$user_id.'/'.$production);
+		unlink($production_path['dir'].$production);
 	}
 
 	/**

main/inc/lib/xht.lib.php

@@ -353,20 +353,15 @@ function xhtdoc($htt_file_contents)
 function _show_param()  // for debugging info
 {
 	global $charset;
-
     $result = '';
-
     foreach ($this->xht_param as $k => $v)
-        if ($v !== $this->_prev_param[$k])
-        {
+        if ($v !== $this->_prev_param[$k]) {
             $this->_prev_param[$k] = $v; $result .= ', ' . $k . ': ' .
                 ((api_strlen($v) <= 20) ? $v : api_substr($v, 0, 17).'...');
         }
-
     return $result ? htmlspecialchars(api_substr($result, 1), ENT_QUOTES, $charset) : '';
 }
 
-
 function _lang($var, $cur_elem = 0)
 {
     $result = @call_user_func($this->xht_get_lang, $var, $cur_elem);

tests/main/inc/lib/system_announcements.lib.test.php

@@ -10,8 +10,13 @@ class TestSystemAnnouncementManager extends UnitTestCase {
 		$content='';
 		$date_start='';
 		$date_end='';
+		$visible_teacher = 0;
+		$visible_student = 0;
+		$visible_guest = 0;
+		$lang = null;
+		$send_mail=0;
 		ob_start();
-		$res=SystemAnnouncementManager::add_announcement($title, $content, $date_start, $date_end, $visible_teacher = 0, $visible_student = 0, $visible_guest = 0, $lang = null, $send_mail=0);
+		$res=SystemAnnouncementManager::add_announcement($title, $content, $date_start, $date_end, $visible_teacher, $visible_student, $visible_guest, $lang = null, $send_mail);
         $this->assertTrue(is_bool($res));
         ob_end_clean();
         //var_dump($res);
@@ -68,10 +73,10 @@ class TestSystemAnnouncementManager extends UnitTestCase {
 		global $_user;
 		global $_setting;
 		global $charset;
-		$title='';
-		$content='';
-		$teacher='';
-		$student='';
+		$title='Arthur';
+		$content='mariconsito';
+		$teacher='portu';
+		$student='potu';
 		$res=SystemAnnouncementManager::send_system_announcement_by_email($title,$content,$teacher, $student);
 		$this->assertTrue(is_null($res));
         //var_dump($res);
@@ -81,7 +86,7 @@ class TestSystemAnnouncementManager extends UnitTestCase {
 		$announcement_id='';
 		$user='';
 		$visible='';
-		$res=SystemAnnouncementManager::set_visibility();
+		$res=SystemAnnouncementManager::set_visibility($announcement_id, $user, $visible);
 		$this->assertTrue(is_bool($res));
         //var_dump($res);
 	}

tests/main/inc/lib/usermanager.lib.test.php

@@ -313,8 +313,8 @@ class TestUserManager extends UnitTestCase
 	 }
 
 	 function testRemoveUserProduction() {
-	 	$user_id='121';
-	 	$production='field variable';
+	 	$user_id=1;
+	 	$production='my_files';
 	 	$res=UserManager::remove_user_production($user_id,$production);
 	 	$this->assertTrue(is_null($res));
 	 }
@@ -349,14 +349,15 @@ class TestUserManager extends UnitTestCase
 	 	$this->assertTrue(is_null($res));
 
 	}
-
+/*
+//DEPRECATED
 	function testSuscribeUsersToSession() {
-	  	$id_session='123';
+	  	$id_session=1;
 	  	$UserList='';
-	  	$res=UserManager::suscribe_users_to_session($id_session,$UserList,null);
+	  	$res=UserManager::suscribe_users_to_session($id_session,$UserList);
 	 	$this->assertTrue(is_null($res));
 	}
-
+*/
 	function testUpdateApiKey() {
 		$user_id=121;
 		$api_service='string';
@@ -368,8 +369,8 @@ class TestUserManager extends UnitTestCase
 	}
 
 	function testUpdateExtraField() {
-		$fid='5';
-		$columns=null;
+		$fid=5;
+		$columns=array();
 		$res=UserManager::update_extra_field($fid,$columns);
 	 	$this->assertTrue(is_bool($res));
 	}

tests/test_suite.php

@@ -154,19 +154,27 @@ class AllTestsSuite extends TestSuite {
          
 		
         
-	   // $this->addTestFile(dirname(__FILE__).'/main/inc/lib/stats.lib.inc.test.php'); 
+	   //$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/tracking.lib.test.php');
-
-
-	  
-	    //$this->addTestFile(dirname(__FILE__).'/main/inc/lib/urlmanager.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');
+	    $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');