Cleanup tests for memory-based sqlite dbs

cakephp · Oct 13, 2014 · b8e92ef · b8e92ef
1 parent 44ed93e
commit b8e92ef
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ php:
 env:
   - DB=mysql db_dsn='Cake\Database\Driver\Mysql://travis@0.0.0.0/cakephp_test'
   - DB=pgsql db_dsn='Cake\Database\Driver\Postgres://postgres@127.0.0.1/cakephp_test'
-  - DB=sqlite db_dsn='Cake\Database\Driver\Sqlite:///?database=memory:'
+  - DB=sqlite db_dsn='Cake\Database\Driver\Sqlite:///memory:'
 
 services:
   - memcached
@@ -21,7 +21,7 @@ matrix:
     - php: 5.4
       env: PHPCS=1
     - php: hhvm-nightly
-      env: HHVM=1 DB=sqlite db_dsn='Cake\Database\Driver\Sqlite:///?database=memory:'
+      env: HHVM=1 DB=sqlite db_dsn='Cake\Database\Driver\Sqlite:///memory:'
     - php: hhvm-nightly
       env: HHVM=1 DB=mysql db_dsn='Cake\Database\Driver\Mysql://travis@0.0.0.0/cakephp_test'
 

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -34,7 +34,7 @@
 	<php>
 		<!-- SQLite
 		<env name="db_class" value="Cake\Database\Driver\Sqlite"/>
-		<env name="db_dsn" value="Cake\Database\Driver\Sqlite:///?database=memory:"/>
+		<env name="db_dsn" value="Cake\Database\Driver\Sqlite:///memory:"/>
 		-->
 		<!-- Postgres
 		<env name="db_class" value="Cake\Database\Driver\Postgres"/>

diff --git a/tests/TestCase/Core/StaticConfigTraitTest.php b/tests/TestCase/Core/StaticConfigTraitTest.php
@@ -74,6 +74,23 @@ public function testSimpleParseDsn() {
 			'username' => 'user',
 		];
 		$this->assertEquals($expected, $klassName::parseDsn(['url' => $dsn]));
+
+		$dsn = 'Cake\Database\Driver\Sqlite:///memory:';
+		$expected = [
+			'className' => 'Cake\Database\Driver\Sqlite',
+			'driver' => 'Cake\Database\Driver\Sqlite',
+			'path' => '/memory:',
+		];
+		$this->assertEquals($expected, $klassName::parseDsn(['url' => $dsn]));
+
+		$dsn = 'Cake\Database\Driver\Sqlite:///?database=memory:';
+		$expected = [
+			'className' => 'Cake\Database\Driver\Sqlite',
+			'driver' => 'Cake\Database\Driver\Sqlite',
+			'database' => 'memory:',
+			'path' => '/',
+		];
+		$this->assertEquals($expected, $klassName::parseDsn(['url' => $dsn]));
 	}
 
 /**

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -98,7 +98,7 @@
 
 // Ensure default test connection is defined
 if (!getenv('db_dsn')) {
-	putenv('db_dsn=Cake\Database\Driver\Sqlite:///?database=memory:');
+	putenv('db_dsn=Cake\Database\Driver\Sqlite:///memory:');
 }
 
 ConnectionManager::config('test', [