object_tests.rb in fog-1.16.0

- old
+ new

@@ -15,22 +15,22 @@
     tests("#put_object('fogobjecttests', 'fog_object')").succeeds do
       pending if Fog.mocking?
       Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', lorem_file)
     end
 
-    tests("#get_object('fogobjectests', 'fog_object')").returns(lorem_file.read) do
+    tests("#get_object('fogobjectests', 'fog_object')").succeeds do
       pending if Fog.mocking?
-      Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object').body
+      Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object').body == lorem_file.read
     end
 
-    tests("#get_object('fogobjecttests', 'fog_object', &block)").returns(lorem_file.read) do
+    tests("#get_object('fogobjecttests', 'fog_object', &block)").succeeds do
       pending if Fog.mocking?
       data = ''
       Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object') do |chunk, remaining_bytes, total_bytes|
         data << chunk
       end
-      data
+      data == lorem_file.read
     end
 
     tests("#head_object('fogobjectests', 'fog_object')").succeeds do
       pending if Fog.mocking?
       Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_object')
@@ -39,10 +39,24 @@
     tests("#delete_object('fogobjecttests', 'fog_object')").succeeds do
       pending if Fog.mocking?
       Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_object')
     end
 
+    tests("#get_object_http_url('directory.identity', 'fog_object', expiration timestamp)").returns(true) do
+      pending if Fog.mocking?
+      object_url = Fog::Storage[:openstack].get_object_http_url(@directory.identity, 'fog_object', (Time.now + 60))
+
+      (object_url =~ /http:\/\/\S+\/v1\/AUTH_\S+\/#{@directory.identity}\/fog_object\?temp_url_sig=\S+&temp_url_expires=\d+/) != nil
+    end
+
+    tests("#get_object_https_url('directory.identity', 'fog_object', expiration timestamp)").returns(true) do
+      pending if Fog.mocking?
+      object_url = Fog::Storage[:openstack].get_object_https_url(@directory.identity, 'fog_object', (Time.now + 60))
+
+      (object_url =~ /https:\/\/\S+\/v1\/AUTH_\S+\/#{@directory.identity}\/fog_object\?temp_url_sig=\S+&temp_url_expires=\d+/) != nil
+    end
+
     tests("put_object with block") do
       pending if Fog.mocking?
 
       tests("#put_object('fogobjecttests', 'fog_object', &block)").succeeds do
         begin
@@ -63,11 +77,35 @@
       tests('#delete_object').succeeds do
         Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_block_object')
       end
     end
 
+    tests('#delete_multiple_objects') do
+      pending if Fog.mocking?
 
+      Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', lorem_file)
+      Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object2', lorem_file)
+      Fog::Storage[:openstack].directories.create(:key => 'fogobjecttests2')
+      Fog::Storage[:openstack].put_object('fogobjecttests2', 'fog_object', lorem_file)
+
+      expected = {
+        "Number Not Found"  => 0,
+        "Response Status"   => "200 OK",
+        "Errors"            => [],
+        "Number Deleted"    => 2,
+        "Response Body"     => ""
+      }
+
+      returns(expected, 'deletes multiple objects') do
+        Fog::Storage[:openstack].delete_multiple_objects('fogobjecttests', ['fog_object', 'fog_object2']).body
+      end
+
+      returns(expected, 'deletes object and container') do
+        Fog::Storage[:openstack].delete_multiple_objects(nil, ['fogobjecttests2/fog_object', 'fogobjecttests2']).body
+      end
+    end
+
   end
 
   tests('failure') do
 
     tests("#get_object('fogobjecttests', 'fog_non_object')").raises(Fog::Storage::OpenStack::NotFound) do
@@ -98,9 +136,44 @@
     tests("#delete_object('fognoncontainer', 'fog_non_object')").raises(Fog::Storage::OpenStack::NotFound) do
       pending if Fog.mocking?
       Fog::Storage[:openstack].delete_object('fognoncontainer', 'fog_non_object')
     end
 
+    tests('#delete_multiple_objects') do
+      pending if Fog.mocking?
+
+      expected = {
+        "Number Not Found"  => 2,
+        "Response Status"   => "200 OK",
+        "Errors"            => [],
+        "Number Deleted"    => 0,
+        "Response Body"     => ""
+      }
+
+      returns(expected, 'reports missing objects') do
+        Fog::Storage[:openstack].delete_multiple_objects('fogobjecttests', ['fog_non_object', 'fog_non_object2']).body
+      end
+
+      returns(expected, 'reports missing container') do
+        Fog::Storage[:openstack].delete_multiple_objects('fognoncontainer', ['fog_non_object', 'fog_non_object2']).body
+      end
+
+      tests('deleting non-empty container') do
+        Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', lorem_file)
+
+        expected = {
+          "Number Not Found"  => 0,
+          "Response Status"   => "400 Bad Request",
+          "Errors"            => [['fogobjecttests', '409 Conflict']],
+          "Number Deleted"    => 1,
+          "Response Body"     => ""
+        }
+
+        returns(expected, 'deletes object but not container') do
+          Fog::Storage[:openstack].delete_multiple_objects(nil, ['fogobjecttests', 'fogobjecttests/fog_object']).body
+        end
+      end
+    end
   end
 
   unless Fog.mocking?
     @directory.destroy
   end