speed up the unittests and the monitor app

gjerokrsteski · Mar 8, 2013 · 504463b · 504463b
1 parent c038d92
commit 504463b
Show file tree

Hide file tree

Showing 27 changed files with 24 additions and 48 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.gitignore b/.gitignore
diff --git a/.travis.yml b/.travis.yml
diff --git a/app/.htaccess b/app/.htaccess
diff --git a/app/bootstrap-responsive.min.css b/app/bootstrap-responsive.min.css
diff --git a/app/bootstrap.min.css b/app/bootstrap.min.css
diff --git a/app/config.php b/app/config.php
@@ -21,7 +21,7 @@
    * of the libraries required by the other handlers,
    * and when you cannot use bundled cdb handler.
    */
-  'handler'      => 'gdbm',
+  'handler'      => 'db4',
 
   /*
    * The mode for read/write access, database creation if it doesn't currently exist.

diff --git a/app/favicon.ico b/app/favicon.ico
diff --git a/app/index.php b/app/index.php
@@ -291,7 +291,7 @@ function bsize($s) {
             <button class="btn btn-success" type="submit" name="create-test-entry">Create Test Entry</button>
 
           <? if ($authenticated === false) : ?>
-            <button class="btn btn-success" type="submit" name="login">Login and Sweep</button>
+            <button class="btn btn-info" type="submit" name="login">Login and Sweep</button>
           <? endif; ?>
 
           <? if ($authenticated === true && $cache->erasable()) : ?>

diff --git a/bootstrap.php b/bootstrap.php
diff --git a/src/Cache.php b/src/Cache.php
diff --git a/src/Capsule.php b/src/Capsule.php
diff --git a/src/Serializer.php b/src/Serializer.php
diff --git a/src/Sweeper.php b/src/Sweeper.php
diff --git a/tests/CacheDbaHandlersTest.php b/tests/CacheDbaHandlersTest.php
@@ -2,7 +2,7 @@
 require_once dirname(__FILE__) .'/DummyFixtures.php';
 
 
-class CacheDbaHandlersTest extends PHPUnit_Framework_TestCase
+class CacheHandlersTest extends PHPUnit_Framework_TestCase
 {
   /**
    * @var stdClass
@@ -53,15 +53,15 @@ public function testOracleBerkeleyDb4HandlerSupportWithoutPersistantConnection()
      $this->markTestSkipped($e->getMessage());
     }
 
-    $this->assertInstanceOf('CacheDba', $cache);
+    $this->assertInstanceOf('Cache', $cache);
 
     $cache->put($this->_identifier, $this->_object);
 
     $this->assertInstanceOf('stdClass', $cache->get($this->_identifier));
   }
 
   /**
-   * @depends CacheDbaHandlersTest::testOracleBerkeleyDb4HandlerSupportWithoutPersistantConnection
+   * @depends CacheHandlersTest::testOracleBerkeleyDb4HandlerSupportWithoutPersistantConnection
    */
   public function testOracleBerkeleyDb4HandlerBeSupportedWithPersistantConnection()
   {
@@ -71,7 +71,7 @@ public function testOracleBerkeleyDb4HandlerBeSupportedWithPersistantConnection(
      $this->markTestSkipped($e->getMessage());
     }
 
-    $this->assertInstanceOf('CacheDba', $cache);
+    $this->assertInstanceOf('Cache', $cache);
 
     $cache->put($this->_identifier, $this->_object);
 
@@ -92,7 +92,7 @@ public function testCanCdbHandlerOnlyNewAndReadBeSupportedWithPersistantConnecti
      $this->markTestSkipped($e->getMessage());
     }
 
-    $this->assertInstanceOf('CacheDba', $cacheMake);
+    $this->assertInstanceOf('Cache', $cacheMake);
 
     $this->assertTrue($cacheMake->put(md5('test123'), $this->_object));
 

diff --git a/tests/CacheDbaTest.php b/tests/CacheDbaTest.php
@@ -2,7 +2,7 @@
 require_once dirname(__FILE__) .'/DummyFixtures.php';
 
 
-class CacheDbaTest extends PHPUnit_Framework_TestCase
+class CacheTest extends PHPUnit_Framework_TestCase
 {
   /**
    * @var Cache
@@ -62,7 +62,6 @@ public function objectsProvider()
   }
 
   /**
-   * @depends CacheDbaTest::testCreateNewCacheObjectNoException
    * @dataProvider objectsProvider
    */
   public function testPutSomeObjectsIntoTheCache($identifier, $object)
@@ -77,7 +76,7 @@ public function testPutSomeObjectsIntoTheCache($identifier, $object)
   }
 
   /**
-   * @depends CacheDbaTest::testPutSomeObjectsIntoTheCache
+   * @depends CacheTest::testPutSomeObjectsIntoTheCache
    * @dataProvider objectsProvider
    */
   public function testGetSomeObjectsFromTheCacheAndCompareEachother($identifier, $expectedObject)

diff --git a/tests/CacheGarbageCollectorTest.php b/tests/CacheGarbageCollectorTest.php
@@ -15,10 +15,10 @@ protected function setUp()
   {
     parent::setUp();
 
-    $path = dirname(dirname(__FILE__)) . '/tests/_drafts/garbage-collection-test-cache.flat';
+    $path = dirname(dirname(__FILE__)) . '/tests/_drafts/garbage-collection-test-cache.inifile';
 
     try {
-      $this->_cache = new Cache($path);
+      $this->_cache = new Cache($path, 'inifile');
     } catch(RuntimeException $e) {
       $this->markTestSkipped($e->getMessage());
     }
@@ -39,7 +39,7 @@ public function testCreatingGarbageCollectionObject()
   {
     $garbageCollection = new Sweeper($this->_cache);
 
-    $this->assertInstanceOf('CacheGarbageCollector', $garbageCollection);
+    $this->assertInstanceOf('Sweeper', $garbageCollection);
   }
 
   /**
@@ -57,44 +57,21 @@ public function testCleanAllFromTheGarbageCollection()
     $stdClass->body  = 'Yes, it works!';
 
     // put some data to the cache.
-    $this->_cache->put(md5('stdClass'), $stdClass);
-    $this->_cache->put(md5('ZipArchive'), new ZipArchive());
-    $this->_cache->put(md5('XMLReader'), new XMLReader());
-
-    $garbageCollection = new Sweeper($this->_cache);
-    $garbageCollection->cleanAll();
+    $this->_cache->put(md5('stdClass'), $stdClass, 1);
+    $this->_cache->put(md5('ZipArchive'), new ZipArchive(), 1);
+    $this->_cache->put(md5('XMLReader'), new XMLReader(), 1);
 
-    $this->assertFalse(dba_fetch(md5('stdClass'), $dba));
-    $this->assertFalse(dba_fetch(md5('ZipArchive'), $dba));
-    $this->assertFalse(dba_fetch(md5('XMLReader'), $dba));
-  }
 
-  /**
-   * @depends CacheGarbageCollectorTest::testCreatingGarbageCollectionObject
-   */
-  public function testCleanTheGarbageCollectionBySuitableExpirationTime()
-  {
-    // prepare data.
-    $stdClass        = new stdClass();
-    $stdClass->title = 'I am cached.';
-    $stdClass->from  = 'Mike';
-    $stdClass->to    = 'Gates';
-    $stdClass->body  = 'Yes, it works fine!';
+    sleep(1);
 
-    // put some data to the cache.
-    $this->_cache->put(md5('stdClass'), $stdClass, 2);
-    $this->_cache->put(md5('ZipArchive'), new ZipArchive(), 2);
-    $this->_cache->put(md5('XMLReader'), new XMLReader(), 2);
+    $garbageCollection = new Sweeper($this->_cache);
+    $garbageCollection->cleanAll();
 
-    // wait two seconds to force the expiration-time-calculation.
-    sleep(2);
+    $this->assertFalse($this->_cache->get(md5('stdClass')));
 
-    $garbageCollection = new Sweeper($this->_cache);
-    $garbageCollection->cleanOld();
+    $this->assertFalse($this->_cache->get(md5('ZipArchive')));
 
-    $this->assertFalse($this->_cache->has(md5('stdClass')));
-    $this->assertFalse($this->_cache->has(md5('ZipArchive')));
-    $this->assertFalse($this->_cache->has(md5('XMLReader')));
+    $this->assertFalse($this->_cache->get(md5('XMLReader')));
   }
 
   /**
@@ -140,7 +117,7 @@ public function testCleanTheGarbageCollectionWithCdbHandler()
      $this->markTestSkipped($e->getMessage());
     }
 
-    $this->assertInstanceOf('CacheDba', $cacheMake);
+    $this->assertInstanceOf('Cache', $cacheMake);
 
     $testIdentifier1 = md5('ZipArchive' . time());
     $testIdentifier2 = md5('XMLReader' . time());
@@ -188,7 +165,7 @@ public function testCleanTheGarbageCollectionWithDb4Handler()
      $this->markTestSkipped($e->getMessage());
     }
 
-    $this->assertInstanceOf('CacheDba', $cache);
+    $this->assertInstanceOf('Cache', $cache);
 
     $cache->put(md5('ZipArchive'), new ZipArchive());
     $cache->put(md5('XMLReader'), new XMLReader());
@@ -211,7 +188,6 @@ public function testUtilMethods()
   {
     $garbageCollection = new Sweeper($this->_cache);
 
-    $this->assertTrue(($garbageCollection->getFillingPercentage() > 0));
     $this->assertTrue($garbageCollection->flush());
   }
 }
diff --git a/tests/_drafts/backend-penetration-test-info.log b/tests/_drafts/backend-penetration-test-info.log
diff --git a/tests/_drafts/backend-penetration-test.flat b/tests/_drafts/backend-penetration-test.flat
diff --git a/tests/_drafts/cache.flat b/tests/_drafts/cache.flat
diff --git a/tests/_drafts/simple-xml-test-cache-on-cdb.db b/tests/_drafts/simple-xml-test-cache-on-cdb.db
diff --git a/tests/_drafts/simple-xml-test-cache.db4 b/tests/_drafts/simple-xml-test-cache.db4
diff --git a/tests/_drafts/test-cache-cdb2.cdb b/tests/_drafts/test-cache-cdb2.cdb
diff --git a/tests/_drafts/test-cache-insert.flat b/tests/_drafts/test-cache-insert.flat
diff --git a/tests/_drafts/test-cache-with-simplexml.db4 b/tests/_drafts/test-cache-with-simplexml.db4
diff --git a/tests/_drafts/test-cache.db4 b/tests/_drafts/test-cache.db4
diff --git a/tests/simple-xml-test.php b/tests/simple-xml-test.php
@@ -20,6 +20,7 @@
 $identifier = md5('simplexml_identifier');
 
 $path = dirname(dirname(__FILE__)).'/tests/_drafts/simple-xml-test-cache.db4';
+
 $cache = new Cache($path, 'db4');
 
 $cache->put($identifier, $simplexml, 60);