Browse Source

Enable SQLServer dsn creation to run without sqlserver.

Mark Story 8 years ago
parent
commit
73d7c5dfc1
1 changed files with 8 additions and 3 deletions
  1. 8 3
      tests/TestCase/Database/Driver/SqlserverTest.php

+ 8 - 3
tests/TestCase/Database/Driver/SqlserverTest.php

@@ -47,6 +47,7 @@ class SqlserverTest extends TestCase
             [
                 [
                     'app' => 'CakePHP-Testapp',
+                    'encoding' => '',
                     'connectionPooling' => true,
                     'failoverPartner' => 'failover.local',
                     'loginTimeout' => 10,
@@ -57,6 +58,7 @@ class SqlserverTest extends TestCase
             [
                 [
                     'app' => 'CakePHP-Testapp',
+                    'encoding' => '',
                     'failoverPartner' => 'failover.local',
                     'multiSubnetFailover' => 'failover.local',
                 ],
@@ -64,13 +66,15 @@ class SqlserverTest extends TestCase
             ],
             [
                 [
+                    'encoding' => '',
                 ],
                 'sqlsrv:Server=localhost\SQLEXPRESS;Database=cake;MultipleActiveResultSets=false',
             ],
             [
                 [
                     'app' => 'CakePHP-Testapp',
-                    'host' => 'locahost',
+                    'encoding' => '',
+                    'host' => 'localhost\SQLEXPRESS',
                     'port' => 9001,
                 ],
                 'sqlsrv:Server=localhost\SQLEXPRESS,9001;Database=cake;MultipleActiveResultSets=false;APP=CakePHP-Testapp',
@@ -88,7 +92,6 @@ class SqlserverTest extends TestCase
      */
     public function testDnsString($constructorArgs, $dnsString)
     {
-        $this->skipIf($this->missingExtension, 'pdo_sqlsrv is not installed.');
         $driver = $this->getMockBuilder('Cake\Database\Driver\Sqlserver')
             ->setMethods(['_connect'])
             ->setConstructorArgs([$constructorArgs])
@@ -96,7 +99,9 @@ class SqlserverTest extends TestCase
 
         $driver->method('_connect')
             ->with($this->callback(function ($dns) use ($dnsString) {
-                return $dns === $dnsString;
+                $this->assertSame($dns, $dnsString);
+
+                return true;
             }))
             ->will($this->returnValue([]));
         $driver->connect();