More tests

honeybee · Apr 10, 2017 · fc506da · fc506da
1 parent 622ca13
commit fc506da
Show file tree

Hide file tree

Showing 7 changed files with 251 additions and 45 deletions.
diff --git a/README.md b/README.md
@@ -4,8 +4,3 @@
 [![Build Status](https://travis-ci.org/honeybee/couchdb-adapter.svg?branch=master)](https://travis-ci.org/honeybee/couchdb-adapter)
 [![Coverage Status](https://coveralls.io/repos/github/honeybee/couchdb-adapter/badge.svg?branch=master)](https://coveralls.io/github/honeybee/couchdb-adapter?branch=master)
 [![Gitter Chat](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/honeybee/Lobby)
-
-Find us on:
-
-* Gitter: https://gitter.im/honeybee/Lobby
-* IRC: freenode.net #honeybee
diff --git a/composer.lock b/composer.lock
diff --git a/src/Storage/DomainEvent/DomainEventReader.php b/src/Storage/DomainEvent/DomainEventReader.php
@@ -13,7 +13,7 @@
 
 class DomainEventReader extends CouchDbStorage implements StorageReaderInterface
 {
-    protected $lastKey = null;
+    protected $lastKey;
 
     public function read($identifier, SettingsInterface $settings = null)
     {

diff --git a/src/Storage/StructureVersionList/StructureVersionListReader.php b/src/Storage/StructureVersionList/StructureVersionListReader.php
@@ -2,7 +2,9 @@
 
 namespace Honeybee\CouchDb\Storage\StructureVersionList;
 
+use Assert\Assertion;
 use GuzzleHttp\Exception\RequestException;
+use Honeybee\Common\Error\RuntimeError;
 use Honeybee\CouchDb\Storage\CouchDbStorage;
 use Honeybee\Infrastructure\DataAccess\Storage\StorageReaderInterface;
 use Honeybee\Infrastructure\Config\Settings;
@@ -15,7 +17,28 @@ class StructureVersionListReader extends CouchDbStorage implements StorageReader
 {
     const READ_ALL_LIMIT = 10;
 
-    protected $nextStartKey = null;
+    protected $lastKey;
+
+    public function read($identifier, SettingsInterface $settings = null)
+    {
+        Assertion::string($identifier);
+        Assertion::notBlank($identifier);
+
+        try {
+            $response = $this->request($identifier, self::METHOD_GET);
+            $resultData = json_decode($response->getBody(), true);
+        } catch (RequestException $error) {
+            if ($error->getResponse()->getStatusCode() === 404) {
+                return null;
+            } else {
+                throw $error;
+            }
+        }
+
+        $resultData['revision'] = $resultData['_rev'];
+
+        return $this->createStructureVersionList($resultData['_id'], $resultData['versions']);
+    }
 
     public function readAll(SettingsInterface $settings = null)
     {
@@ -30,62 +53,48 @@ public function readAll(SettingsInterface $settings = null)
         ];
 
         if (!$settings->get('first', true)) {
-            if (!$this->nextStartKey) {
+            if (!$this->lastKey) {
                 return $data;
             }
 
-            $requestParams['startkey'] = sprintf('"%s"', $this->nextStartKey);
             $requestParams['skip'] = 1;
+            $requestParams['startkey'] = sprintf('"%s"', $this->lastKey);
         }
 
+        // @todo catch RequestException?
         $response = $this->request('_all_docs', self::METHOD_GET, [], $requestParams);
         $resultData = json_decode($response->getBody(), true);
 
+        if (!isset($resultData['rows'])) {
+            throw new RuntimeError(sprintf('Invalid rows response from CouchDb: %s', var_export($resultData, true)));
+        }
+
         foreach ($resultData['rows'] as $row) {
-            $data[] = $this->createStructureVersionList($row);
+            $data[] = $this->createStructureVersionList($row['_id'], $row['versions']);
         }
 
         if ($resultData['total_rows'] === $resultData['offset'] + 1) {
-            $this->nextStartKey = null;
+            $this->lastKey = null;
         } else {
             $lastRow = end($data);
-            $this->nextStartKey = $lastRow[self::DOMAIN_FIELD_ID];
+            $this->lastKey = $lastRow->getIdentifier();
         }
 
         return $data;
     }
 
-    public function read($identifier, SettingsInterface $settings = null)
-    {
-        try {
-            $response = $this->request($identifier, self::METHOD_GET);
-            $resultData = json_decode($response->getBody(), true);
-        } catch (RequestException $error) {
-            if ($error->getResponse()->getStatusCode() === 404) {
-                return null;
-            } else {
-                throw $error;
-            }
-        }
-
-        $resultData['revision'] = $resultData['_rev'];
-
-        return $this->createStructureVersionList($resultData);
-    }
-
     public function getIterator()
     {
         return new StorageReaderIterator($this);
     }
 
-    protected function createStructureVersionList(array $data)
+    protected function createStructureVersionList($identifier, array $versions)
     {
-        $structureVersionList = new StructureVersionList($data['_id']);
-
-        foreach ($data['versions'] as $versionData) {
-            $structureVersionList->push(new StructureVersion($versionData));
+        $structureVersions = [];
+        foreach ($versions as $version) {
+            $structureVersions[] = new StructureVersion($version);
         }
 
-        return $structureVersionList;
+        return new StructureVersionList($identifier, $structureVersions);
     }
 }
diff --git a/tests/Connector/CouchDbConnectorTest.php b/tests/Connector/CouchDbConnectorTest.php
@@ -27,6 +27,7 @@ public function testGetConnectionWorks()
         $connection = $connector->getConnection();
         $this->assertTrue($connector->isConnected(), 'Connector should be connected after getConnection() call');
         $this->assertTrue(is_object($connection), 'A getConnection() call should yield a client/connection object');
+        $this->assertSame($connection, $connector->getConnection());
     }
 
     public function testDisconnectWorks()

diff --git a/tests/Storage/EventStream/EventStreamReaderTest.php b/tests/Storage/EventStream/EventStreamReaderTest.php
@@ -33,15 +33,16 @@ public function setUp()
         $this->mockResponse = Mockery::mock(Response::CLASS);
     }
 
-
     public function testGetIterator()
     {
         $stubbedEventReader = Mockery::mock(
             EventStreamReader::CLASS.'[readAll]',
             [$this->mockConnector, new ArrayConfig([]), new NullLogger]
         );
-        $stubbedEventReader->shouldReceive('readAll')->once()->andReturn([]);
-        $this->assertInstanceOf(StorageReaderIterator::CLASS, $stubbedEventReader->getIterator());
+        $stubbedEventReader->shouldReceive('readAll')->once()->andReturn(['something']);
+        $iterator = $stubbedEventReader->getIterator();
+        $this->assertInstanceOf(StorageReaderIterator::CLASS, $iterator);
+        $this->assertTrue($iterator->valid());
     }
 
     /**