From: skodak <skodak>
Date: Thu, 12 Jun 2008 09:38:49 +0000 (+0000)
Subject: MDL-14905 towards functional DB tests
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b936956e2f58970d359b3f7db8f0048c7ea70ccd;p=moodle.git

MDL-14905 towards functional DB tests
---

diff --git a/admin/report/simpletest/dbtest.php b/admin/report/simpletest/dbtest.php
index cc4e6f5d76..730731dd5e 100644
--- a/admin/report/simpletest/dbtest.php
+++ b/admin/report/simpletest/dbtest.php
@@ -1,11 +1,6 @@
-<?php
+<?php  // $Id$
 /**
  * Run database functional tests.
- *
- * @copyright &copy; 2006 The Open University
- * @author N.D.Freear@open.ac.uk, T.J.Hunt@open.ac.uk
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @version $Id$
  * @package SimpleTestEx
  */
 
@@ -19,26 +14,35 @@ require_once('ex_reporter.php');
 require_login();
 require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
 
-// CGI arguments
 $showpasses = optional_param('showpasses', 0, PARAM_BOOL);
-$dbinstance = optional_param('dbinstance', -1, PARAM_INT);
+$selected   = optional_param('selected', array(), PARAM_INT);
 
-$langfile = 'simpletest';
+if (!data_submitted()) {
+    $selected = array();
+    for ($i=0; $i<=10; $i++) {
+        $selected[$i] = 1;
+    }
+}
 
 // Print the header.
 admin_externalpage_setup('reportdbtest');
-$strtitle = get_string('unittests', $langfile);
 admin_externalpage_print_header();
 
-$dbinstances = array();
-$dbinstances[0] = $DB;
+$dbinfos     = array();
+$tests       = array();
+
+$dbinfos[0]     = array('name'=>"Current database", 'installed'=>true, 'configured'=>true); // TODO: localise
+if (data_submitted() and !empty($selected[0])) {
+    $tests[0] = $DB;
+}
 
 for ($i=1; $i<=10; $i++) {
-    $name = 'ext_test_db_'.$i;
+    $name = 'func_test_db_'.$i;
     if (!isset($CFG->$name)) {
         continue;
     }
     list($library, $driver, $dbhost, $dbuser, $dbpass, $dbname, $dbpersist, $prefix, $dboptions) = $CFG->$name;
+    $dbinfos[$i] = array('name'=>"External database $library/$driver/$dbhost/$dbname", 'installed'=>false, 'configured'=>false);
 
     $classname = "{$driver}_{$library}_moodle_database";
     require_once("$CFG->libdir/dml/$classname.php");
@@ -46,53 +50,72 @@ for ($i=1; $i<=10; $i++) {
     if (!$d->driver_installed()) {
         continue;
     }
+    $dbinfos[$i]['installed'] = true;
 
     if ($d->connect($dbhost, $dbuser, $dbpass, $dbname, $dbpersist, $prefix, $dboptions)) {
-        $dbinstances[$i] = $d;
+        $dbinfos[$i]['configured'] = true;
+        if (data_submitted() and !empty($selected[$i])) {
+            $tests[$i] = $d;
+        } else {
+            $d->dispose();
+        }
     }
 }
 
-if (!isset($dbinstances[$dbinstance])) {
-    $dbinstance = -1;
-} else {
-    global $EXT_TEST_DB;
-    $EXT_TEST_DB = $dbinstances[$dbinstance];
-}
+if (!empty($tests)) {
+    /* The UNITTEST constant can be checked elsewhere if you need to know
+     * when your code is being run as part of a unit test. */
+    define('UNITTEST', true);
 
-if ($dbinstance >= 0) {
+    @ob_implicit_flush(true);
+    while(@ob_end_flush());
 
-    // Create the group of tests.
-    $test =& new AutoGroupTest(false, true);
+    global $FUNCT_TEST_DB; // hack - we pass the connected db to functional database tests through this global
 
-    // Make the reporter, which is what displays the results.
-    $reporter = new ExHtmlReporter($showpasses);
+    foreach ($tests as $i=>$database) {
+        $dbinfo = $dbinfos[$i];
+        $FUNCT_TEST_DB = $database;
 
-    $test->addTestFile($CFG->libdir . '/dml/simpletest/testdmllib.php');
-    $test->addTestFile($CFG->libdir . '/ddl/simpletest/testddllib.php');
+        print_heading('Running tests on: '.$dbinfo['name'], '', 3); // TODO: localise
 
-    // If we have something to test, do it.
-    print_heading(get_string('moodleunittests', $langfile, get_string('all', $langfile)));
+        // Create the group of tests.
+        $test = new AutoGroupTest(false, true);
 
-    /* The UNITTEST constant can be checked elsewhere if you need to know
-     * when your code is being run as part of a unit test. */
-    define('UNITTEST', true);
-    $test->run($reporter);
+        $test->addTestFile($CFG->libdir . '/dml/simpletest/testdmllib.php');
+        $test->addTestFile($CFG->libdir . '/ddl/simpletest/testddllib.php');
+
+        // Make the reporter, which is what displays the results.
+        $reporter = new ExHtmlReporter($showpasses);
 
-    $formheader = get_string('retest', $langfile);
+        $test->run($reporter);
+
+        echo '<hr />';
+    }
 
-} else {
-    $formheader = get_string('rununittests', $langfile);
 }
 
 // Print the form for adjusting options.
 print_simple_box_start('center', '70%');
-echo '<form method="get" action="dbtest.php">';
-echo '<fieldset class="invisiblefieldset">';
-print_heading($formheader);
-echo '<p>'; print_checkbox('showpasses', 1, $showpasses, get_string('showpasses', $langfile)); echo '</p>';
-echo '<input type="hidden" value="0" name="dbinstance" />';
-echo '<input type="submit" value="' . get_string('runtests', $langfile) . '" />';
-echo '</fieldset>';
+echo '<form method="post" action="dbtest.php">';
+echo '<div>';
+print_heading("Run functional database tests"); // TODO: localise
+echo '<p>'; print_checkbox('showpasses', 1, $showpasses, get_string('showpasses', 'simpletest')); echo '</p>';
+echo '<p><strong>'."Databases:".'</strong>';
+echo '<ul>';
+foreach ($dbinfos as $i=>$dbinfo) {
+    $name = $dbinfo['name'];
+    if ($dbinfo['installed']) {
+        if (!$dbinfo['configured']) {
+            $name = "$name (misconfigured)"; // TODO: localise
+        }
+        echo '<li>'; print_checkbox('selected['.$i.']', 1, intval(!empty($selected[$i])), $name); echo '</li>';
+    } else {
+        echo '<li>'."$name: driver not installed".'</li'; // TODO: localise
+    }
+}
+echo '</ul></p>';
+echo '<input type="submit" value="' . get_string('runtests', 'simpletest') . '" />';
+echo '</div>';
 echo '</form>';
 print_simple_box_end();
 
diff --git a/admin/report/simpletest/index.php b/admin/report/simpletest/index.php
index 569255eb16..bdcd7481c6 100644
--- a/admin/report/simpletest/index.php
+++ b/admin/report/simpletest/index.php
@@ -35,7 +35,7 @@ admin_externalpage_print_header();
 
 if (!is_null($path)) {
     // Create the group of tests.
-    $test =& new AutoGroupTest($showsearch, $thorough);
+    $test = new AutoGroupTest($showsearch, $thorough);
 
     // OU specific. We use the _nonproject folder for stuff we want to
     // keep in CVS, but which is not really relevant. It does no harm
diff --git a/lib/ddl/simpletest/fixtures/invalid.xml b/lib/ddl/simpletest/fixtures/invalid.xml
index 4102586562..ed064eadc4 100644
--- a/lib/ddl/simpletest/fixtures/invalid.xml
+++ b/lib/ddl/simpletest/fixtures/invalid.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <XMLDB PATH="lib/ddl/simpletest/fixtures" VERSION="20080521" COMMENT="This is an invalid xml file used for testing.">
   <TABLES>
-    <TABLE NAME="anothertest" COMMENT="Just a test table">
+    <TABLE NAME="test_table1" COMMENT="Just a test table">
       <FIELDS>
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" ENUM="false" NEXT="incorrect_next_field"/> <!-- invalid because of NEXT value -->
         <FIELD NAME="course" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="id" NEXT="name"/> 
diff --git a/lib/ddl/simpletest/fixtures/xmldb_table.xml b/lib/ddl/simpletest/fixtures/xmldb_table.xml
index dc19e5a53d..fd8b21f794 100644
--- a/lib/ddl/simpletest/fixtures/xmldb_table.xml
+++ b/lib/ddl/simpletest/fixtures/xmldb_table.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <XMLDB PATH="lib/ddl/simpletest/fixtures" VERSION="20080521" COMMENT="XMLDB file DLL unit tests">
   <TABLES>
-    <TABLE NAME="deftable1" COMMENT="Just a test table">
+    <TABLE NAME="test_table1" COMMENT="Just a test table">
       <FIELDS>
         <FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" SEQUENCE="true" ENUM="false" NEXT="course"/>
         <FIELD NAME="course" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="id" NEXT="name"/>
diff --git a/lib/ddl/simpletest/testddllib.php b/lib/ddl/simpletest/testddllib.php
index cfd55ab80b..5f8faff52b 100755
--- a/lib/ddl/simpletest/testddllib.php
+++ b/lib/ddl/simpletest/testddllib.php
@@ -16,21 +16,21 @@ class ddllib_test extends UnitTestCase {
     private $db;
 
     public function setUp() {
-        global $CFG, $DB, $EXT_TEST_DB;
+        global $CFG, $DB, $FUNCT_TEST_DB;
 
-        if (isset($EXT_TEST_DB)) {
-            $this->db = $EXT_TEST_DB;
+        if (isset($FUNCT_TEST_DB)) {
+            $this->db = $FUNCT_TEST_DB;
         } else {
             $this->db = $DB;
         }
 
         $dbmanager = $this->db->get_manager();
 
-        $table = new xmldb_table('deftable0');
+        $table = new xmldb_table('test_table0');
         $table->add_field('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, XMLDB_SEQUENCE, null, null, null);
         $table->add_field('course', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
         $table->add_field('type', XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL, null, XMLDB_ENUM,
-                array('single', 'news', 'general', 'social', 'eachuser', 'teacher', 'qanda'), 'general');
+                          array('single', 'news', 'general', 'social', 'eachuser', 'teacher', 'qanda'), 'general');
         $table->add_field('name', XMLDB_TYPE_CHAR, '255', null, XMLDB_NOTNULL, null, null, null);
         $table->add_field('intro', XMLDB_TYPE_TEXT, 'small', null, XMLDB_NOTNULL, null, null, null, null);
         $table->add_field('logo', XMLDB_TYPE_BINARY, 'big', null, XMLDB_NOTNULL, null, null, null);
@@ -58,7 +58,7 @@ class ddllib_test extends UnitTestCase {
         $this->tables[$table->getName()] = $table;
 
         // Second, smaller table
-        $table = new xmldb_table ('deftable1');
+        $table = new xmldb_table ('test_table1');
         $table->add_field('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, XMLDB_SEQUENCE, null, null, null);
         $table->add_field('course', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
         $table->add_field('name', XMLDB_TYPE_CHAR, '30', null, null, null, null, null, 'Moodle');
@@ -80,7 +80,7 @@ class ddllib_test extends UnitTestCase {
 
         // drop custom test tables
         for ($i=0; $i<3; $i++) {
-            $table = new xmldb_table('testtable'.$i);
+            $table = new xmldb_table('test_table_cust'.$i);
             if ($dbmanager->table_exists($table)) {
                 $dbmanager->drop_table($table, true, false);
             }
@@ -98,10 +98,10 @@ class ddllib_test extends UnitTestCase {
         $dbmanager = $this->db->get_manager();
 // TODO: this should be done with $this->db object
 
-        $table = $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table0');
         // Test giving a string
         $this->assertFalse($dbmanager->table_exists('nonexistenttable'));
-        $this->assertTrue($dbmanager->table_exists('deftable0'));
+        $this->assertTrue($dbmanager->table_exists('test_table0'));
 
         // Test giving a table object
         $nonexistenttable = new xmldb_table('nonexistenttable');
@@ -131,12 +131,12 @@ class ddllib_test extends UnitTestCase {
         $dbmanager = $this->db->get_manager();
 // TODO: add all data types, comments, keys and indexes
 
-        $table = $this->tables['deftable0'];
+        $table = $this->tables['test_table0'];
 
         $this->assertTrue($dbmanager->create_table($table));
-        $this->assertTrue($dbmanager->table_exists('deftable0'));
+        $this->assertTrue($dbmanager->table_exists('test_table0'));
         $dbmanager->drop_table($table);
-        $this->assertFalse($dbmanager->table_exists('deftable0'));
+        $this->assertFalse($dbmanager->table_exists('test_table0'));
 
         // Give a wrong table param (expect a debugging message)
         $table = 'string';
@@ -149,9 +149,9 @@ class ddllib_test extends UnitTestCase {
     public function testDropTable() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table0');
         $this->assertTrue($dbmanager->drop_table($table, true, false));
-        $this->assertFalse($dbmanager->table_exists('deftable0'));
+        $this->assertFalse($dbmanager->table_exists('test_table0'));
 
         // Try dropping non-existent table
         $table = new xmldb_table('nonexistenttable');
@@ -171,7 +171,7 @@ class ddllib_test extends UnitTestCase {
         $dbmanager = $this->db->get_manager();
 // TODO: verify the type in DB
 
-        $table = $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table0');
 
         /// Create a new field with complex specs (enums are good candidates)
         $field = new xmldb_field('type2');
@@ -187,7 +187,7 @@ class ddllib_test extends UnitTestCase {
         $dbmanager = $this->db->get_manager();
 // TODO: verify the type in DB
 
-        $table = $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table0');
         /// Create a new field with complex specs (enums are good candidates)
         $field = new xmldb_field('onenumber');
         $field->set_attributes(XMLDB_TYPE_INTEGER, '6', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, 0, 'type');
@@ -201,7 +201,7 @@ class ddllib_test extends UnitTestCase {
     public function testDropField() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table0');
         $field = $table->getField('type');
 
         $this->assertTrue($dbmanager->field_exists($table, $field));
@@ -215,7 +215,7 @@ class ddllib_test extends UnitTestCase {
         $dbmanager = $this->db->get_manager();
 // TODO: verify the type is changed in db
 
-        $table = $this->create_deftable('deftable1');
+        $table = $this->create_deftable('test_table1');
         $field = new xmldb_field('course');
         $field->set_attributes(XMLDB_TYPE_CHAR, '30', null, XMLDB_NOTNULL, null, null, null, '0');
         $this->assertTrue($dbmanager->change_field_type($table, $field));
@@ -245,7 +245,7 @@ class ddllib_test extends UnitTestCase {
         $dbmanager = $this->db->get_manager();
 // TODO: verify the precision is changed in db
 
-        $table = $this->create_deftable('deftable1');
+        $table = $this->create_deftable('test_table1');
         $field = new xmldb_field('intro');
         $field->set_attributes(XMLDB_TYPE_TEXT, 'big', null, XMLDB_NOTNULL, null, null, null, null);
         $this->assertTrue($dbmanager->change_field_precision($table, $field));
@@ -267,7 +267,7 @@ class ddllib_test extends UnitTestCase {
         $dbmanager = $this->db->get_manager();
 // TODO: verify the signed is changed in db
 
-        $table = $this->create_deftable('deftable1');
+        $table = $this->create_deftable('test_table1');
         $field = new xmldb_field('grade');
         $field->set_attributes(XMLDB_TYPE_NUMBER, '10,2', XMLDB_UNSIGNED, null, null, null, null, null);
         $this->assertTrue($dbmanager->change_field_unsigned($table, $field));
@@ -281,7 +281,7 @@ class ddllib_test extends UnitTestCase {
         $dbmanager = $this->db->get_manager();
 // TODO: verify the type is nullability in db
 
-        $table = $this->create_deftable('deftable1');
+        $table = $this->create_deftable('test_table1');
         $field = new xmldb_field('name');
         $field->set_attributes(XMLDB_TYPE_CHAR, '30', null, XMLDB_NOTNULL, null, null, null, 'Moodle');
         $this->assertTrue($dbmanager->change_field_notnull($table, $field));
@@ -294,7 +294,7 @@ class ddllib_test extends UnitTestCase {
     public function testChangeFieldDefault() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable1');
+        $table = $this->create_deftable('test_table1');
         $field = new xmldb_field('name');
         $field->set_attributes(XMLDB_TYPE_CHAR, '30', null, null, null, null, null, null);
         $this->assertTrue($dbmanager->change_field_default($table, $field));
@@ -315,7 +315,7 @@ class ddllib_test extends UnitTestCase {
     public function testAddUniqueIndex() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable1');
+        $table = $this->create_deftable('test_table1');
         $index = new xmldb_index('secondname');
         $index->set_attributes(XMLDB_INDEX_UNIQUE, array('name', 'secondname', 'grade'));
         $this->assertTrue($dbmanager->add_index($table, $index));
@@ -324,7 +324,7 @@ class ddllib_test extends UnitTestCase {
     public function testAddNonUniqueIndex() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable1');
+        $table = $this->create_deftable('test_table1');
         $index = new xmldb_index('secondname');
         $index->set_attributes(XMLDB_INDEX_NOTUNIQUE, array('course', 'name'));
         $this->assertTrue($dbmanager->add_index($table, $index));
@@ -333,7 +333,7 @@ class ddllib_test extends UnitTestCase {
     public function testFindIndexName() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable1');
+        $table = $this->create_deftable('test_table1');
         $index = new xmldb_index('secondname');
         $index->set_attributes(XMLDB_INDEX_NOTUNIQUE, array('course', 'name'));
         $dbmanager->add_index($table, $index);
@@ -349,7 +349,7 @@ class ddllib_test extends UnitTestCase {
     public function testDropIndex() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable1');
+        $table = $this->create_deftable('test_table1');
         $index = new xmldb_index('secondname');
         $index->set_attributes(XMLDB_INDEX_NOTUNIQUE, array('course', 'name'));
         $dbmanager->add_index($table, $index);
@@ -361,7 +361,7 @@ class ddllib_test extends UnitTestCase {
     public function testAddUniqueKey() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable1');
+        $table = $this->create_deftable('test_table1');
         $key = new xmldb_key('id-course-grade');
         $key->set_attributes(XMLDB_KEY_UNIQUE, array('id', 'course', 'grade'));
         $this->assertTrue($dbmanager->add_key($table, $key));
@@ -370,22 +370,22 @@ class ddllib_test extends UnitTestCase {
     public function testAddForeignUniqueKey() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable1');
-        $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table1');
+        $this->create_deftable('test_table0');
 
         $key = new xmldb_key('course');
-        $key->set_attributes(XMLDB_KEY_FOREIGN_UNIQUE, array('course'), 'deftable0', array('id'));
+        $key->set_attributes(XMLDB_KEY_FOREIGN_UNIQUE, array('course'), 'test_table0', array('id'));
         $this->assertTrue($dbmanager->add_key($table, $key));
     }
 
     public function testDropKey() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable1');
-        $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table1');
+        $this->create_deftable('test_table0');
 
         $key = new xmldb_key('course');
-        $key->set_attributes(XMLDB_KEY_FOREIGN_UNIQUE, array('course'), 'deftable0', array('id'));
+        $key->set_attributes(XMLDB_KEY_FOREIGN_UNIQUE, array('course'), 'test_table0', array('id'));
         $dbmanager->add_key($table, $key);
 
         $this->assertTrue($dbmanager->drop_key($table, $key));
@@ -394,22 +394,22 @@ class ddllib_test extends UnitTestCase {
     public function testAddForeignKey() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable1');
-        $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table1');
+        $this->create_deftable('test_table0');
 
         $key = new xmldb_key('course');
-        $key->set_attributes(XMLDB_KEY_FOREIGN, array('course'), 'deftable0', array('id'));
+        $key->set_attributes(XMLDB_KEY_FOREIGN, array('course'), 'test_table0', array('id'));
         $this->assertTrue($dbmanager->add_key($table, $key));
     }
 
     public function testDropForeignKey() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable1');
-        $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table1');
+        $this->create_deftable('test_table0');
 
         $key = new xmldb_key('course');
-        $key->set_attributes(XMLDB_KEY_FOREIGN, array('course'), 'deftable0', array('id'));
+        $key->set_attributes(XMLDB_KEY_FOREIGN, array('course'), 'test_table0', array('id'));
         $dbmanager->add_key($table, $key);
 
         $this->assertTrue($dbmanager->drop_key($table, $key));
@@ -418,7 +418,7 @@ class ddllib_test extends UnitTestCase {
     public function testChangeFieldEnum() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table0');
         // Removing an enum value
         $field = new xmldb_field('type');
         $field->set_attributes(XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL, null, null, null);
@@ -436,7 +436,7 @@ class ddllib_test extends UnitTestCase {
         // unsupported!
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table0');
         $index = new xmldb_index('course');
         $index->set_attributes(XMLDB_INDEX_UNIQUE, array('course'));
 
@@ -447,7 +447,7 @@ class ddllib_test extends UnitTestCase {
         //unsupported
          $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table0');
         $key = new xmldb_key('course');
         $key->set_attributes(XMLDB_KEY_UNIQUE, array('course'));
 
@@ -458,7 +458,7 @@ class ddllib_test extends UnitTestCase {
     public function testRenameField() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table0');
         $field = new xmldb_field('type');
         $field->set_attributes(XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL, null, XMLDB_ENUM,
                 array('single', 'news', 'general', 'social', 'eachuser', 'teacher', 'qanda'), 'general', 'course');
@@ -469,28 +469,28 @@ class ddllib_test extends UnitTestCase {
     public function testRenameTable() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table0');
 
-        $this->assertFalse($dbmanager->table_exists('testtable0'));
-        $this->assertTrue($dbmanager->rename_table($table, 'testtable0'));
+        $this->assertFalse($dbmanager->table_exists('test_table_cust0'));
+        $this->assertTrue($dbmanager->rename_table($table, 'test_table_cust0'));
 
-        $table->setName('testtable0');
+        $table->setName('test_table_cust0');
         $dbmanager->drop_table($table);
     }
 
     public function testFieldExists() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table0');
         // String params
         // Give a nonexistent table as first param
         $this->assertFalse($dbmanager->field_exists('nonexistenttable', 'id'));
 
         // Give a nonexistent field as second param
-        $this->assertFalse($dbmanager->field_exists('deftable0', 'nonexistentfield'));
+        $this->assertFalse($dbmanager->field_exists('test_table0', 'nonexistentfield'));
 
         // Correct string params
-        $this->assertTrue($dbmanager->field_exists('deftable0', 'id'));
+        $this->assertTrue($dbmanager->field_exists('test_table0', 'id'));
 
         // Object params
         $realfield = $table->getField('id');
@@ -516,15 +516,16 @@ class ddllib_test extends UnitTestCase {
     public function testFindCheckConstraintName() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table0');
         $field = $table->getField('type');
-        $this->assertEqual($dbmanager->find_check_constraint_name($table, $field), 'type');
+        $result = $dbmanager->find_check_constraint_name($table, $field);
+        $this->assertTrue(!empty($result));
     }
 
     public function testCheckConstraintExists() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table0');
         $field = $table->getField('type');
         $this->assertTrue($dbmanager->check_constraint_exists($table, $field), 'type');
     }
@@ -532,7 +533,7 @@ class ddllib_test extends UnitTestCase {
     public function testFindKeyName() {
         $dbmanager = $this->db->get_manager();
 
-        $table = $this->create_deftable('deftable0');
+        $table = $this->create_deftable('test_table0');
         $key = $table->getKey('primary');
         $invalid_key = 'invalid_key';
 
@@ -561,8 +562,9 @@ class ddllib_test extends UnitTestCase {
         ob_end_clean();
 
         // Give existing and valid table param
-        $table = $this->create_deftable('deftable0');
-        $this->assertEqual(false, $dbmanager->find_sequence_name($table));
+        $table = $this->create_deftable('test_table0');
+//TODO: this returns stuff depending on db internals
+        // $this->assertEqual(false, $dbmanager->find_sequence_name($table));
 
     }
 
@@ -572,9 +574,9 @@ class ddllib_test extends UnitTestCase {
 
         unset($CFG->xmldbreconstructprevnext); // remove this unhack ;-)
 
-        $this->create_deftable('deftable1');
+        $this->create_deftable('test_table1');
 
-        $this->assertTrue($dbmanager->table_exists('deftable1'));
+        $this->assertTrue($dbmanager->table_exists('test_table1'));
 
         // feed nonexistent file
         ob_start(); // hide debug warning
@@ -587,13 +589,13 @@ class ddllib_test extends UnitTestCase {
         ob_end_clean();
 
         // Check that the table has not been deleted from DB
-        $this->assertTrue($dbmanager->table_exists('deftable1'));
+        $this->assertTrue($dbmanager->table_exists('test_table1'));
 
         // Real and valid xml file
         $this->assertTrue($dbmanager->delete_tables_from_xmldb_file($CFG->libdir . '/ddl/simpletest/fixtures/xmldb_table.xml', false));
 
         // Check that the table has been deleted from DB
-        $this->assertFalse($dbmanager->table_exists('deftable1'));
+        $this->assertFalse($dbmanager->table_exists('test_table1'));
     }
 
     public function testInstallFromXmldbFile() {
@@ -611,11 +613,11 @@ class ddllib_test extends UnitTestCase {
         ob_end_clean();
 
         // Check that the table has not yet been created in DB
-        $this->assertFalse($dbmanager->table_exists('deftable1'));
+        $this->assertFalse($dbmanager->table_exists('test_table1'));
 
         // Real and valid xml file
         $this->assertTrue($dbmanager->install_from_xmldb_file($CFG->libdir . '/ddl/simpletest/fixtures/xmldb_table.xml', false));
-        $this->assertTrue($dbmanager->table_exists('deftable1'));
+        $this->assertTrue($dbmanager->table_exists('test_table1'));
     }
 
     public function testCreateTempTable() {
@@ -623,18 +625,18 @@ class ddllib_test extends UnitTestCase {
 
         // Feed incorrect table param
         ob_start(); // hide debug warning
-        $this->assertFalse($dbmanager->create_temp_table('deftable1'));
+        $this->assertFalse($dbmanager->create_temp_table('test_table1'));
         ob_end_clean();
 
-        $table = $this->tables['deftable1'];
+        $table = $this->tables['test_table1'];
 
         // New table
         $this->assertTrue($dbmanager->create_temp_table($table));
-        $this->assertTrue($dbmanager->table_exists('deftable1', true));
+        $this->assertTrue($dbmanager->table_exists('test_table1', true));
 
         // Delete
         $this->assertTrue($dbmanager->drop_temp_table($table));
-        $this->assertFalse($dbmanager->table_exists('deftable1', true));
+        $this->assertFalse($dbmanager->table_exists('test_table1', true));
     }
 
 }
diff --git a/lib/dml/simpletest/testdmllib.php b/lib/dml/simpletest/testdmllib.php
index 61e893439b..2473502c25 100755
--- a/lib/dml/simpletest/testdmllib.php
+++ b/lib/dml/simpletest/testdmllib.php
@@ -13,10 +13,10 @@ class dmllib_test extends UnitTestCase {
     private $db;
 
     function setUp() {
-        global $CFG, $DB, $EXT_TEST_DB;
+        global $CFG, $DB, $FUNCT_TEST_DB;
 
-        if (isset($EXT_TEST_DB)) {
-            $this->db = $EXT_TEST_DB;
+        if (isset($FUNCT_TEST_DB)) {
+            $this->db = $FUNCT_TEST_DB;
         } else {
             $this->db = $DB;
         }