Removed Scisr_Db and refactored last tests that used file-based database

giorgiosironi · Jul 27, 2010 · 0982dab · 0982dab
1 parent 14f2906
commit 0982dab
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 46 deletions.
diff --git a/Db.php b/Db.php
diff --git a/Scisr.php b/Scisr.php
@@ -109,7 +109,8 @@ public function setOutput($output)
     public static function createScisr($className = 'Scisr', $db = null)
     {
         if ($db === null) {
-            $db = Scisr_Db::getDb();
+            $db_path = dirname(__FILE__) . '/cache.db';
+            $db = new PDO("sqlite:$db_path", null, null, array(PDO::ATTR_PERSISTENT => true));
         }
         $dbFiles = new Scisr_Db_Files($db);
         $dbFiles->init();

diff --git a/tests/AbstractVariableTypeTest.php b/tests/AbstractVariableTypeTest.php
@@ -55,7 +55,7 @@ public function testGetEndOfVar($code, $startContent, $endContent, $endPtrOffset
         }
         $expectedEndPtr += $endPtrOffset;
         // Fire up the tester
-        $tester = new AbstractVariableTypeTester();
+        $tester = new AbstractVariableTypeTester($this->getDb());
         $endPtr = $tester->exposeGetEndOfVar($startPtr, $tokens);
 
         $this->assertEquals($expectedEndPtr, $endPtr);
@@ -75,7 +75,7 @@ public function testGetStartOfVar($code, $startContent, $endContent, $endPtrOffs
         }
         $endPtr += $endPtrOffset;
         // Fire up the tester
-        $tester = new AbstractVariableTypeTester();
+        $tester = new AbstractVariableTypeTester($this->getDb());
         $startPtr = $tester->exposeGetStartOfVar($endPtr, $tokens);
 
         $this->assertEquals($startContent, $tokens[$startPtr]['content']);
@@ -138,9 +138,8 @@ public function variableProvider() {
  */
 class AbstractVariableTypeTester extends Scisr_Operations_VariableTypes
 {
-    public function __construct()
+    public function __construct($db)
     {
-        $db = Scisr_Db::getDb();
         parent::__construct(new Scisr_Db_Classes($db), new Scisr_Db_FileIncludes($db), new Scisr_Db_VariableTypes($db));
     }
 

diff --git a/tests/Db/FileIncludesTest.php b/tests/Db/FileIncludesTest.php
@@ -3,7 +3,7 @@
 
 class Scisr_Db_FileIncludesTest extends Scisr_TestCase {
     public function testIncludeFileRepeatedly() {
-        $dbFileIncludes = new Scisr_Db_FileIncludes(Scisr_Db::getDb());
+        $dbFileIncludes = new Scisr_Db_FileIncludes($this->getDb());
         $dbFileIncludes->init();
         $dbFileIncludes->registerFileInclude('/x/y/myfile.php', '/x/z/otherfile.php');
         $dbFileIncludes->registerFileInclude('/x/y/myfile.php', '/x/z/otherfile.php');