Feature #347 - Quality tests: Removing the parameters __FILE__ and __LINE__ in the Database::query() calls.

tests/main/chat/chat_functions.lib.test.php

@@ -45,7 +45,7 @@ class TestChatFunctions extends UnitTestCase {
 		} else {
 			$query="UPDATE $tbl_chat_connected set last_connection='".$current_time."' WHERE user_id=1 AND session_id='$session_id'";
 		}
-		Database::query($query,__FILE__,__LINE__);
+		Database::query($query);
 	}
 
 

tests/main/exercice/hotpotatoes.lib.test.php

@@ -156,7 +156,7 @@ class TestHotpotatoes extends UnitTestCase {
 		$comment='testing this function';
 		$comment = Database::escape_string($comment);
 		$query = "UPDATE $dbTable set comment='$comment' where path='$path'";
-		$result = Database::query($query,__FILE__,__LINE__);
+		$result = Database::query($query);
 		$res=SetComment($path,$comment);
 		$this->assertTrue(is_string($res));
 		//var_dump($resu);

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

@@ -204,7 +204,7 @@ class TestCourse extends UnitTestCase{
 	public function testGetVirtualCourseList(){
 		$course_table = Database :: get_main_table(TABLE_MAIN_COURSE);
 		$sql_query = "SELECT * FROM $course_table WHERE target_course_code IS NOT NULL";
-		$sql_result = Database::query($sql_query, __FILE__, __LINE__);
+		$sql_result = Database::query($sql_query);
 		$result = Database::fetch_array($sql_result);
 		$virtual_course_list[] = $result;
 		$res=$this->tcourse->get_virtual_course_list();

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

@@ -45,7 +45,7 @@ class TestDatabase extends UnitTestCase {
 
 	public function testFetchArray() {
 		$sql = 'select 1';
-		$res=Database::query($sql,__FILE__,__LINE__);
+		$res=Database::query($sql);
 		$resu=$this->dbase->fetch_array($res);
 		$this->assertTrue(is_array($resu));
 		$this->assertFalse(is_null($resu));
@@ -53,21 +53,21 @@ class TestDatabase extends UnitTestCase {
 
 	public function testFetchArrayError() {
 		$sql ="SELECT  1";
-		$res=Database::query($sql,__FILE__,__LINE__);
+		$res=Database::query($sql);
 		$resu=$this->dbase->fetch_array($res);
 		$this->assertTrue(is_array($resu));
 	}
 
 	function testFetchObject() {
 		$sql ="SELECT  1";
-		$res=Database::query($sql,__FILE__,__LINE__);
+		$res=Database::query($sql);
 		$resu=$this->dbase->fetch_object($res);
 		$this->assertTrue(is_object($resu));
 	}
 
 	function testFetchRow() {
 		$sql ="SELECT  1";
-		$res=Database::query($sql,__FILE__,__LINE__);
+		$res=Database::query($sql);
 		$resu=$this->dbase->fetch_row($res);
 		$this->assertTrue(is_array($resu));
 	}
@@ -282,13 +282,13 @@ class TestDatabase extends UnitTestCase {
 
 	function testQuery() {
 		$sql ="SELECT 1";
-		$res=$this->dbase->query($sql,__FILE__,__LINE__);
+		$res=$this->dbase->query($sql);
 		$this->assertTrue(is_resource($res));
 	}
 
 	function testResult() {
 		$sql="SELECT * FROM chamilo_main.user";
-		$resource= Database::query($sql,__FILE__,__LINE__);
+		$resource= Database::query($sql);
 		$row= 1;
 		$res= Database::result($resource, $row);
 		$this->assertTrue(is_string($res));
@@ -297,7 +297,7 @@ class TestDatabase extends UnitTestCase {
 
 	function testStoreResult(){
 		$sql="SELECT 1";
-		$resource=$this->dbase->query($sql,__FILE__,__LINE__);
+		$resource=$this->dbase->query($sql);
 		$res = $this->dbase->store_result($resource);
 		$this->assertTrue(is_array($res));
 		//var_dump($res);

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

@@ -115,7 +115,7 @@ class TestSurveyManager extends UnitTestCase {
 		global $_user;
 		$table_user = Database::get_main_table(TABLE_MAIN_USER);
 		$sqlm = "SELECT  status FROM  $table_user WHERE user_id = '".Database::escape_string($_user['user_id'])."'";
-		$resm = Database::query($sqlm,__FILE__,__LINE__);
+		$resm = Database::query($sqlm);
 		$objm=@Database::fetch_object($resm);
 		$ss = $objm->status ;
 		$res=SurveyManager::get_status();
@@ -131,7 +131,7 @@ class TestSurveyManager extends UnitTestCase {
 		$user_table = Database :: get_main_table(TABLE_MAIN_USER);
 		$authorid = Database::escape_string($authorid);
 		$sql_query = "SELECT * FROM $user_table WHERE user_id='$authorid'";
-		$res = Database::query($sql_query, __FILE__, __LINE__);
+		$res = Database::query($sql_query);
 		$firstname=@Database::result($res,0,'firstname');
 		$res=SurveyManager::get_survey_author($authorid);
 		$this->assertTrue(is_null($firstname));

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

@@ -171,7 +171,7 @@ class TestUserManager extends UnitTestCase
 
 	function testGetExtraFieldInformationByName() {
 		$sql="SELECT 1";
-		$field_variable=Database::query($sql,__FILE__,__LINE__);
+		$field_variable=Database::query($sql);
 		$res=UserManager::get_extra_field_information_by_name($field_variable);
 		//var_dump($res);
 		$this->assertTrue(is_bool($res));

tests/test_suite.php

@@ -65,7 +65,7 @@ class TestsSuite extends TestSuite {
         // check if course exists
         $table_course = Database::get_main_table(TABLE_MAIN_COURSE);
         $sql = "SELECT code FROM  $table_course WHERE code = '$cidReq' ";
-        $rs = Database::query($sql, __FILE__, __LINE__);
+        $rs = Database::query($sql);
         $row = Database::fetch_row($rs);
         if (empty($row[0])) {
 
@@ -93,7 +93,7 @@ class TestsSuite extends TestSuite {
 	             LEFT JOIN $course_cat_table
 	             ON course.category_code = course_category.code
 	             WHERE course.code = '$cidReq'";
-	    $result = Database::query($sql,__FILE__,__LINE__);
+	    $result = Database::query($sql);
 
 	    //create the session