azure 0.7.0.pre → 0.7.0.pre2

data/test/integration/blob/blob_pages_test.rb

@@ -12,16 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "integration/test_helper"
-require "azure/blob/blob_service"
+require 'integration/test_helper'
+require 'azure/blob/blob_service'
 
 describe Azure::Blob::BlobService do
   subject { Azure::Blob::BlobService.new }
   after { TableNameHelper.clean }
   
   let(:container_name) { ContainerNameHelper.name }
-  let(:blob_name) { "blobname" }
-  let(:blob_name2) { "blobname2" }
+  let(:blob_name) { 'blobname' }
+  let(:blob_name2) { 'blobname2' }
   let(:length) { 2560 }
   before { 
     subject.create_container container_name
@@ -31,8 +31,8 @@ describe Azure::Blob::BlobService do
   
   describe '#create_blob_pages' do
     it 'creates pages in a page blob' do
-      content = ""
-      512.times.each{|i| content << "@" }
+      content = ''
+      512.times.each{|i| content << '@' }
 
       subject.create_blob_pages container_name, blob_name, 0, 511, content
       subject.create_blob_pages container_name, blob_name, 1024, 1535, content
@@ -47,8 +47,8 @@ describe Azure::Blob::BlobService do
 
   describe 'when the options hash is used' do
     it 'if none match is specified' do
-      content = ""
-      512.times.each{|i| content << "@" }
+      content = ''
+      512.times.each{|i| content << '@' }
 
       blob = subject.create_blob_pages container_name, blob_name2, 0, 511, content
 
@@ -58,18 +58,18 @@ describe Azure::Blob::BlobService do
     end
 
     it 'if match is specified' do
-      content = ""
-      512.times.each{|i| content << "@" }
+      content = ''
+      512.times.each{|i| content << '@' }
 
       blob = subject.create_blob_pages container_name, blob_name, 0, 511, content
       subject.create_blob_pages container_name, blob_name, 1024, 1535, content, { :if_match => blob.properties[:etag] }
     end
   end
 
-  describe "#clear_blob_pages" do
+  describe '#clear_blob_pages' do
     before { 
-      content = ""
-      512.times.each{|i| content << "@" }
+      content = ''
+      512.times.each{|i| content << '@' }
 
       subject.create_blob_pages container_name, blob_name, 0, 511, content
       subject.create_blob_pages container_name, blob_name, 1024, 1535, content
@@ -85,7 +85,7 @@ describe Azure::Blob::BlobService do
       ranges[2][1].must_equal 2559
     }
 
-    describe "when both start_range and end_range are specified" do
+    describe 'when both start_range and end_range are specified' do
       it 'clears the data in page blobs within the provided range' do
         subject.clear_blob_pages container_name, blob_name, 512, 1535
 
@@ -101,8 +101,8 @@ describe Azure::Blob::BlobService do
 
   describe '#list_page_blob_ranges' do
     before { 
-      content = ""
-      512.times.each{|i| content << "@" }
+      content = ''
+      512.times.each{|i| content << '@' }
 
       subject.create_blob_pages container_name, blob_name, 0, 511, content
       subject.create_blob_pages container_name, blob_name, 1024, 1535, content

data/test/integration/blob/container/create_container_test.rb

@@ -12,9 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "integration/test_helper"
-require "azure/blob/blob_service"
-require "azure/core/http/http_error"
+require 'integration/test_helper'
+require 'azure/blob/blob_service'
+require 'azure/core/http/http_error'
 
 describe Azure::Blob::BlobService do
   subject { Azure::Blob::BlobService.new }
@@ -29,7 +29,7 @@ describe Azure::Blob::BlobService do
     end
 
     it 'creates the container with custom metadata' do
-      metadata = { "CustomMetadataProperty"=>"CustomMetadataValue" }
+      metadata = { 'CustomMetadataProperty' => 'CustomMetadataValue'}
 
       container = subject.create_container container_name, { :metadata => metadata }
       
@@ -44,7 +44,7 @@ describe Azure::Blob::BlobService do
     end
 
     it 'errors if the container already exists' do
-      container = subject.create_container container_name
+      subject.create_container container_name
       
       assert_raises(Azure::Core::Http::HTTPError) do
         subject.create_container container_name
@@ -53,7 +53,7 @@ describe Azure::Blob::BlobService do
     
     it 'errors if the container name is invalid' do
       assert_raises(Azure::Core::Http::HTTPError) do
-        subject.create_container "this_container.cannot-exist!"
+        subject.create_container 'this_container.cannot-exist!'
       end
     end
   end

data/test/integration/blob/container/root_container_test.rb

@@ -45,9 +45,10 @@ describe Azure::Blob::BlobService do
       blob.name.must_equal blob_name2
 
       # empty string container name
-      blob = subject.create_page_blob "", blob_name3, length
+      blob = subject.create_page_blob '', blob_name3, length
       blob.name.must_equal blob_name3
     rescue Azure::Core::Http::HTTPError => error
+      puts error.message
       error.status_code.must_equal 409
     end
   end

data/test/integration/database/create_sql_server_firewall_test.rb

@@ -12,15 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "integration/test_helper"
+
+require 'integration/test_helper'
 
 describe Azure::SqlDatabaseManagementService do
 
   subject { Azure::SqlDatabaseManagementService.new }
-  let(:login_name) {'ms_open_tech'}
+  let(:login_name) {'test_login_user'}
   let(:sql_server) { subject.create_server(login_name, 'User1@123', WindowsImageLocation) }
+  let(:start_ip_address) { '0.0.0.0' }
+  let(:end_ip_address) { '255.255.255.255' }
 
-  describe "#set_sql_server_firewall_rule" do
+  describe '#set_sql_server_firewall_rule' do
 
     before {
       Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
@@ -31,55 +34,47 @@ describe Azure::SqlDatabaseManagementService do
     }
 
     it "should adds a new server-level firewall rule for a SQL Database server with requester's IP address." do
-      subject.set_sql_server_firewall_rule(sql_server.name, "rule1")
+      subject.set_sql_server_firewall_rule(sql_server.name, 'rule1', start_ip_address, end_ip_address)
       sql_server_firewalls = subject.list_sql_server_firewall_rules(sql_server.name)
-      sql_server_firewalls.wont_be_nil
       sql_server_firewalls.must_be_kind_of Array
-      sql_server_firewalls.first.must_be_kind_of Hash
+      sql_server_firewalls.first.must_be_kind_of Azure::SqlDatabaseManagement::FirewallRule
       sql_server_firewalls.size.must_equal 1
       firewall = sql_server_firewalls.first
-      firewall[:rule].must_equal 'rule1'
-      firewall[:end_ip_address].wont_be_nil
-      firewall[:start_ip_address].wont_be_nil
+      firewall.name.must_equal 'rule1'
+      firewall.end_ip_address.wont_be_nil
+      firewall.start_ip_address.wont_be_nil
     end
 
-    it "should adds a new server-level firewall rule for a SQL Database server with given IP range." do
-      ip_range = {:start_ip_address => "10.20.30.0", :end_ip_address => "10.20.30.255"}
-      subject.set_sql_server_firewall_rule(sql_server.name, "rule2", ip_range)
+    it 'should adds a new server-level firewall rule for a SQL Database server with given IP range.' do
+      subject.set_sql_server_firewall_rule(sql_server.name, 'rule2', '10.20.30.0', '10.20.30.255')
       sql_server_firewalls = subject.list_sql_server_firewall_rules(sql_server.name)
-      sql_server_firewalls.wont_be_nil
       sql_server_firewalls.must_be_kind_of Array
-      sql_server_firewalls.first.must_be_kind_of Hash
+      sql_server_firewalls.first.must_be_kind_of Azure::SqlDatabaseManagement::FirewallRule
       sql_server_firewalls.size.must_equal 1
 
       firewall = sql_server_firewalls.last
-      firewall[:rule].must_equal 'rule2'
-      firewall[:end_ip_address].must_equal "10.20.30.255"
-      firewall[:start_ip_address].must_equal "10.20.30.0"
+      firewall.name.must_equal 'rule2'
+      firewall.end_ip_address.must_equal '10.20.30.255'
+      firewall.start_ip_address.must_equal '10.20.30.0'
     end
 
-    it "should updates an existing server-level firewall rule for a SQL Database server." do
-      ip_range = {:start_ip_address => "10.20.30.100", :end_ip_address => "10.20.30.150"}
-      subject.set_sql_server_firewall_rule(sql_server.name, "rule2", ip_range)
+    it 'should updates an existing server-level firewall rule for a SQL Database server.' do
+      subject.set_sql_server_firewall_rule(sql_server.name, 'rule2', '10.20.30.100', '10.20.30.150')
       sql_server_firewalls = subject.list_sql_server_firewall_rules(sql_server.name)
-      firewall = sql_server_firewalls.last
-      sql_server_firewalls.wont_be_nil
       sql_server_firewalls.must_be_kind_of Array
-      sql_server_firewalls.first.must_be_kind_of Hash
+      sql_server_firewalls.first.must_be_kind_of Azure::SqlDatabaseManagement::FirewallRule
       sql_server_firewalls.size.must_equal 1
 
       firewall = sql_server_firewalls.last
-      firewall[:rule].must_equal 'rule2'
-      firewall[:end_ip_address].must_equal "10.20.30.150"
-      firewall[:start_ip_address].must_equal "10.20.30.100"
+      firewall.name.must_equal 'rule2'
+      firewall.end_ip_address.must_equal '10.20.30.150'
+      firewall.start_ip_address.must_equal '10.20.30.100'
     end
 
-    it "errors if the sql server does not exist" do
-      server_name = "unknown-server"
-      exception = assert_raises(Azure::Error::Error) do
-        subject.set_sql_server_firewall_rule(server_name, "rule1")
+    it 'errors if the sql server does not exist' do
+      assert_raises(Azure::SqlDatabaseManagement::ServerDoesNotExist) do
+        subject.set_sql_server_firewall_rule('unknown-server', 'rule1')
       end
-      assert_match(/does not have server #{server_name}./i, exception.message)
     end
   end
 

data/test/integration/database/create_sql_server_test.rb

@@ -12,19 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "integration/test_helper"
+require 'integration/test_helper'
 
 describe Azure::SqlDatabaseManagementService do
 
   subject { Azure::SqlDatabaseManagementService.new }
-  let(:login_name) {'ms_open_tech'}
-  describe "#create_server" do
+  let(:login_name) {'test_login'}
+  describe '#create_server' do
 
     before {
       Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
     }
 
-    it "should be able to create a new sql database server." do
+    it 'should be able to create a new sql database server.' do
       sql_server = subject.create_server(login_name, 'User@123', WindowsImageLocation)
       sql_server.name.wont_be_nil
       sql_server.location.must_equal WindowsImageLocation
@@ -32,7 +32,7 @@ describe Azure::SqlDatabaseManagementService do
       subject.delete_server sql_server.name
     end
 
-    it "errors if the sql server location does not exist" do
+    it 'errors if the sql server location does not exist' do
       location = 'unknown-location'
       exception = assert_raises(RuntimeError) do
         subject.create_server(login_name, 'User@123', location)
@@ -40,7 +40,7 @@ describe Azure::SqlDatabaseManagementService do
       assert_match(/Location \'#{location}\' cannot be found/i, exception.message)
     end
 
-    it "errors if the sql server passsword is invalid" do
+    it 'errors if the sql server passsword is invalid' do
       password = 'weak'
       exception = assert_raises(RuntimeError) do
         subject.create_server(login_name, password, WindowsImageLocation)

data/test/integration/database/delete_sql_server_firewall_test.rb

@@ -12,56 +12,50 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "integration/test_helper"
+require 'integration/test_helper'
 
 describe Azure::SqlDatabaseManagementService do
 
-  let(:login_name) {'ms_open_tech'}
+  let(:login_name) { 'test_login' }
   let(:sql_server) { subject.create_server(login_name, 'User1@123', WindowsImageLocation) }
   subject { Azure::SqlDatabaseManagementService.new }
 
   before {
     Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
-    subject.set_sql_server_firewall_rule(sql_server.name, "rule1")
-    ip_range = {:start_ip_address => "10.20.30.0", :end_ip_address => "10.20.30.255"}
-    subject.set_sql_server_firewall_rule(sql_server.name, "rule2", ip_range)
+    subject.set_sql_server_firewall_rule(sql_server.name, 'rule1', '0.0.0.0', '255.255.255.255')
+    subject.set_sql_server_firewall_rule(sql_server.name, 'rule2', '10.20.30.0', '10.20.30.255')
   }
 
   after {
     subject.delete_server(sql_server.name)
   }
 
-  describe "#delete_sql_server_firewall_rule" do
+  describe '#delete_sql_server_firewall_rule' do
 
-    it "delete sql database server firewall" do
+    it 'delete sql database server firewall' do
       server_name = sql_server.name
       subject.delete_sql_server_firewall_rule(server_name, 'rule1')
 
       sql_server_firewalls = subject.list_sql_server_firewall_rules(server_name)
-      sql_server_firewalls.wont_be_nil
       sql_server_firewalls.must_be_kind_of Array
-      sql_server_firewalls.first.must_be_kind_of Hash
+      sql_server_firewalls.first.must_be_kind_of Azure::SqlDatabaseManagement::FirewallRule
       sql_server_firewalls.size.must_equal 1
       firewall = sql_server_firewalls.first
-      firewall[:rule].must_equal 'rule2'
-      firewall[:end_ip_address].must_equal "10.20.30.255"
-      firewall[:start_ip_address].must_equal "10.20.30.0"
+      firewall.name.must_equal 'rule2'
+      firewall.end_ip_address.must_equal '10.20.30.255'
+      firewall.start_ip_address.must_equal '10.20.30.0'
     end
 
-    it "errors if the sql server does not exist" do
-      server_name = "unknown-server"
-      exception = assert_raises(Azure::Error::Error) do
-        subject.delete_sql_server_firewall_rule(server_name, 'rule1')
-      end
-      assert_match(/does not have server #{server_name}./i, exception.message)
+    it 'errors if the sql server does not exist' do
+      assert_raises(Azure::SqlDatabaseManagement::ServerDoesNotExist) {
+        subject.delete_sql_server_firewall_rule('unknown-server', 'rule1')
+      }
     end
 
-    it "errors if the sql server firewall rule does not exist" do
-      rule_name = 'rule10'
-      exception = assert_raises(RuntimeError) do
-        subject.delete_sql_server_firewall_rule(sql_server.name, rule_name)
-      end
-      assert_match(/The specified firewall rule #{rule_name} does not exist./i, exception.message)
+    it 'returns false if the sql server firewall rule does not exist when deleting' do
+      assert_raises(Azure::SqlDatabaseManagement::RuleDoesNotExist) {
+        subject.delete_sql_server_firewall_rule(sql_server.name, rule10)
+      }
     end
 
   end

data/test/integration/database/delete_sql_server_test.rb

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "integration/test_helper"
+require 'integration/test_helper'
 
 describe Azure::SqlDatabaseManagementService do
 
@@ -21,35 +21,22 @@ describe Azure::SqlDatabaseManagementService do
   }
 
   subject { Azure::SqlDatabaseManagementService.new }
-  let(:login_name) {'ms_open_tech'}
+  let(:login_name) { 'test_login' }
   let(:sql_server) { subject.create_server(login_name, 'User1@123', WindowsImageLocation) }
 
-  describe "#delete_sql_server" do
+  describe '#delete_sql_server' do
 
-    it "delete sql database server" do
+    it 'delete sql database server' do
       server_name = sql_server.name
       subject.delete_server(server_name)
-      sql_server = subject.list_servers.select{|x| x.name == server_name}.first
+      sql_server = subject.list_servers.select { |x| x.name == server_name }.first
       sql_server.must_be_nil
     end
 
-    it "errors if the sql server does not exist" do
-      server_name = "unknown-server"
-      exception = assert_raises(Azure::Error::Error) do
-        subject.delete_server(server_name)
-      end
-      assert_match(/does not have server #{server_name}./i, exception.message)
-    end
-
-    it "exception message should be valid" do
-      server_name = "unknown-server"
-      begin
-        subject.delete_server(server_name)
-      rescue Azure::Error::Error => error
-        error.status_code.must_equal 40647
-        error.type.must_equal "DatabaseServerNotFound"
-        error.description.end_with?("does not have server #{server_name}.").must_equal true
-      end
+    it 'raise if the sql server does not exist' do
+      assert_raises(Azure::SqlDatabaseManagement::ServerDoesNotExist) {
+        subject.delete_server('unknown-server')
+      }
     end
 
   end

data/test/integration/database/list_sql_server_firewall_test.rb

@@ -12,31 +12,30 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "integration/test_helper"
+require 'integration/test_helper'
 
 describe Azure::SqlDatabaseManagementService do
 
   subject { Azure::SqlDatabaseManagementService.new }
-  let(:login_name) {'ms_open_tech'}
+  let(:login_name) {'test_login'}
   let(:sql_server) { subject.create_server(login_name, 'User1@123', WindowsImageLocation) }
-  describe "#list_sql_server_firewall_rules" do
+  describe '#list_sql_server_firewall_rules' do
 
     before {
       Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
-      ip_range = {:start_ip_address => "10.20.30.0", :end_ip_address => "10.20.30.255"}
-      subject.set_sql_server_firewall_rule(sql_server.name, "rule1", ip_range)
-      subject.set_sql_server_firewall_rule(sql_server.name, "rule2")
+      subject.set_sql_server_firewall_rule(sql_server.name, 'rule1', '10.20.30.0', '10.20.30.255')
+      subject.set_sql_server_firewall_rule(sql_server.name, 'rule2')
     }
 
     after {
       subject.delete_server(sql_server.name)
     }
 
-    it "returns a list of SQL databse server firewall" do
+    it 'returns a list of SQL databse server firewall' do
       sql_server_firewalls = subject.list_sql_server_firewall_rules(sql_server.name)
       sql_server_firewalls.wont_be_nil
       sql_server_firewalls.must_be_kind_of Array
-      sql_server_firewalls.first.must_be_kind_of Hash
+      sql_server_firewalls.first.must_be_kind_of Azure::SqlDatabaseManagement::FirewallRule
       sql_server_firewalls.size.must_equal 2
     end
 

data/test/integration/database/list_sql_servers_test.rb

@@ -17,14 +17,14 @@ require "integration/test_helper"
 describe Azure::SqlDatabaseManagementService do
 
   subject { Azure::SqlDatabaseManagementService.new }
-  let(:login_name) {'ms_open_tech'}
-  describe "#list_servers" do
+  let(:login_name) {'test_login'}
+  describe '#list_servers' do
 
     before {
       Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
     }
 
-    it "returns a list of SQL databse servers" do
+    it 'returns a list of SQL databse servers' do
       server1 = subject.create_server(login_name, 'User1@123', WindowsImageLocation)
       server2 = subject.create_server(login_name, 'User2@123', 'East US')
 
@@ -32,7 +32,7 @@ describe Azure::SqlDatabaseManagementService do
       sql_servers.wont_be_nil
       sql_servers.must_be_kind_of Array
       sql_server = sql_servers.first
-      sql_server.must_be_kind_of Azure::SqlDatabaseManagement::SqlDatabase
+      sql_server.must_be_kind_of Azure::SqlDatabaseManagement::SqlServer
       assert_operator sql_servers.size, :>=, 2
 
       subject.delete_server(server1.name)