Ensure the check can be tested. re #127
This commit is contained in:
parent
cd626b25ef
commit
8a72e1a6fd
5
base.php
5
base.php
|
@ -940,8 +940,10 @@ abstract class Base
|
|||
}
|
||||
|
||||
private static function error () {
|
||||
if (php_sapi_name() != "cli") {
|
||||
header("location: checkconfig.php?err=1");
|
||||
exit();
|
||||
}
|
||||
throw new Exception('Database not found.');
|
||||
}
|
||||
|
||||
public static function getDb ($database = NULL) {
|
||||
|
@ -968,6 +970,7 @@ abstract class Base
|
|||
} else {
|
||||
self::getDb ();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public static function clearDb () {
|
||||
|
|
|
@ -57,4 +57,45 @@ class BaseTest extends PHPUnit_Framework_TestCase
|
|||
$this->assertEquals ("One book", Base::getDbName (1));
|
||||
$this->assertEquals ($config['calibre_directory'], Base::getDbList ());
|
||||
}
|
||||
|
||||
public function testCheckDatabaseAvailability_1 () {
|
||||
global $config;
|
||||
|
||||
$this->assertTrue (Base::checkDatabaseAvailability ());
|
||||
}
|
||||
|
||||
public function testCheckDatabaseAvailability_2 () {
|
||||
global $config;
|
||||
|
||||
$config['calibre_directory'] = array ("Some books" => dirname(__FILE__) . "/BaseWithSomeBooks/",
|
||||
"One book" => dirname(__FILE__) . "/BaseWithOneBook/");
|
||||
|
||||
$this->assertTrue (Base::checkDatabaseAvailability ());
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException Exception
|
||||
* @expectedExceptionMessage not found
|
||||
*/
|
||||
public function testCheckDatabaseAvailability_Exception1 () {
|
||||
global $config;
|
||||
|
||||
$config['calibre_directory'] = array ("Some books" => dirname(__FILE__) . "/BaseWithSomeBooks/",
|
||||
"One book" => dirname(__FILE__) . "/OneBook/");
|
||||
|
||||
$this->assertTrue (Base::checkDatabaseAvailability ());
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException Exception
|
||||
* @expectedExceptionMessage not found
|
||||
*/
|
||||
public function testCheckDatabaseAvailability_Exception2 () {
|
||||
global $config;
|
||||
|
||||
$config['calibre_directory'] = array ("Some books" => dirname(__FILE__) . "/SomeBooks/",
|
||||
"One book" => dirname(__FILE__) . "/BaseWithOneBook/");
|
||||
|
||||
$this->assertTrue (Base::checkDatabaseAvailability ());
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue