From b8e92ef1206968750f98f1dc47aa555380a6cf15 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <myaccounts@savant.be>
Date: Mon, 13 Oct 2014 16:47:51 -0400
Subject: [PATCH] Cleanup tests for memory-based sqlite dbs

---
 .travis.yml                                   |  4 ++--
 phpunit.xml.dist                              |  2 +-
 tests/TestCase/Core/StaticConfigTraitTest.php | 17 +++++++++++++++++
 tests/bootstrap.php                           |  2 +-
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 69f7a467a8b..e72c6a745a2 100644
--- 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
index f9fc6fc18b9..fe951b8b22e 100644
--- 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
index 1faf6a99254..23a766f4a4e 100644
--- 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
index df53fb4f8b7..e7b3863aa9d 100644
--- 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', [