Personal/cops
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Ensure the check can be tested. re #127

Browse source
This commit is contained in:
Sébastien Lucas 2013-12-14 18:48:34 +01:00
parent cd626b25ef
commit 8a72e1a6fd
2 changed files with 46 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
base.php
View file

@ -940,8 +940,10 @@ abstract class Base
} }
private static function error () { private static function error () {
header("location: checkconfig.php?err=1"); if (php_sapi_name() != "cli") {
exit(); header("location: checkconfig.php?err=1");
}
throw new Exception('Database not found.');
} }
public static function getDb ($database = NULL) { public static function getDb ($database = NULL) {
@ -968,6 +970,7 @@ abstract class Base
} else { } else {
self::getDb (); self::getDb ();
} }
return true;
} }
public static function clearDb () { public static function clearDb () {

41
test/baseTest.php
View file

@ -57,4 +57,45 @@ class BaseTest extends PHPUnit_Framework_TestCase
$this->assertEquals ("One book", Base::getDbName (1)); $this->assertEquals ("One book", Base::getDbName (1));
$this->assertEquals ($config['calibre_directory'], Base::getDbList ()); $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 ());
}
} }