MDL-17129 dml: fixed dml exception handling in unit tests

diff --git a/lib/ddl/simpletest/testddl.php b/lib/ddl/simpletest/testddl.php
index 484759fe3d98a56b869a2158e111fda75613d277..0c776205530f68618932d3e626a825a688c4618e 100755 (executable)
--- a/lib/ddl/simpletest/testddl.php
+++ b/lib/ddl/simpletest/testddl.php
@@ -119,9 +119,15 @@ class ddl_test extends UnitTestCase {
 
         // first make sure it returns false if table does not exist
         $table = $this->tables['test_table0'];
+
         ob_start(); // hide debug warning
-        $result = @$DB->get_records('test_table0');
+        try {
+            $result = $DB->get_records('test_table0');
+        } catch (dml_read_exception $e) {
+            $result = false;
+        }
         ob_end_clean();
+
         $this->assertFalse($result);
 
         $this->assertFalse($dbman->table_exists('test_table0'));
@@ -206,8 +212,13 @@ class ddl_test extends UnitTestCase {
         $record->course = 666;
         $record->type1 = 'xxxxxxxx';
         $record->type2 = 'news';
+
         ob_start(); // hide debug warning
-        $result = @$DB->insert_record('test_table_cust0', $record);
+        try {
+            $result = $DB->insert_record('test_table_cust0', $record);
+        } catch (dml_write_exception $e) {
+            $result = false;
+        }
         ob_end_clean();
         $this->assertFalse($result);
 
@@ -217,7 +228,11 @@ class ddl_test extends UnitTestCase {
         $record->type1 = 'news';
         $record->type2 = 'xxxx';
         ob_start(); // hide debug warning
-        $result = @$DB->insert_record('test_table_cust0', $record);
+        try {
+            $result = $DB->insert_record('test_table_cust0', $record);
+        } catch (dml_write_exception $e) {
+            $result = false;
+        }
         ob_end_clean();
         $this->assertFalse($result);
 
@@ -376,7 +391,11 @@ class ddl_test extends UnitTestCase {
         $record->name = NULL;
 
         ob_start(); // hide debug warning
-        $result = @$DB->insert_record('test_table_cust0', $record, false);
+        try {
+            $result = $DB->insert_record('test_table_cust0', $record, false);
+        } catch (dml_write_exception $e) {
+            $result = false;
+        }
         ob_end_clean();
         $this->assertFalse($result);
 
@@ -394,7 +413,11 @@ class ddl_test extends UnitTestCase {
         $dbman->change_field_notnull($table, $field);
 
         ob_start(); // hide debug warning
-        $result = @$DB->insert_record('test_table_cust0', $record, false);
+        try {
+            $result = $DB->insert_record('test_table_cust0', $record, false);
+        } catch (dml_write_exception $e) {
+            $result = false;
+        }
         ob_end_clean();
         $this->assertFalse($result);
 
@@ -459,7 +482,11 @@ class ddl_test extends UnitTestCase {
         $dbman->add_index($table, $index);
 
         ob_start(); // hide debug warning
-        $result = @$DB->insert_record('test_table_cust0', $record, false);
+        try {
+            $result = $DB->insert_record('test_table_cust0', $record, false);
+        } catch (dml_write_exception $e) {
+            $result = false;;
+        }
         ob_end_clean();
         $this->assertFalse($result);
 
@@ -592,7 +619,11 @@ class ddl_test extends UnitTestCase {
         $record->type = 'nothing';
 
         ob_start(); // hide debug warning
-        $result = @$DB->insert_record('test_table_cust0', $record, false);
+        try {
+            $result = $DB->insert_record('test_table_cust0', $record, false);
+        } catch (dml_write_exception $e) {
+            $result = false;
+        }
         ob_end_clean();
         $this->assertFalse($result);
 

diff --git a/lib/dml/simpletest/testdml.php b/lib/dml/simpletest/testdml.php
index b92d392f908731405df3999ad1d085259475c09a..0d45773cb18bf6a49196bf207d475b4a7070c340 100755 (executable)
--- a/lib/dml/simpletest/testdml.php
+++ b/lib/dml/simpletest/testdml.php
@@ -1411,6 +1411,7 @@ class dml_test extends UnitTestCase {
         $this->assertEqual(substr($string, 5-1, 2), $record->name);
 
         try {
+            // silence php warning ;-)
             @$DB->sql_substr("name");
             $this->fail("Expecting an exception, none occurred");
         } catch (Exception $e) {