Fix the db tests when running all tests

This commit is contained in:
Bart Visscher 2012-10-12 18:49:47 +02:00
parent e38b736a1e
commit f242e658c3
2 changed files with 8 additions and 28 deletions

View File

@ -7,6 +7,8 @@
*/
class Test_DB extends UnitTestCase {
protected $backupGlobals = FALSE;
protected static $schema_file = 'static://test_db_scheme';
protected $test_prefix;
@ -17,6 +19,7 @@ class Test_DB extends UnitTestCase {
$content = file_get_contents( $dbfile );
$content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content );
file_put_contents( self::$schema_file, $content );
OC_DB::createDbFromStructure(self::$schema_file);
$this->test_prefix = $r;
$this->table1 = $this->test_prefix.'contacts_addressbooks';
@ -24,29 +27,11 @@ class Test_DB extends UnitTestCase {
}
public function tearDown() {
OC_DB::removeDBStructure(self::$schema_file);
unlink(self::$schema_file);
}
protected function setUpDB() {
OC_DB::disconnect();
OC_DB::createDbFromStructure(self::$schema_file);
}
protected function tearDownDB() {
OC_DB::removeDBStructure(self::$schema_file);
}
// every thing in one test, phpunit messes with MDB2
// also setUpDB and tearDownDB only once, otherwise sqlite doesn't finish
public function testDBCompatibility() {
$this->setUpDB();
$this->doTestQuotes();
$this->doTestNOW();
$this->doTestUNIX_TIMESTAMP();
$this->tearDownDB();
}
public function doTestQuotes() {
//$this->setUpDB();
public function testQuotes() {
$query = OC_DB::prepare('SELECT `fullname` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?');
$result = $query->execute(array('uri_1'));
$this->assertTrue($result);
@ -63,28 +48,23 @@ class Test_DB extends UnitTestCase {
$this->assertEqual($row['fullname'], 'fullname test');
$row = $result->fetchRow();
$this->assertFalse($row);
//$this->tearDownDB();
}
public function doTestNOW() {
//$this->setUpDB();
public function testNOW() {
$query = OC_DB::prepare('INSERT INTO *PREFIX*'.$this->table2.' (`fullname`,`uri`) VALUES (NOW(),?)');
$result = $query->execute(array('uri_2'));
$this->assertTrue($result);
$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?');
$result = $query->execute(array('uri_2'));
$this->assertTrue($result);
//$this->tearDownDB();
}
public function doTestUNIX_TIMESTAMP() {
//$this->setUpDB();
public function testUNIX_TIMESTAMP() {
$query = OC_DB::prepare('INSERT INTO *PREFIX*'.$this->table2.' (`fullname`,`uri`) VALUES (UNIX_TIMESTAMP(),?)');
$result = $query->execute(array('uri_3'));
$this->assertTrue($result);
$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?');
$result = $query->execute(array('uri_3'));
$this->assertTrue($result);
//$this->tearDownDB();
}
}

View File

@ -35,7 +35,7 @@ class Test_DBSchema extends UnitTestCase {
unlink(self::$schema_file2);
}
// every thing in one test, phpunit messes with MDB2
// everything in one test, they depend on each other
public function testSchema() {
$this->doTestSchemaCreating();
$this->doTestSchemaChanging();