L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-35479 fix ddl tests to use debugging asserts

Browse Source
This commit is contained in:
Petr Škoda
2012-09-17 11:41:38 +02:00
parent 5388ff57f4
commit d9ba3c4ebc
1 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ddl/tests/ddl_test.php
+9 -22
View File
@@ -160,13 +160,12 @@ class ddl_testcase extends database_driver_testcase {
// first make sure it returns false if table does not exist
$table = $this->tables['test_table0'];
ob_start(); // hide debug warning
try {
$result = $DB->get_records('test_table0');
} catch (dml_exception $e) {
$result = false;
}
ob_end_clean();
$this->resetDebugging();
$this->assertFalse($result);
@@ -183,13 +182,12 @@ class ddl_testcase extends database_driver_testcase {
// drop table and test again
$dbman->drop_table($table);
ob_start(); // hide debug warning
try {
$result = $DB->get_records('test_table0');
} catch (dml_exception $e) {
$result = false;
}
ob_end_clean();
$this->resetDebugging();
$this->assertFalse($result);
@@ -1123,13 +1121,12 @@ class ddl_testcase extends database_driver_testcase {
$record = new stdClass();
$record->name = NULL;
ob_start(); // hide debug warning
try {
$result = $DB->insert_record('test_table_cust0', $record, false);
} catch (dml_exception $e) {
$result = false;
}
ob_end_clean();
$this->resetDebugging();
$this->assertFalse($result);
$field = new xmldb_field('name');
@@ -1145,13 +1142,12 @@ class ddl_testcase extends database_driver_testcase {
$field->set_attributes(XMLDB_TYPE_CHAR, '30', null, XMLDB_NOTNULL, null, null);
$dbman->change_field_notnull($table, $field);
ob_start(); // hide debug warning
try {
$result = $DB->insert_record('test_table_cust0', $record, false);
} catch (dml_exception $e) {
$result = false;
}
ob_end_clean();
$this->resetDebugging();
$this->assertFalse($result);
$dbman->drop_table($table);
@@ -1214,13 +1210,12 @@ class ddl_testcase extends database_driver_testcase {
$index->set_attributes(XMLDB_INDEX_UNIQUE, array('onenumber', 'name'));
$dbman->add_index($table, $index);
ob_start(); // hide debug warning
try {
$result = $DB->insert_record('test_table_cust0', $record, false);
} catch (dml_exception $e) {
$result = false;;
}
ob_end_clean();
$this->resetDebugging();
$this->assertFalse($result);
$dbman->drop_table($table);
@@ -1398,12 +1393,10 @@ class ddl_testcase extends database_driver_testcase {
// feed nonexistent file
try {
ob_start(); // hide debug warning
$dbman->delete_tables_from_xmldb_file('fpsoiudfposui');
ob_end_clean();
$this->assertTrue(false);
} catch (Exception $e) {
ob_end_clean();
$this->resetDebugging();
$this->assertTrue($e instanceof moodle_exception);
}
@@ -1414,12 +1407,10 @@ class ddl_testcase extends database_driver_testcase {
$devhack = true;
}
try {
ob_start(); // hide debug warning
$dbman->delete_tables_from_xmldb_file(__DIR__ . '/fixtures/invalid.xml');
$this->assertTrue(false);
ob_end_clean();
} catch (Exception $e) {
ob_end_clean();
$this->resetDebugging();
$this->assertTrue($e instanceof moodle_exception);
}
if ($devhack) {
@@ -1443,12 +1434,10 @@ class ddl_testcase extends database_driver_testcase {
// feed nonexistent file
try {
ob_start(); // hide debug warning
$dbman->install_from_xmldb_file('fpsoiudfposui');
ob_end_clean();
$this->assertTrue(false);
} catch (Exception $e) {
ob_end_clean();
$this->resetDebugging();
$this->assertTrue($e instanceof moodle_exception);
}
@@ -1459,12 +1448,10 @@ class ddl_testcase extends database_driver_testcase {
$devhack = true;
}
try {
ob_start(); // hide debug warning
$dbman->install_from_xmldb_file(__DIR__ . '/fixtures/invalid.xml');
ob_end_clean();
$this->assertTrue(false);
} catch (Exception $e) {
ob_end_clean();
$this->resetDebugging();
$this->assertTrue($e instanceof moodle_exception);
}
if ($devhack) {