Updated for code review

Author: haphan

tests/unit/Metric/v1/Gnocchi/Fixtures/resource-get.resp

@@ -0,0 +1,27 @@
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=UTF-8
+
+
+{
+  "created_by_user_id":"fake-created-by-user-id",
+  "started_at":"2017-05-10T16:58:15.023677+00:00",
+  "user_id":"c3f6c6e949f34fc38f71b89c04d1ed60",
+  "revision_end":null,
+  "created_by_project_id":"a652c6a9566149dd9c38ad23c00f1cd7",
+  "id":"1111",
+  "metrics":{
+     "volume.resize":"0920c1f6-bd1b-4c73-8110-d8129ee4ad2d",
+     "volume":"dd12bc6c-0e5e-407f-9663-aed2369c5d21",
+     "volume.size":"4b6e868d-0f9e-4570-8c59-b6d3cc55fae2",
+     "volume.delete":"6beba0c2-f6b8-492b-aa8a-7fe357a6a886",
+     "volume.update":"0f42f43a-212f-45aa-9420-4b68623ce641",
+     "volume.detach":"80ab8cc2-2a39-4f17-855a-32979d9c2905",
+     "volume.create":"4219ffe6-2765-4e6a-9f05-1ba20bd6dd7f",
+     "volume.attach":"c1a83e6a-c81e-4269-950e-bce92a189f89"
+  },
+  "original_resource_id":"18c70355-9665-4252-8a84-01f55bef1a45",
+  "revision_start":"2017-05-10T16:58:15.023689+00:00",
+  "project_id":"fake-project-id",
+  "type":"fake-type",
+  "ended_at":null
+}

tests/unit/Metric/v1/Gnocchi/Models/ResourceTest.php

@@ -2,7 +2,6 @@
 
 namespace OpenStack\Test\Metric\v1\Gnocchi\Models;
 
-use GuzzleHttp\Psr7\Response;
 use OpenStack\Metric\v1\Gnocchi\Models\Metric;
 use OpenStack\Metric\v1\Gnocchi\Models\Resource;
 use OpenStack\Metric\v1\Gnocchi\Api;
@@ -26,9 +25,13 @@ public function setUp()
 
     public function test_it_retrieves()
     {
-        $this->setupMock('GET', 'v1/resource/generic/1111', null, [], new Response(204));
-
+        $this->setupMock('GET', 'v1/resource/generic/1111', null, [], 'resource-get');
         $this->resource->retrieve();
+        $this->assertEquals('fake-project-id', $this->resource->projectId);
+        $this->assertEquals('fake-created-by-user-id', $this->resource->createdByUserId);
+        $this->assertEquals('fake-type', $this->resource->type);
+        $this->assertInternalType('array', $this->resource->metrics);
+        $this->assertEquals(8, count($this->resource->metrics));
     }
 
 
@@ -47,16 +50,20 @@ public function test_it_gets_metric()
     public function test_it_gets_metric_measures()
     {
         $this->setupMock('GET', sprintf('v1/resource/generic/1111/metric/storage.objects.outgoing.bytes/measures'), [], [], 'resource-metric-measures-get');
+        $measures = $this->resource->getMetricMeasures(['metric' => 'storage.objects.outgoing.bytes']);
 
-        $this->resource->getMetricMeasures(['metric' => 'storage.objects.outgoing.bytes']);
+        $this->assertInternalType('array', $measures);
+        $this->assertEquals(7, count($measures));
+        $this->assertEquals('2017-05-16T00:00:00+00:00', $measures[0][0]);
     }
 
     public function test_it_lists_resource_metrics()
     {
         $this->setupMock('GET', 'v1/resource/generic/1111/metric', [], [], 'resource-metrics-get');
 
-        $result = $this->resource->listResourceMetrics();
+        $result = iterator_to_array($this->resource->listResourceMetrics());
 
+        $this->assertEquals(23, count($result));
         $this->assertContainsOnlyInstancesOf(Metric::class, $result);
     }
 }

tests/unit/Metric/v1/Gnocchi/ServiceTest.php

@@ -28,8 +28,9 @@ public function test_it_lists_resource_types()
             ->shouldBeCalled()
             ->willReturn($this->getFixture('resourcetypes-get'));
 
-        $result = $this->service->listResourceTypes();
+        $result = iterator_to_array($this->service->listResourceTypes());
 
+        $this->assertEquals(15, count($result));
         $this->assertContainsOnlyInstancesOf(ResourceType::class, $result);
     }
 
@@ -40,14 +41,18 @@ public function test_it_lists_resources()
             ->shouldBeCalled()
             ->willReturn($this->getFixture('resources-get'));
 
-        $result = $this->service->listResources(['limit' => 3]);
+        $result = iterator_to_array($this->service->listResources(['limit' => 3]));
 
+        $this->assertEquals(3, count($result));
         $this->assertContainsOnlyInstancesOf(Resource::class, $result);
     }
 
     public function test_it_get_resource()
     {
-        $this->assertInstanceOf(Resource::class, $this->service->getResource(['id' => '1']));
+        $resource = $this->service->getResource(['id' => '1']);
+
+        $this->assertEquals('1', $resource->id);
+        $this->assertInstanceOf(Resource::class, $resource);
     }
 
     public function test_it_search_resources()