Merge pull request #1 from solilokiam/add-test

Add tests

Author: solilokiam

.gitignore

@@ -0,0 +1,2 @@
+vendor
+composer.lock

README.md

@@ -152,7 +152,6 @@ Author
 
 TODO
 ----
-- Documentation
-- Tests
+- Improve Tests
 - Symfony 2.4 support
 

Store/RedisHttpStore.php

@@ -183,7 +183,7 @@ public function lock(Request $request)
 
         $this->client->close();
 
-        return $result;
+        return $result == 1;
     }
 
     /**
@@ -203,7 +203,7 @@ public function unlock(Request $request)
 
         $this->client->close();
 
-        return $result;
+        return $result == 1;
     }
 
     /**
@@ -243,7 +243,7 @@ public function purge($url)
 
         $this->client->close();
 
-        return $result;
+        return $result == 1;
     }
 
     /**

Test/RedisClient/ClientTest.php

@@ -0,0 +1,83 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: miquel
+ * Date: 17/03/14
+ * Time: 11:38
+ */
+
+namespace Solilokiam\HttpRedisCache\Test\RedisClient;
+
+
+use Solilokiam\HttpRedisCache\RedisClient\Client;
+
+class ClientTest extends \PHPUnit_Framework_TestCase
+{
+    protected $redisMock;
+
+    protected function setUp()
+    {
+        $this->redisMock = $this->getMock('\Redis');
+    }
+
+    public function testSimpleConnect()
+    {
+        $client = new Client(array('host' => 'localhost'));
+
+        $return = $client->createConnection();
+
+        $this->assertTrue($return);
+    }
+
+    public function testReadWriteKey()
+    {
+        $client = new Client(array('host' => 'localhost'));
+
+        $connection = $client->createConnection();
+
+        $this->assertTrue($connection);
+
+        $client->set('testkey', '1234');
+
+        $result = $client->get('testkey');
+
+        $this->assertEquals('1234', $result);
+
+        $client->del('testkey');
+    }
+
+    public function testDelKey()
+    {
+        $client = new Client(array('host' => 'localhost'));
+
+        $connection = $client->createConnection();
+
+        $this->assertTrue($connection);
+
+        $client->set('testkey', '1234');
+        $client->del('testkey');
+
+        $result = $client->get('testkey');
+
+        $this->assertEquals(false, $result);
+
+
+    }
+
+    public function testHashGet()
+    {
+        $client = new Client(array('host' => 'localhost'));
+
+        $connection = $client->createConnection();
+
+        $this->assertTrue($connection);
+
+        $client->hSetNx('testkey', 'testhash', 1);
+
+        $result = $client->hGet('testkey', 'testhash');
+
+        $this->assertEquals(1, $result);
+
+        $client->del('testkey');
+    }
+}

Test/Store/RedisHttpStoreTest.php

@@ -0,0 +1,130 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: miquel
+ * Date: 17/03/14
+ * Time: 12:29
+ */
+
+namespace Solilokiam\HttpRedisCache\Test\Store;
+
+
+use Solilokiam\HttpRedisCache\RedisClient\Client;
+use Solilokiam\HttpRedisCache\Store\RedisHttpStore;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class RedisHttpStoreTest extends \PHPUnit_Framework_TestCase
+{
+    protected $store;
+    protected $request;
+    protected $response;
+
+    public function setUp()
+    {
+        $this->store = new RedisHttpStore(array('host' => 'localhost'), 'hdr', 'ldr', 'mdr');
+
+        $this->request = Request::create('/');
+
+        $this->response = new Response('hello miquel', 200, array());
+
+        $this->cleanKeys();
+    }
+
+    public function tearDown()
+    {
+        $this->store = null;
+        $this->request = null;
+        $this->request = null;
+
+        $this->cleanKeys();
+    }
+
+    public function testReadsEmptyCacheAtKey()
+    {
+        $this->assertEmpty($this->getStoreMetadata('/nothing'));
+    }
+
+    public function testUnlockThatExists()
+    {
+        $cacheKey = $this->storeSimpleEntry();
+        $this->store->lock($this->request);
+
+        $this->assertTrue($this->store->unlock($this->request));
+    }
+
+    public function testUnlockThatDoesNotExist()
+    {
+        $this->assertFalse($this->store->unlock($this->request));
+    }
+
+    public function testRemoveEntriesForKeyWithPurge()
+    {
+        $request = Request::create('/foorequest');
+        $this->store->write($request, new Response('fooresponse'));
+
+        $metadata = $this->getStoreMetadata($request);
+        $this->assertNotEmpty($metadata);
+
+        $this->assertTrue($this->store->purge('/foorequest'));
+        $this->assertEmpty($this->getStoreMetadata($request));
+
+        $content = $this->loadContentData($metadata[0][1]['x-content-digest'][0]);
+        $this->assertNotEmpty($content);
+
+        $this->assertFalse($this->store->purge('/bar'));
+    }
+
+    public function testStoresACacheEntry()
+    {
+        $cacheKey = $this->storeSimpleEntry();
+
+        $this->assertNotEmpty($this->getStoreMetadata($cacheKey));
+    }
+
+    protected function cleanKeys()
+    {
+        $client = new Client(array('host' => 'localhost'));
+
+        $client->createConnection();
+        $client->flushAll();
+    }
+
+    protected function storeSimpleEntry($path = null, $headers = array())
+    {
+        if (null === $path) {
+            $path = '/test';
+        }
+
+        $this->request = Request::create($path, 'get', array(), array(), array(), $headers);
+        $this->response = new Response('test', 200, array('Cache-Control' => 'max-age=420'));
+
+        return $this->store->write($this->request, $this->response);
+    }
+
+    protected function getStoreMetadata($key)
+    {
+        $r = new \ReflectionObject($this->store);
+        $m = $r->getMethod('getMetadata');
+        $m->setAccessible(true);
+
+        if ($key instanceof Request) {
+            $m1 = $r->getMethod('getMetadataKey');
+            $m1->setAccessible(true);
+            $key = $m1->invoke($this->store, $key);
+        }
+
+        return $m->invoke($this->store, $key);
+    }
+
+    protected function loadContentData($key)
+    {
+        $r = new \ReflectionObject($this->store);
+        $m = $r->getMethod('load');
+        $m->setAccessible(true);
+
+        return $m->invoke($this->store, $key);
+    }
+
+
+}

composer.json

@@ -3,10 +3,12 @@
     "description": "An HttpCache extension with redis for Symfony 2",
     "require": {
         "php": ">=5.3.3",
-        "symfony/framework-bundle": "2.3.*"
+        "predis/predis": "0.8.*"
     },
     "require-dev": {
-        "predis/predis": "0.8.*"
+        "phpunit/phpunit": "3.7.14",
+        "symfony/http-foundation": "2.3.*@dev",
+        "symfony/http-kernel": "2.3.*@dev"
     },
     "license": "MIT",
     "authors": [

phpunit.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit colors="true" bootstrap="vendor/autoload.php">
+    <testsuites>
+        <testsuite name="Application Test Suite">
+            <directory>./Test/</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>