Commit a8447cb8 authored by Marco Pivetta's avatar Marco Pivetta

Merge branch 'fix/#2405-#2654-skip-sqlanywhere-if-not-installed' into 2.5

Backport #2405 to 2.5.x
Backport #2654 to 2.5.x
parents afcdacf3 3f592df4
...@@ -2,10 +2,24 @@ ...@@ -2,10 +2,24 @@
namespace Doctrine\Tests\DBAL\Functional\Driver\SQLAnywhere; namespace Doctrine\Tests\DBAL\Functional\Driver\SQLAnywhere;
use Doctrine\DBAL\Driver\SQLAnywhere\Driver;
use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\DriverManager;
class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase class ConnectionTest extends \Doctrine\Tests\DbalFunctionalTestCase
{ {
protected function setUp()
{
if (! extension_loaded('sqlanywhere')) {
$this->markTestSkipped('sqlanywhere is not installed.');
}
parent::setUp();
if (! $this->_conn->getDriver() instanceof Driver) {
$this->markTestSkipped('sqlanywhere only test.');
}
}
public function testNonPersistentConnection() public function testNonPersistentConnection()
{ {
$params = $this->_conn->getParams(); $params = $this->_conn->getParams();
......
...@@ -2,10 +2,24 @@ ...@@ -2,10 +2,24 @@
namespace Doctrine\Tests\DBAL\Functional\Driver\SQLAnywhere; namespace Doctrine\Tests\DBAL\Functional\Driver\SQLAnywhere;
use Doctrine\DBAL\Driver\SQLAnywhere\Driver;
use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\DriverManager;
class StatementTest extends \Doctrine\Tests\DbalFunctionalTestCase class StatementTest extends \Doctrine\Tests\DbalFunctionalTestCase
{ {
protected function setUp()
{
if (! extension_loaded('sqlanywhere')) {
$this->markTestSkipped('sqlanywhere is not installed.');
}
parent::setUp();
if (! $this->_conn->getDriver() instanceof Driver) {
$this->markTestSkipped('sqlanywhere only test.');
}
}
public function testNonPersistentStatement() public function testNonPersistentStatement()
{ {
$params = $this->_conn->getParams(); $params = $this->_conn->getParams();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment