Merge pull request rackspace#646 from PatrickRose/working

Make sure container name is valid when retrieving

Author: Jamie Hannaford

lib/OpenCloud/ObjectStore/Service.php

@@ -92,6 +92,10 @@ public function listContainers(array $filter = array())
      */
     public function getContainer($data = null)
     {
+        if (is_string($data) || is_numeric($data)) {
+            $this->checkContainerName($data);
+        }
+
         return new Container($this, $data);
     }
 

tests/OpenCloud/Tests/ObjectStore/ServiceTest.php

@@ -99,6 +99,48 @@ public function test_Bad_Container_Name_Long()
         $this->service->createContainer(str_repeat('a', Service::MAX_CONTAINER_NAME_LENGTH + 1));
     }
 
+    /**
+     * @expectedException OpenCloud\Common\Exceptions\InvalidArgumentError
+     */
+    public function test_Get_Bad_Container_Name_Empty()
+    {
+        $this->service->getContainer('');
+    }
+
+    /**
+     * @expectedException OpenCloud\Common\Exceptions\InvalidArgumentError
+     */
+    public function test_Get_Bad_Container_Name_Slashes()
+    {
+        $this->service->getContainer('foo/bar');
+    }
+
+    /**
+     * @expectedException OpenCloud\Common\Exceptions\InvalidArgumentError
+     */
+    public function test_Get_Bad_Container_Name_Long()
+    {
+        $this->service->getContainer(str_repeat('a', Service::MAX_CONTAINER_NAME_LENGTH + 1));
+    }
+
+    /**
+     * @expectedException OpenCloud\Common\Exceptions\InvalidArgumentError
+     */
+    public function test_Get_Bad_Container_Name_Float()
+    {
+        $this->service->getContainer(4.5);
+    }
+
+    public function test_Get_Container_String()
+    {
+        $this->assertInstanceOf('OpenCloud\ObjectStore\Resource\Container', $this->service->getContainer('foo'));
+    }
+
+    public function test_Get_Container_Integer()
+    {
+        $this->assertInstanceOf('OpenCloud\ObjectStore\Resource\Container', $this->service->getContainer(1));
+    }
+
     public function test_Bulk_Extract()
     {
         $response = $this->service->bulkExtract('fooBarContainer', 'CONTENT', UrlType::TAR);