Implement into service and refactor tests

Author: Jamie Hannaford

lib/OpenCloud/LoadBalancer/Service.php

@@ -19,6 +19,7 @@
 
 use OpenCloud\Common\Log\Logger;
 use OpenCloud\Common\Service\NovaService;
+use OpenCloud\LoadBalancer\Collection\LoadBalancerIterator;
 
 /**
  * Class that encapsulates the Rackspace Cloud Load Balancers service
@@ -51,11 +52,20 @@ public function loadBalancer($id = null)
      */
     public function loadBalancerList($detail = true, array $filter = array())
     {
+        $options = $this->makeResourceIteratorOptions($this->resolveResourceClass('LoadBalancer'));
+
+        if (isset($filter['limit'])) {
+            $options['limit.page'] = $filter['limit'];
+            unset($filter['limit']);
+        }
+
         $url = $this->getUrl();
         $url->addPath(Resource\LoadBalancer::resourceName());
         $url->setQuery($filter);
 
-        return $this->resourceList('LoadBalancer', $url);
+        $options += array('baseUrl' => $url, 'key.marker' => 'id');
+
+        return LoadBalancerIterator::factory($this, $options);
     }
 
     /**

tests/OpenCloud/Tests/LoadBalancer/ServiceTest.php

@@ -27,15 +27,13 @@
 
 namespace OpenCloud\Tests\LoadBalancer;
 
-class ServiceTest extends \OpenCloud\Tests\OpenCloudTestCase
-{
-    private $service;
-
-    public function setupObjects()
-    {
-        $this->service = $this->getClient()->loadBalancerService('cloudLoadBalancers', 'DFW', 'publicURL');
-    }
+use Guzzle\Http\Message\Response;
+use Guzzle\Plugin\Mock\MockPlugin;
+use OpenCloud\Rackspace;
+use OpenCloud\Tests\MockSubscriber;
 
+class ServiceTest extends LoadBalancerTestCase
+{
     public function test__construct()
     {
         $this->assertInstanceOf(
@@ -52,12 +50,36 @@ public function testLoadBalancer()
         );
     }
 
-    public function testLoadBalancerList()
+    public function test_Listing_Load_Balancers()
     {
-        $this->assertInstanceOf(
-            self::COLLECTION_CLASS,
-            $this->service->loadBalancerList()
-        );
+        // Load JSON HTTP data
+        $authData = file_get_contents($this->getTestFilePath('Auth', './'));
+        $data1 = file_get_contents($this->getTestFilePath('LoadBalancers1'));
+        $data2 = file_get_contents($this->getTestFilePath('LoadBalancers2'));
+        $data3 = file_get_contents($this->getTestFilePath('LoadBalancers3'));
+
+        // Populate mock response queue
+        $mock = new MockPlugin();
+        $mock->addResponse(Response::fromMessage($authData))
+            ->addResponse(Response::fromMessage($data1))
+            ->addResponse(Response::fromMessage($data2))
+            ->addResponse(Response::fromMessage($data3));
+
+        // We need to define our own setup because *jazz hands*
+        $client = $this->newClient();
+        $client->addSubscriber($mock);
+        $service = $client->loadBalancerService(null, 'IAD');
+
+        // Ensure that a series of paginated calls return a holistic collection
+        $lbs = $service->loadBalancerList(false, array('limit' => 2));
+        $ids = array();
+        foreach ($lbs as $lb) {
+            $ids[] = $lb->id;
+        }
+
+        // Check our assumptions
+        $this->isCollection($lbs);
+        $this->assertEquals($ids, array(1,2,3,4,5));
     }
 
     public function testBillableLoadBalancer()

tests/OpenCloud/Tests/OpenCloudTestCase.php

@@ -38,17 +38,10 @@ abstract class OpenCloudTestCase extends \PHPUnit_Framework_TestCase
 
     public function newClient()
     {
-        $client = new Rackspace(Rackspace::US_IDENTITY_ENDPOINT, array(
+        return new Rackspace(Rackspace::US_IDENTITY_ENDPOINT, array(
             'username' => 'foo',
             'apiKey'   => 'bar'
         ));
-
-        $client->addSubscriber(new MockSubscriber());
-        //$client->addSubscriber(LogPlugin::getDebugPlugin());
-
-        $client->authenticate();
-
-        return $client;
     }
 
     public function getClient()
@@ -59,6 +52,10 @@ public function getClient()
     public function setUp()
     {
         $this->client = $this->newClient();
+
+        $this->client->addSubscriber(new MockSubscriber());
+        $this->client->authenticate();
+
         $this->setupObjects();
         $this->handleMockSubscribers();
     }