Various coding style improvements
This commit is contained in:
parent
22d6d67bdf
commit
cce715befe
@ -12,10 +12,17 @@
|
||||
require_once 'config.sample.inc.php';
|
||||
|
||||
/**
|
||||
* Environment tests
|
||||
*
|
||||
* @package PhpMyAdmin-test
|
||||
*/
|
||||
class Environment_test extends PHPUnit_Framework_TestCase
|
||||
class Environment_Test extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
/**
|
||||
* Tests PHP version
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testPhpVersion()
|
||||
{
|
||||
$this->assertTrue(
|
||||
@ -24,30 +31,56 @@ class Environment_test extends PHPUnit_Framework_TestCase
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests MySQL connection
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function testMySQL()
|
||||
{
|
||||
try{
|
||||
$pdo = new PDO("mysql:host=".TESTSUITE_SERVER.";dbname=".TESTSUITE_DATABASE, TESTSUITE_USER, TESTSUITE_PASSWORD);
|
||||
$this->assertNull($pdo->errorCode(), "Error when trying to connect to database");
|
||||
try {
|
||||
$pdo = new PDO(
|
||||
"mysql:host=" . TESTSUITE_SERVER . ";dbname=" . TESTSUITE_DATABASE,
|
||||
TESTSUITE_USER,
|
||||
TESTSUITE_PASSWORD
|
||||
);
|
||||
$this->assertNull(
|
||||
$pdo->errorCode(),
|
||||
"Error when trying to connect to database"
|
||||
);
|
||||
|
||||
//$pdo->beginTransaction();
|
||||
$test = $pdo->exec("SHOW TABLES;");
|
||||
//$pdo->commit();
|
||||
$this->assertEquals(0, $pdo->errorCode(), 'Error trying to show tables for database');
|
||||
$this->assertEquals(
|
||||
0,
|
||||
$pdo->errorCode(),
|
||||
'Error trying to show tables for database'
|
||||
);
|
||||
}
|
||||
catch (Exception $e) {
|
||||
$this->fail("Error: ".$e->getMessage());
|
||||
}
|
||||
|
||||
// Check id MySQL server is 5 version
|
||||
preg_match("/^(\d+)?\.(\d+)?\.(\*|\d+)/", $pdo->getAttribute(constant("PDO::ATTR_SERVER_VERSION")), $version_parts);
|
||||
preg_match(
|
||||
"/^(\d+)?\.(\d+)?\.(\*|\d+)/",
|
||||
$pdo->getAttribute(constant("PDO::ATTR_SERVER_VERSION")),
|
||||
$version_parts
|
||||
);
|
||||
$this->assertEquals(5, $version_parts[1]);
|
||||
}
|
||||
|
||||
//TODO: Think about this test
|
||||
// public function testSession()
|
||||
// {
|
||||
// $this->markTestIncomplete();
|
||||
// }
|
||||
/**
|
||||
* Test of session handling
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
* @todo Think about this test
|
||||
*/
|
||||
public function testSession()
|
||||
{
|
||||
$this->markTestIncomplete();
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user