aws 1.11.38 → 2.1.0

data/test/s3/test_right_s3_stubbed.rb

@@ -1,15 +1,17 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/../test_credentials.rb'
 
 class TestS3Stubbed < Test::Unit::TestCase
 
   RIGHT_OBJECT_TEXT     = 'Right test message'
   
   def setup
-    @s3     = Rightscale::S3Interface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
+      TestCredentials.get_credentials
+    @s3     = Aws::S3Interface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
     @bucket = 'right_s3_awesome_test_bucket'
     @key1   = 'test/woohoo1'
     @key2   = 'test1/key/woohoo2'
-    @s      = Rightscale::S3.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
+    @s      = Aws::S3.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
     Rightscale::HttpConnection.reset
   end
 
@@ -18,21 +20,21 @@ class TestS3Stubbed < Test::Unit::TestCase
     Rightscale::HttpConnection.push(409, 'The named bucket you tried to create already exists')
     Rightscale::HttpConnection.push(500, 'We encountered an internal error.  Please try again.')
     Rightscale::HttpConnection.push(500, 'We encountered an internal error.  Please try again.')
-    assert_raise RightAws::AwsError do
+    assert_raise Aws::AwsError do
       @s3.create_bucket(@bucket)
     end
   end
 
   def test_102_list_all_my_buckets_failure
     Rightscale::HttpConnection.push(401, 'Unauthorized') 
-    assert_raise RightAws::AwsError do
+    assert_raise Aws::AwsError do
       @s3.list_all_my_buckets
     end
   end
 
   def test_103_list_empty_bucket
     Rightscale::HttpConnection.push(403, 'Access Denied') 
-    assert_raise RightAws::AwsError do
+    assert_raise Aws::AwsError do
       @s3.list_bucket(@bucket)
     end
   end
@@ -41,10 +43,10 @@ class TestS3Stubbed < Test::Unit::TestCase
     Rightscale::HttpConnection.push(400, 'Your proposed upload exceeds the maximum allowed object size.') 
     Rightscale::HttpConnection.push(400, 'The Content-MD5 you specified was an invalid.') 
     Rightscale::HttpConnection.push(409, 'Please try again') 
-    assert_raise RightAws::AwsError do
+    assert_raise Aws::AwsError do
       assert @s3.put(@bucket, @key1, RIGHT_OBJECT_TEXT, 'x-amz-meta-family'=>'Woohoo1!'), 'Put bucket fail'
     end
-    assert_raise RightAws::AwsError do
+    assert_raise Aws::AwsError do
       assert @s3.put(@bucket, @key2, RIGHT_OBJECT_TEXT, 'x-amz-meta-family'=>'Woohoo2!'), 'Put bucket fail'
     end
   end
@@ -56,7 +58,7 @@ class TestS3Stubbed < Test::Unit::TestCase
   
   def test_106_head
     Rightscale::HttpConnection.push(404, 'Good Luck!') 
-    assert_raise RightAws::AwsError do
+    assert_raise Aws::AwsError do
       @s3.head(@bucket,@key1)
     end
   end
@@ -72,7 +74,7 @@ class TestS3Stubbed < Test::Unit::TestCase
     Rightscale::HttpConnection.push(500, 'not found') 
     #--- test COPY
     # copy a key
-    assert_raise RightAws::AwsError do
+    assert_raise Aws::AwsError do
       @s3.copy(@bucket, @key1, @bucket, @key1_copy)
     end
     

data/test/sdb/test_active_sdb.rb

@@ -1,15 +1,16 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
-require '../test_credentials'
+require File.dirname(__FILE__) + '/../test_credentials.rb'
 
 class TestSdb < Test::Unit::TestCase
   
   DOMAIN_NAME = 'right_sdb_awesome_test_domain'
   
-  class Client < RightAws::ActiveSdb::Base
+  class Client < Aws::ActiveSdb::Base
     set_domain_name DOMAIN_NAME
   end
 
   def setup
+      TestCredentials.get_credentials
     STDOUT.sync  = true
     @clients = [ 
       { 'name' => 'Bush',     'country' => 'USA',    'gender' => 'male',   'expiration' => '2009', 'post' => 'president' },
@@ -18,7 +19,7 @@ class TestSdb < Test::Unit::TestCase
       { 'name' => 'Mary',     'country' => 'USA',    'gender' => 'female', 'hobby' => ['patchwork', 'bundle jumping'] },
       { 'name' => 'Sandy',    'country' => 'Russia', 'gender' => 'female', 'hobby' => ['flowers', 'cats', 'cooking'] },
       { 'name' => 'Mary',     'country' => 'Russia', 'gender' => 'female', 'hobby' => ['flowers', 'cats', 'cooking'] } ]
-    RightAws::ActiveSdb.establish_connection(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
+    Aws::ActiveSdb.establish_connection(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
   end
 
   SDB_DELAY = 3
@@ -34,22 +35,22 @@ class TestSdb < Test::Unit::TestCase
   end
 
   #---------------------------
-  # Rightscale::SdbInterface
+  # Aws::SdbInterface
   #---------------------------
 
   def test_00_delete_domain
-    assert RightAws::ActiveSdb.delete_domain(DOMAIN_NAME)
+    assert Aws::ActiveSdb.delete_domain(DOMAIN_NAME)
     wait SDB_DELAY, 'test 00: after domain deletion'
   end
   
   def test_01_create_domain
     # check that domain does not exist
-    assert !RightAws::ActiveSdb.domains.include?(DOMAIN_NAME)
+    assert !Aws::ActiveSdb.domains.include?(DOMAIN_NAME)
     # create domain
     assert Client.create_domain
     wait SDB_DELAY, 'test 01: after domain creation'
     # check that we have received new domain from Amazin
-    assert RightAws::ActiveSdb.domains.include?(DOMAIN_NAME)
+    assert Aws::ActiveSdb.domains.include?(DOMAIN_NAME)
   end
 
   def test_02_create_items
@@ -105,11 +106,11 @@ class TestSdb < Test::Unit::TestCase
     assert_equal ids.size, Client.find(ids).size
     ids << 'dummy_id'
     # must raise an error when getting unexistent record
-    assert_raise(RightAws::ActiveSdb::ActiveSdbError) do 
+    assert_raise(Aws::ActiveSdb::ActiveSdbError) do
       Client.find(ids)
     end
     # find one record by unknown id
-    assert_raise(RightAws::ActiveSdb::ActiveSdbError) do
+    assert_raise(Aws::ActiveSdb::ActiveSdbError) do
       Client.find('dummy_id')
     end
   end
@@ -292,7 +293,7 @@ class TestSdb < Test::Unit::TestCase
   def test_14_delete_domain
     assert Client.delete_domain
     wait SDB_DELAY, 'test 12: after delete domain'
-    assert_raise(Rightscale::AwsError) do 
+    assert_raise(Aws::AwsError) do
       Client.find :all 
     end
   end

data/test/sdb/test_right_sdb.rb

@@ -1,247 +1,215 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
+require File.dirname(__FILE__) + '/../test_credentials.rb'
 
 class TestSdb < Test::Unit::TestCase
 
-  def setup
-    STDOUT.sync  = true
-    @domain = 'right_sdb_awesome_test_domain'
-    @item   = 'toys'
-    @attr   = { 'Jon' => %w{beer car} }
-    # Interface instance
-    @sdb    = Rightscale::SdbInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
-  end
-
-  SDB_DELAY = 2
-  
-  def wait(delay, msg='')
-    print "waiting #{delay} seconds #{msg}"
-    while delay>0 do
-      delay -= 1
-      print '.'
-      sleep 1
-    end
-    puts
-  end
-
-  #---------------------------
-  # Rightscale::SdbInterface
-  #---------------------------
-
-  def test_00_delete_domain
-    # delete the domain to reset all the things
-    assert @sdb.delete_domain(@domain), 'delete_domain fail'
-    wait SDB_DELAY, 'after domain deletion'
-  end
-  
-  def test_01_create_domain
-    # check that domain does not exist
-    assert !@sdb.list_domains[:domains].include?(@domain)
-    # create domain
-    assert @sdb.create_domain(@domain), 'create_domain fail'
-    wait SDB_DELAY, 'after domain creation'
-    # check that we have received new domain from Amazin
-    assert @sdb.list_domains[:domains].include?(@domain)
-  end
-
-  def test_02_put_attributes
-    # put attributes
-    assert @sdb.put_attributes(@domain, @item, @attr)
-    wait SDB_DELAY, 'after putting attributes'
-  end
-  
-  def test_03_get_attributes
-    # get attributes
-    values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon'].to_a.sort
-    # compare to original list
-    assert_equal values, @attr['Jon'].sort
-  end
-
-  def test_04_add_attributes
-    # add new attribute
-    new_value = 'girls'
-    @sdb.put_attributes @domain, @item, {'Jon' => new_value}
-    wait SDB_DELAY, 'after putting attributes'
-    # get attributes ('girls' must be added to already existent attributes)
-    values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon'].to_a.sort
-    assert_equal values, (@attr['Jon'] << new_value).sort
-  end
-  
-  def test_05_replace_attributes
-    # replace attributes
-    @sdb.put_attributes @domain, @item, {'Jon' => 'pub'}, :replace
-    wait SDB_DELAY, 'after replacing attributes'
-    # get attributes (all must be removed except of 'pub')
-    values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon']
-    assert_equal values, ['pub']
-  end
-  
-  def test_06_delete_attribute
-    # add value 'girls' and 'vodka' to 'Jon'
-    @sdb.put_attributes @domain, @item, {'Jon' => ['girls','vodka']}
-    wait SDB_DELAY, 'after adding attributes'
-    # get attributes ('girls' and 'vodka' must be added 'pub')
-    values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon'].to_a.sort
-    assert_equal values, ['girls', 'pub', 'vodka']
-    # delete a single value 'girls' from attribute 'Jon'
-    @sdb.delete_attributes @domain, @item, 'Jon' => ['girls']
-    wait SDB_DELAY, 'after the deletion of attribute'
-    # get attributes ('girls' must be removed)
-    values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon']
-    assert_equal values, ['pub', 'vodka']
-    # delete all values from attribute 'Jon'
-    @sdb.delete_attributes @domain, @item, ['Jon']
-    wait SDB_DELAY, 'after the deletion of attributes'
-    # get attributes (values must be empty)
-    values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon']
-    assert_equal values, nil
-  end
-
-  def test_07_delete_item
-    @sdb.put_attributes @domain, @item, {'Volodya' => ['girls','vodka']}
-    wait SDB_DELAY, 'after adding attributes'
-    # get attributes ('girls' and 'vodka' must be there)
-    values = @sdb.get_attributes(@domain, @item)[:attributes]['Volodya'].to_a.sort
-    assert_equal values, ['girls', 'vodka']
-    # delete an item
-    @sdb.delete_attributes @domain, @item
-    # get attributes (values must be empty)
-    values = @sdb.get_attributes(@domain, @item)[:attributes]['Volodya']
-    assert_equal values, nil
-  end  
-  
-  def test_08_query
-    # add some values for query
-    @sdb.put_attributes @domain, @item, {'Jon' => ['girls','vodka']}
-    wait SDB_DELAY, 'after adding attributes'
-    items = @sdb.query(@domain, ['[?=?]', 'Jon','vodka'])[:items]
-    assert_equal items.size, 1
-    assert_equal items.first, @item
-  end
-  
-  def test_09_signature_version_0 
-    sdb    = Rightscale::SdbInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :signature_version => '0') 
-    item   = 'toys' 
-    # TODO: need to change the below test.  I think Juergen's intention was to include some umlauts in the values
-    # put attributes 
-    # mhhh... Not sure how to translate this: hölzchehn klötzchen grÃŒnspan buße... Lets assume this is:
-    attributes = { 'Jurgen' => %w{kitten puppy chickabiddy piglet} } 
-    assert sdb.put_attributes(@domain, item, attributes) 
-    wait SDB_DELAY, 'after putting attributes' 
-    # get attributes 
-    values = sdb.get_attributes(@domain, item)[:attributes]['Jurgen'].to_a.sort 
-    # compare to original list 
-    assert_equal values, attributes['Jurgen'].sort 
-    # check that the request has correct signature version
-    assert sdb.last_request.path.include?('SignatureVersion=0')
-  end 
-
-  def test_10_signature_version_1
-    sdb = Rightscale::SdbInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :signature_version => '1')
-    domains = nil
-    assert_nothing_thrown "Failed to use signature V1" do
-      domains = sdb.list_domains
-    end
-    assert domains
-  end
-
-  def test_11_signature_version_1
-    sdb = Rightscale::SdbInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :signature_version => '2')
-    domains = nil
-    assert_nothing_thrown "Failed to use signature V2" do
-      domains = sdb.list_domains
-    end
-    assert domains
-  end
-
-  def test_12_array_of_attrs
-    item = 'multiples'
-    assert_nothing_thrown "Failed to put multiple attrs" do
-      @sdb.put_attributes(@domain, item, {:one=>1, :two=>2, :three=>3})
-    end
-  end
-  
-  def test_13_zero_len_attrs
-    item = 'zeroes'
-    assert_nothing_thrown "Failed to put zero-length attributes" do
-      @sdb.put_attributes(@domain, item, {:one=>"", :two=>"", :three=>""})
-    end
-  end
-  
-  def test_14_nil_attrs
-    item = 'nils'
-    res = nil
-    assert_nothing_thrown do
-      @sdb.put_attributes(@domain, item, {:one=>nil, :two=>nil, :three=>'chunder'})
-    end
-    assert_nothing_thrown do
-      res = @sdb.get_attributes(@domain, item)
-    end
-    assert_nil(res[:attributes]['one'][0])
-    assert_nil(res[:attributes]['two'][0])
-    assert_not_nil(res[:attributes]['three'][0])
-  end
-  
-  def test_15_url_escape
-    item = 'urlescapes'
-    content = {:a=>"one & two & three",
-               :b=>"one ? two / three"}
-    @sdb.put_attributes(@domain, item, content)
-
-    res = @sdb.get_attributes(@domain, item)
-    assert_equal(content[:a], res[:attributes]['a'][0])
-    assert_equal(content[:b], res[:attributes]['b'][0])
-  end
-  
-  def test_16_put_attrs_by_post
-    item = 'reqgirth'
-    i = 0
-    sa = ""
-    while(i < 64) do
-      sa += "aaaaaaaa"
-      i += 1
-    end
-    @sdb.put_attributes(@domain, item, {:a => sa, :b => sa, :c => sa, :d => sa, :e => sa})
-  end
-
-  def test_20_query_with_atributes
-    response = @sdb.query_with_attributes(@domain)
-    # convers response to a hash representation
-    items = {};
-    response[:items].each{ |item| items.merge!(item) }
-    # check we have receied all 5 items each full of attributes
-    assert_equal 5, items.keys.size
-    assert items['toys'].size > 0
-    assert items['nils'].size > 0
-    assert items['urlescapes'].size > 0
-    assert items['multiples'].size > 0
-    assert items['reqgirth'].size > 0
-    # fetch only Jon's attributes from all items
-    response = @sdb.query_with_attributes(@domain,['Jon'])
-    items = {};
-    response[:items].each{ |item| items.merge!(item) }
-    # check we have receied all 5 items
-    # check we have receied all 5 items, but only 'toys' has attributes
-    puts items.inspect
-    assert_equal 2, items['toys']['Jon'].size
-    assert_equal 0, items['nils'].size
-    assert_equal 0, items['urlescapes'].size
-    assert_equal 0, items['multiples'].size
-    assert_equal 0, items['reqgirth'].size
-    # kust Jurgen's attriburs
-    response = @sdb.query_with_attributes(@domain,['Jurgen'], "['Jurgen'='piglet']")
-    items = {};
-    response[:items].each{ |item| items.merge!(item) }
-    # check we have receied an only item
-    assert_equal 1, items.keys.size
-    assert_equal ["chickabiddy", "kitten", "piglet", "puppy"], items['toys']['Jurgen'].sort
-  end
-
-  # Keep this test last, because it deletes the domain...
-  def test_21_delete_domain
-    assert @sdb.delete_domain(@domain), 'delete_domain fail'
-    wait SDB_DELAY, 'after domain deletion'
-    # check that domain does not exist
-    assert !@sdb.list_domains[:domains].include?(@domain)
-  end
-  
+    def setup
+        TestCredentials.get_credentials
+        STDOUT.sync = true
+        @domain = 'right_sdb_awesome_test_domain'
+        @item = 'toys'
+        @attr = { 'Jon' => %w{beer car} }
+        # Interface instance
+        @sdb = Aws::SdbInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
+    end
+
+    SDB_DELAY = 2
+
+    def wait(delay, msg='')
+        print "waiting #{delay} seconds #{msg}"
+        while delay>0 do
+            delay -= 1
+            print '.'
+            sleep 1
+        end
+        puts
+    end
+
+    #---------------------------
+    # Aws::SdbInterface
+    #---------------------------
+
+    def test_00_delete_domain
+        # delete the domain to reset all the things
+        assert @sdb.delete_domain(@domain), 'delete_domain fail'
+        wait SDB_DELAY, 'after domain deletion'
+    end
+
+    def test_01_create_domain
+        # check that domain does not exist
+        assert !@sdb.list_domains[:domains].include?(@domain)
+        # create domain
+        assert @sdb.create_domain(@domain), 'create_domain fail'
+        wait SDB_DELAY, 'after domain creation'
+        # check that we have received new domain from Amazin
+        assert @sdb.list_domains[:domains].include?(@domain)
+    end
+
+    def test_02_put_attributes
+        # put attributes
+        assert @sdb.put_attributes(@domain, @item, @attr)
+        wait SDB_DELAY, 'after putting attributes'
+    end
+
+    def test_03_get_attributes
+        # get attributes
+        values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon'].to_a.sort
+        # compare to original list
+        assert_equal values, @attr['Jon'].sort
+    end
+
+    def test_04_add_attributes
+        # add new attribute
+        new_value = 'girls'
+        @sdb.put_attributes @domain, @item, {'Jon' => new_value}
+        wait SDB_DELAY, 'after putting attributes'
+        # get attributes ('girls' must be added to already existent attributes)
+        values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon'].to_a.sort
+        assert_equal values, (@attr['Jon'] << new_value).sort
+    end
+
+    def test_05_replace_attributes
+        # replace attributes
+        @sdb.put_attributes @domain, @item, {'Jon' => 'pub'}, :replace
+        wait SDB_DELAY, 'after replacing attributes'
+        # get attributes (all must be removed except of 'pub')
+        values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon']
+        assert_equal values, ['pub']
+    end
+
+    def test_06_delete_attribute
+        # add value 'girls' and 'vodka' to 'Jon'
+        @sdb.put_attributes @domain, @item, {'Jon' => ['girls', 'vodka']}
+        wait SDB_DELAY, 'after adding attributes'
+        # get attributes ('girls' and 'vodka' must be added 'pub')
+        values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon'].to_a.sort
+        assert_equal values, ['girls', 'pub', 'vodka']
+        # delete a single value 'girls' from attribute 'Jon'
+        @sdb.delete_attributes @domain, @item, 'Jon' => ['girls']
+        wait SDB_DELAY, 'after the deletion of attribute'
+        # get attributes ('girls' must be removed)
+        values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon']
+        assert_equal values, ['pub', 'vodka']
+        # delete all values from attribute 'Jon'
+        @sdb.delete_attributes @domain, @item, ['Jon']
+        wait SDB_DELAY, 'after the deletion of attributes'
+        # get attributes (values must be empty)
+        values = @sdb.get_attributes(@domain, @item)[:attributes]['Jon']
+        assert_equal values, nil
+    end
+
+    def test_07_delete_item
+        @sdb.put_attributes @domain, @item, {'Volodya' => ['girls', 'vodka']}
+        wait SDB_DELAY, 'after adding attributes'
+        # get attributes ('girls' and 'vodka' must be there)
+        values = @sdb.get_attributes(@domain, @item)[:attributes]['Volodya'].to_a.sort
+        assert_equal values, ['girls', 'vodka']
+        # delete an item
+        @sdb.delete_attributes @domain, @item
+        # get attributes (values must be empty)
+        values = @sdb.get_attributes(@domain, @item)[:attributes]['Volodya']
+        assert_equal values, nil
+    end
+
+    def test_08_query
+        # not applicable anymore
+    end
+
+    def test_09_signature_version_0
+        sdb = Aws::SdbInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :signature_version => '0')
+        item = 'toys'
+        # TODO: need to change the below test.  I think Juergen's intention was to include some umlauts in the values
+        # put attributes
+        # mhhh... Not sure how to translate this: hölzchehn klötzchen grÃŒnspan buße... Lets assume this is:
+        attributes = { 'Jurgen' => %w{kitten puppy chickabiddy piglet} }
+        assert sdb.put_attributes(@domain, item, attributes)
+        wait SDB_DELAY, 'after putting attributes'
+        # get attributes
+        values = sdb.get_attributes(@domain, item)[:attributes]['Jurgen'].to_a.sort
+        # compare to original list
+        assert_equal values, attributes['Jurgen'].sort
+        # check that the request has correct signature version
+        assert sdb.last_request.path.include?('SignatureVersion=0')
+    end
+
+    def test_10_signature_version_1
+        sdb = Aws::SdbInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :signature_version => '1')
+        domains = nil
+        assert_nothing_thrown "Failed to use signature V1" do
+            domains = sdb.list_domains
+        end
+        assert domains
+    end
+
+    def test_11_signature_version_1
+        sdb = Aws::SdbInterface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :signature_version => '2')
+        domains = nil
+        assert_nothing_thrown "Failed to use signature V2" do
+            domains = sdb.list_domains
+        end
+        assert domains
+    end
+
+    def test_12_array_of_attrs
+        item = 'multiples'
+        assert_nothing_thrown "Failed to put multiple attrs" do
+            @sdb.put_attributes(@domain, item, {:one=>1, :two=>2, :three=>3})
+        end
+    end
+
+    def test_13_zero_len_attrs
+        item = 'zeroes'
+        assert_nothing_thrown "Failed to put zero-length attributes" do
+            @sdb.put_attributes(@domain, item, {:one=>"", :two=>"", :three=>""})
+        end
+    end
+
+    def test_14_nil_attrs
+        item = 'nils'
+        res = nil
+        assert_nothing_thrown do
+            @sdb.put_attributes(@domain, item, {:one=>nil, :two=>nil, :three=>'chunder'})
+        end
+        assert_nothing_thrown do
+            res = @sdb.get_attributes(@domain, item)
+        end
+        assert_nil(res[:attributes]['one'][0])
+        assert_nil(res[:attributes]['two'][0])
+        assert_not_nil(res[:attributes]['three'][0])
+    end
+
+    def test_15_url_escape
+        item = 'urlescapes'
+        content = {:a=>"one & two & three",
+                   :b=>"one ? two / three"}
+        @sdb.put_attributes(@domain, item, content)
+
+        res = @sdb.get_attributes(@domain, item)
+        assert_equal(content[:a], res[:attributes]['a'][0])
+        assert_equal(content[:b], res[:attributes]['b'][0])
+    end
+
+    def test_16_put_attrs_by_post
+        item = 'reqgirth'
+        i = 0
+        sa = ""
+        while (i < 64) do
+            sa += "aaaaaaaa"
+            i += 1
+        end
+        @sdb.put_attributes(@domain, item, {:a => sa, :b => sa, :c => sa, :d => sa, :e => sa})
+    end
+
+    def test_20_query_with_atributes
+        # not applicable anymore
+    end
+
+    # Keep this test last, because it deletes the domain...
+    def test_21_delete_domain
+        assert @sdb.delete_domain(@domain), 'delete_domain fail'
+        wait SDB_DELAY, 'after domain deletion'
+        # check that domain does not exist
+        assert !@sdb.list_domains[:domains].include?(@domain)
+    end
+
 end