Merge pull request zendframework#3531 from samsonasik/dev.fixvarname

[2.1] Fix variable Name and Resource on Oracle Driver Test
HolgerW1 · Jan 23, 2013 · 58e8ec9 · 58e8ec9
2 parents 11a822c + 9782d7f
commit 58e8ec9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/tests/ZendTest/Db/Adapter/Driver/Oci8/ConnectionIntegrationTest.php b/tests/ZendTest/Db/Adapter/Driver/Oci8/ConnectionIntegrationTest.php
@@ -25,12 +25,8 @@ public function testGetCurrentSchema()
     public function testSetResource()
     {
         $this->markTestIncomplete('edit this');
-        $resource = sqlsrv_connect(
-            $this->variables['hostname'], array(
-                'UID' => $this->variables['username'],
-                'PWD' => $this->variables['password']
-            )
-        );
+        $resource = oci_connect($this->variables['username'], $this->variables['password']);
+
         $connection = new Connection(array());
         $this->assertSame($connection, $connection->setResource($resource));
 

diff --git a/tests/ZendTest/Db/Adapter/Driver/Oci8/StatementIntegrationTest.php b/tests/ZendTest/Db/Adapter/Driver/Oci8/StatementIntegrationTest.php
@@ -6,7 +6,7 @@
 
 /**
  * @group integration
- * @group integration-sqlsrv
+ * @group integration-oracle
  */
 class StatementIntegrationTest extends \PHPUnit_Framework_TestCase
 {
@@ -31,7 +31,7 @@ protected function setUp()
         }
 
         if (!extension_loaded('oci8')) {
-            $this->fail('The phpunit group integration-sqlsrv was enabled, but the extension is not loaded.');
+            $this->fail('The phpunit group integration-oracle was enabled, but the extension is not loaded.');
         }
     }
 
@@ -90,6 +90,6 @@ public function testExecute()
         $result = $statement->execute();
         $this->assertInstanceOf('Zend\Db\Adapter\Driver\Oci8\Result', $result);
 
-        unset($resource, $sqlsrvResource);
+        unset($resource, $oci8);
     }
 }