ruby-plsql 0.5.0 → 0.5.1

data/spec/plsql/type_spec.rb

@@ -103,15 +103,15 @@ describe "Type" do
   describe "find" do
 
     it "should find existing type" do
-      PLSQL::Type.find(plsql, :t_employee).should_not be_nil
+      expect(PLSQL::Type.find(plsql, :t_employee)).not_to be_nil
     end
 
     it "should not find nonexisting type" do
-      PLSQL::Type.find(plsql, :qwerty123456).should be_nil
+      expect(PLSQL::Type.find(plsql, :qwerty123456)).to be_nil
     end
 
     it "should find existing type in schema" do
-      plsql.t_employee.should be_a(PLSQL::Type)
+      expect(plsql.t_employee).to be_a(PLSQL::Type)
     end
 
   end
@@ -127,11 +127,11 @@ describe "Type" do
     end
 
     it "should find synonym to type" do
-      PLSQL::Type.find(plsql, :t_employee_synonym).should_not be_nil
+      expect(PLSQL::Type.find(plsql, :t_employee_synonym)).not_to be_nil
     end
 
     it "should find type using synonym in schema" do
-      plsql.t_employee_synonym.should be_a(PLSQL::Type)
+      expect(plsql.t_employee_synonym).to be_a(PLSQL::Type)
     end
 
   end
@@ -139,11 +139,11 @@ describe "Type" do
   describe "public synonym" do
 
     it "should find public synonym to type" do
-      PLSQL::Type.find(plsql, :xmltype).should_not be_nil
+      expect(PLSQL::Type.find(plsql, :xmltype)).not_to be_nil
     end
 
     it "should find type using public synonym in schema" do
-      plsql.xmltype.should be_a(PLSQL::Type)
+      expect(plsql.xmltype).to be_a(PLSQL::Type)
     end
 
   end
@@ -151,11 +151,11 @@ describe "Type" do
   describe "typecode" do
 
     it "should get typecode of object type" do
-      plsql.t_employee.typecode.should == "OBJECT"
+      expect(plsql.t_employee.typecode).to eq("OBJECT")
     end
 
     it "should get typecode of collection type" do
-      plsql.t_phones.typecode.should == "COLLECTION"
+      expect(plsql.t_phones.typecode).to eq("COLLECTION")
     end
 
   end
@@ -163,11 +163,11 @@ describe "Type" do
   describe "attributes" do
 
     it "should get attribute names" do
-      plsql.t_employee.attribute_names.should == [:employee_id, :first_name, :last_name, :hire_date, :address, :phones]
+      expect(plsql.t_employee.attribute_names).to eq([:employee_id, :first_name, :last_name, :hire_date, :address, :phones])
     end
 
     it "should get attributes metadata" do
-      plsql.t_employee.attributes.should == {
+      expect(plsql.t_employee.attributes).to eq({
         :employee_id =>
           {:position=>1, :data_type=>"NUMBER", :data_length=>nil, :data_precision=>15, :data_scale=>0, :type_owner=>nil, :type_name=>nil, :sql_type_name=>nil},
         :first_name =>
@@ -180,7 +180,7 @@ describe "Type" do
           {:position=>5, :data_type=>"OBJECT", :data_length=>nil, :data_precision=>nil, :data_scale=>nil, :type_owner=>"HR", :type_name=>"T_ADDRESS", :sql_type_name=>"HR.T_ADDRESS"},
         :phones => 
           {:position=>6, :data_type=>"TABLE", :data_length=>nil, :data_precision=>nil, :data_scale=>nil, :type_owner=>"HR", :type_name=>"T_PHONES", :sql_type_name=>"HR.T_PHONES"}
-      }
+      })
     end
 
   end
@@ -193,37 +193,37 @@ describe "Type" do
     end
 
     it "should get new object instance using named parameters" do
-      plsql.t_phone(@phone_attributes).should == @phone_attributes
+      expect(plsql.t_phone(@phone_attributes)).to eq(@phone_attributes)
     end
 
     it "should be an ObjectInstance" do
-      plsql.t_phone(@phone_attributes).should be_a(PLSQL::ObjectInstance)
+      expect(plsql.t_phone(@phone_attributes)).to be_a(PLSQL::ObjectInstance)
     end
 
     it "should get new object instance using sequential parameters" do
-      plsql.t_phone(@phone_attributes[:type], @phone_attributes[:phone_number]).should == @phone_attributes
+      expect(plsql.t_phone(@phone_attributes[:type], @phone_attributes[:phone_number])).to eq(@phone_attributes)
     end
 
     it "should get new object instance using custom constructor" do
-      plsql.t_address(@full_address).should == @address_attributes
-      plsql.t_address(:p_full_address => @full_address).should == @address_attributes
+      expect(plsql.t_address(@full_address)).to eq(@address_attributes)
+      expect(plsql.t_address(:p_full_address => @full_address)).to eq(@address_attributes)
     end
 
     it "should get new object instance using default constructor when custom constructor exists" do
-      plsql.t_address(@address_attributes).should == @address_attributes
-      plsql.t_address(@address_attributes[:street], @address_attributes[:city], @address_attributes[:country]).should == @address_attributes
+      expect(plsql.t_address(@address_attributes)).to eq(@address_attributes)
+      expect(plsql.t_address(@address_attributes[:street], @address_attributes[:city], @address_attributes[:country])).to eq(@address_attributes)
     end
 
     it "should get new empty collection of objects instance" do
-      plsql.t_phones.new.should == []
-      plsql.t_phones([]).should == []
+      expect(plsql.t_phones.new).to eq([])
+      expect(plsql.t_phones([])).to eq([])
     end
 
     it "should get new collection of objects instances" do
       phone = plsql.t_phone(@phone_attributes)
-      plsql.t_phones([phone, phone]).should == [phone, phone]
-      plsql.t_phones(phone, phone).should == [phone, phone]
-      plsql.t_phones(@phone_attributes, @phone_attributes).should == [phone, phone]
+      expect(plsql.t_phones([phone, phone])).to eq([phone, phone])
+      expect(plsql.t_phones(phone, phone)).to eq([phone, phone])
+      expect(plsql.t_phones(@phone_attributes, @phone_attributes)).to eq([phone, phone])
     end
 
   end
@@ -235,46 +235,47 @@ describe "Type" do
     end
 
     it "should call object instance member function without parameters" do
-      plsql.t_address(@address_attributes).display_address.should == @full_address
+      expect(plsql.t_address(@address_attributes).display_address).to eq(@full_address)
     end
 
     it "should call object instance member function with parameters" do
-      plsql.t_address(@address_attributes).display_address(',').should == @full_address
+      expect(plsql.t_address(@address_attributes).display_address(',')).to eq(@full_address)
     end
 
     it "should call object instance member function with named parameters" do
-      plsql.t_address(@address_attributes).display_address(:p_separator => ',').should == @full_address
+      expect(plsql.t_address(@address_attributes).display_address(:p_separator => ',')).to eq(@full_address)
     end
 
     it "should call object overloaded instance member function" do
-      plsql.t_address(@address_attributes).display_address(true).should == @full_address.upcase
-      plsql.t_address(@address_attributes).display_address(true, ',').should == @full_address.upcase
+      expect(plsql.t_address(@address_attributes).display_address(true)).to eq(@full_address.upcase)
+      expect(plsql.t_address(@address_attributes).display_address(true, ',')).to eq(@full_address.upcase)
     end
 
     it "should call object instance member function with explicit first SELF parameter" do
-      plsql.t_address.display_address(@address_attributes, ',').should == @full_address
+      expect(plsql.t_address.display_address(@address_attributes, ',')).to eq(@full_address)
     end
 
     it "should call object instance member function with explicit named SELF parameter" do
-      plsql.t_address.display_address(:self => @address_attributes, :p_separator => ',').should == @full_address
+      expect(plsql.t_address.display_address(:self => @address_attributes, :p_separator => ',')).to eq(@full_address)
     end
 
     it "should call object instance member procedure" do
       other_country = "Other"
-      plsql.t_address(@address_attributes).set_country(other_country).should == @address_attributes.merge(:country => other_country)
+      expect(plsql.t_address(@address_attributes).set_country(other_country)).to eq(@address_attributes.merge(:country => other_country))
     end
 
     it "should call object instance member procedure with output parameters" do
       other_country = "Other"
-      plsql.t_address(@address_attributes).set_country2(other_country).should == 
+      expect(plsql.t_address(@address_attributes).set_country2(other_country)).to eq(
         [@address_attributes.merge(:country => other_country),
         {:x_display_address => "#{@address_attributes[:street]}, #{@address_attributes[:city]}, #{other_country}"}]
+      )
     end
 
     it "should raise error if invalid member procedure is called" do
-      lambda do
+      expect do
         plsql.t_address(@address_attributes).invalid_procedure
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
 
   end
@@ -286,17 +287,17 @@ describe "Type" do
     end
 
     it "should call object type static function" do
-      plsql.t_address.create_address(@full_address).should == @address_attributes
+      expect(plsql.t_address.create_address(@full_address)).to eq(@address_attributes)
     end
 
     it "should call object type static function with named parameters" do
-      plsql.t_address.create_address(:p_full_address => @full_address).should == @address_attributes
+      expect(plsql.t_address.create_address(:p_full_address => @full_address)).to eq(@address_attributes)
     end
 
     it "should raise error if invalid static procedure is called" do
-      lambda do
+      expect do
         plsql.t_address.invalid_procedure
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
 
   end

data/spec/plsql/variable_spec.rb

@@ -35,18 +35,18 @@ describe "Package variables /" do
 
     it "should set and get VARCHAR2 variable" do
       plsql.test_package.varchar2_variable = 'abc'
-      plsql.test_package.varchar2_variable.should == 'abc'
+      expect(plsql.test_package.varchar2_variable).to eq('abc')
     end
 
     it "should set and get VARCHAR2 variable with comment" do
       plsql.test_package.varchar2_variable2 = 'abc'
-      plsql.test_package.varchar2_variable2.should == 'abc'
+      expect(plsql.test_package.varchar2_variable2).to eq('abc')
     end
 
     it "should get VARCHAR2 variable default value" do
-      plsql.test_package.varchar2_default.should == 'default'
-      plsql.test_package.varchar2_default2.should == 'default'
-      plsql.test_package.varchar2_default3.should == 'default'
+      expect(plsql.test_package.varchar2_default).to eq('default')
+      expect(plsql.test_package.varchar2_default2).to eq('default')
+      expect(plsql.test_package.varchar2_default3).to eq('default')
     end
 
     describe "with character or byte limit" do
@@ -65,32 +65,32 @@ describe "Package variables /" do
 
       it "should set and get VARCHAR2(n CHAR) variable" do
         plsql.test_package.varchar2_3_char = 'āčē'
-        plsql.test_package.varchar2_3_char.should == 'āčē'
-        lambda { plsql.test_package.varchar2_3_char = 'aceg' }.should raise_error(/buffer too small/)
+        expect(plsql.test_package.varchar2_3_char).to eq('āčē')
+        expect { plsql.test_package.varchar2_3_char = 'aceg' }.to raise_error(/buffer too small/)
       end
 
       it "should set and get VARCHAR2(n BYTE) variable" do
         plsql.test_package.varchar2_3_byte = 'ace'
-        plsql.test_package.varchar2_3_byte.should == 'ace'
-        lambda { plsql.test_package.varchar2_3_byte = 'āce' }.should raise_error(/buffer too small/)
-        lambda { plsql.test_package.varchar2_3_byte = 'aceg' }.should raise_error(/buffer too small/)
+        expect(plsql.test_package.varchar2_3_byte).to eq('ace')
+        expect { plsql.test_package.varchar2_3_byte = 'āce' }.to raise_error(/buffer too small/)
+        expect { plsql.test_package.varchar2_3_byte = 'aceg' }.to raise_error(/buffer too small/)
       end
 
     end
 
     it "should set and get CHAR variable" do
       plsql.test_package.char_variable = 'abc'
-      plsql.test_package.char_variable.should == 'abc' + ' '*7
+      expect(plsql.test_package.char_variable).to eq('abc' + ' '*7)
     end
 
     it "should set and get NVARCHAR2 variable" do
       plsql.test_package.nvarchar2_variable = 'abc'
-      plsql.test_package.nvarchar2_variable.should == 'abc'
+      expect(plsql.test_package.nvarchar2_variable).to eq('abc')
     end
 
     it "should set and get NCHAR variable" do
       plsql.test_package.nchar_variable = 'abc'
-      plsql.test_package.nchar_variable.should == 'abc' + ' '*7
+      expect(plsql.test_package.nchar_variable).to eq('abc' + ' '*7)
     end
 
   end
@@ -123,41 +123,41 @@ describe "Package variables /" do
 
     it "should set and get INTEGER variable" do
       plsql.test_package.integer_variable = 1
-      plsql.test_package.integer_variable.should be_a Fixnum
-      plsql.test_package.integer_variable.should == 1
+      expect(plsql.test_package.integer_variable).to be_a Fixnum
+      expect(plsql.test_package.integer_variable).to eq(1)
     end
 
     it "should set and get integer variable with precision" do
       plsql.test_package.integer10_variable = 1
-      plsql.test_package.integer10_variable.should be_a Fixnum
-      plsql.test_package.integer10_variable.should == 1
+      expect(plsql.test_package.integer10_variable).to be_a Fixnum
+      expect(plsql.test_package.integer10_variable).to eq(1)
     end
 
     it "should get integer variable default value" do
-      plsql.test_package.integer10_default.should == 1
+      expect(plsql.test_package.integer10_default).to eq(1)
     end
 
     it "should set and get PLS_INTEGER variable" do
       plsql.test_package.pls_int_variable = 1
-      plsql.test_package.pls_int_variable.should be_a Fixnum
-      plsql.test_package.pls_int_variable.should == 1
+      expect(plsql.test_package.pls_int_variable).to be_a Fixnum
+      expect(plsql.test_package.pls_int_variable).to eq(1)
     end
 
     it "should set and get BINARY_INTEGER variable" do
       plsql.test_package.bin_int_variable = 1
-      plsql.test_package.bin_int_variable.should be_a Fixnum
-      plsql.test_package.bin_int_variable.should == 1
+      expect(plsql.test_package.bin_int_variable).to be_a Fixnum
+      expect(plsql.test_package.bin_int_variable).to eq(1)
     end
 
     it "should set and get NUMBER variable" do
       plsql.test_package.number_variable = 123.456
-      plsql.test_package.number_variable.should be_a BigDecimal
-      plsql.test_package.number_variable.should == 123.456
+      expect(plsql.test_package.number_variable).to be_a BigDecimal
+      expect(plsql.test_package.number_variable).to eq(123.456)
     end
 
     it "should set and get NUMBER variable with scale" do
       plsql.test_package.number_with_scale = 123.456
-      plsql.test_package.number_with_scale.should == 123.46 # rounding to two decimal digits
+      expect(plsql.test_package.number_with_scale).to eq(123.46) # rounding to two decimal digits
     end
 
   end
@@ -189,30 +189,30 @@ describe "Package variables /" do
 
     it "should set and get DATE variable" do
       plsql.test_package.date_variable = @date
-      plsql.test_package.date_variable.should be_a Time
-      plsql.test_package.date_variable.should == @date
+      expect(plsql.test_package.date_variable).to be_a Time
+      expect(plsql.test_package.date_variable).to eq(@date)
     end
 
     it "should get DATE variable default value" do
-      plsql.test_package.date_default.should == @date
+      expect(plsql.test_package.date_default).to eq(@date)
     end
 
     it "should set and get TIMESTAMP variable" do
       plsql.test_package.timestamp_variable = @timestamp
-      plsql.test_package.timestamp_variable.should be_a Time
-      plsql.test_package.timestamp_variable.should == @timestamp
+      expect(plsql.test_package.timestamp_variable).to be_a Time
+      expect(plsql.test_package.timestamp_variable).to eq(@timestamp)
     end
 
     it "should set and get TIMESTAMP WITH TIME ZONE variable" do
       plsql.test_package.timestamptz_variable = @timestamp
-      plsql.test_package.timestamptz_variable.should be_a Time
-      plsql.test_package.timestamptz_variable.should == @timestamp
+      expect(plsql.test_package.timestamptz_variable).to be_a Time
+      expect(plsql.test_package.timestamptz_variable).to eq(@timestamp)
     end
 
     it "should set and get TIMESTAMP WITH LOCAL TIME ZONE variable" do
       plsql.test_package.timestampltz_variable = @timestamp
-      plsql.test_package.timestampltz_variable.should be_a Time
-      plsql.test_package.timestampltz_variable.should == @timestamp
+      expect(plsql.test_package.timestampltz_variable).to be_a Time
+      expect(plsql.test_package.timestampltz_variable).to eq(@timestamp)
     end
 
   end
@@ -242,21 +242,21 @@ describe "Package variables /" do
 
     it "should set and get CLOB variable" do
       plsql.test_package.clob_variable = 'abc'
-      plsql.test_package.clob_variable.should == 'abc'
+      expect(plsql.test_package.clob_variable).to eq('abc')
     end
 
     it "should get CLOB variable default value" do
-      plsql.test_package.clob_default.should == 'default'
+      expect(plsql.test_package.clob_default).to eq('default')
     end
 
     it "should set and get NCLOB variable" do
       plsql.test_package.nclob_variable = 'abc'
-      plsql.test_package.nclob_variable.should == 'abc'
+      expect(plsql.test_package.nclob_variable).to eq('abc')
     end
 
     it "should set and get BLOB variable" do
       plsql.test_package.blob_variable = "\000\001\003"
-      plsql.test_package.blob_variable.should == "\000\001\003"
+      expect(plsql.test_package.blob_variable).to eq("\000\001\003")
     end
 
   end
@@ -295,18 +295,18 @@ describe "Package variables /" do
 
     it "should set and get NUMBER variable" do
       plsql.test_package.employee_id = 1
-      plsql.test_package.employee_id.should == 1
+      expect(plsql.test_package.employee_id).to eq(1)
     end
 
     it "should set and get VARCHAR2 variable" do
       plsql.test_package.first_name = 'First'
-      plsql.test_package.first_name.should == 'First'
+      expect(plsql.test_package.first_name).to eq('First')
     end
 
     it "should set and get DATE variable" do
       today = Time.local(2009,12,22)
       plsql.test_package.hire_date = today
-      plsql.test_package.hire_date.should == today
+      expect(plsql.test_package.hire_date).to eq(today)
     end
 
   end
@@ -333,17 +333,17 @@ describe "Package variables /" do
     end
 
     it "should get NUMBER constant" do
-      plsql.test_package.integer_constant.should == 1
+      expect(plsql.test_package.integer_constant).to eq(1)
     end
 
     it "should get VARCHAR2 constant" do
-      plsql.test_package.string_constant.should == 'constant'
+      expect(plsql.test_package.string_constant).to eq('constant')
     end
 
     it "should raise error when trying to set constant" do
-      lambda {
+      expect {
         plsql.test_package.integer_constant = 2
-      }.should raise_error(/PLS-00363/)
+      }.to raise_error(/PLS-00363/)
     end
 
   end
@@ -414,17 +414,17 @@ describe "Package variables /" do
 
     it "should set and get object type variable" do
       plsql.test_package.g_employee = @employee
-      plsql.test_package.g_employee.should == @employee
+      expect(plsql.test_package.g_employee).to eq(@employee)
     end
 
     it "should set and get object type variable when schema prefix is used with type" do
       plsql.hr.test_package.g_employee2 = @employee
-      plsql.hr.test_package.g_employee2.should == @employee
+      expect(plsql.hr.test_package.g_employee2).to eq(@employee)
     end
 
     it "should set and get collection type variable" do
       plsql.test_package.g_phones = @phones
-      plsql.test_package.g_phones.should == @phones
+      expect(plsql.test_package.g_phones).to eq(@phones)
     end
 
   end
@@ -467,7 +467,7 @@ describe "Package variables /" do
 
     it "should set and get table ROWTYPE variable" do
       plsql.test_package.g_employee = @employee
-      plsql.test_package.g_employee.should == @employee
+      expect(plsql.test_package.g_employee).to eq(@employee)
     end
 
   end
@@ -493,11 +493,11 @@ describe "Package variables /" do
     end
 
     it "should set and get BOOLEAN variable" do
-      plsql.test_package.boolean_variable.should be_nil
+      expect(plsql.test_package.boolean_variable).to be_nil
       plsql.test_package.boolean_variable = true
-      plsql.test_package.boolean_variable.should be_true
+      expect(plsql.test_package.boolean_variable).to be_truthy
       plsql.test_package.boolean_variable = false
-      plsql.test_package.boolean_variable.should be_false
+      expect(plsql.test_package.boolean_variable).to be_falsey
     end
 
   end