@@ -375,6 +375,8 @@ no_csc do "BigIntegerOne" => Bignum.One, "BigIntegerZero" => Bignum.Zero, "Int32?Null" => System::Nullable[Fixnum].new, "Int32?One" => System::Nullable[Fixnum].new(1), "Int32?MinusOne" => System::Nullable[Fixnum].new(-1), "" => "", "a" => "a", "abc" => "abc", + "System::String''" => System::String.new(""), "System::String'a'" => System::String.new("a"), "System::String'abc'" => System::String.new("abc"), + :a => :a, :abc => :abc, "System::CharMaxValue" => System::Char.MaxValue, "System::CharMinValue" => System::Char.MinValue } other.merge clr_values Merlin/Main/Languages/Ruby/Tests/Interop/net/method/fixtures/classes.rb @@ -20,6 +20,29 @@ describe "Method parameter binding" do :BooleanArg => "BooleanArg", :SByteArg => TE, :Int16Arg => TE, :Int64Arg => TE, :SingleArg => AE, :ByteArg => TE, :UInt16Arg => TE, :UInt32Arg => TE, :UInt64Arg => TE, :CharArg => "CharArg", :DecimalArg => TE, :ObjectArg => "ObjectArg", :NullableInt32Arg => TE }, + + "System::String''" => {:NoArg => AE, :Int32Arg => TE, :DoubleArg => AE, :BigIntegerArg => TE, :StringArg => "StringArg", + :BooleanArg => "BooleanArg", :SByteArg => TE, :Int16Arg => TE, :Int64Arg => TE, :SingleArg => AE, + :ByteArg => TE, :UInt16Arg => TE, :UInt32Arg => TE, :UInt64Arg => TE, :CharArg => TE, :DecimalArg => TE, + :ObjectArg => "ObjectArg", :NullableInt32Arg => TE }, + "System::String'a'" => {:NoArg => AE, :Int32Arg => TE, :DoubleArg => AE, :BigIntegerArg => TE, :StringArg => "StringArg", + :BooleanArg => "BooleanArg", :SByteArg => TE, :Int16Arg => TE, :Int64Arg => TE, :SingleArg => AE, + :ByteArg => TE, :UInt16Arg => TE, :UInt32Arg => TE, :UInt64Arg => TE, :CharArg => "CharArg", :DecimalArg => TE, + :ObjectArg => "ObjectArg", :NullableInt32Arg => TE }, + "System::String'abc'" => {:NoArg => AE, :Int32Arg => TE, :DoubleArg => AE, :BigIntegerArg => TE, :StringArg => "StringArg", + :BooleanArg => "BooleanArg", :SByteArg => TE, :Int16Arg => TE, :Int64Arg => TE, :SingleArg => AE, + :ByteArg => TE, :UInt16Arg => TE, :UInt32Arg => TE, :UInt64Arg => TE, :CharArg => "CharArg", :DecimalArg => TE, + :ObjectArg => "ObjectArg", :NullableInt32Arg => TE }, + + + :a => {:NoArg => AE, :Int32Arg => "Int32Arg", :DoubleArg => TE, :BigIntegerArg => "BigIntegerArg", :StringArg => "StringArg", + :BooleanArg => "BooleanArg", :SByteArg => RE, :Int16Arg => RE, :Int64Arg => "Int64Arg", :SingleArg => TE, + :ByteArg => RE, :UInt16Arg => RE, :UInt32Arg => "UInt32Arg", :UInt64Arg => "UInt64Arg", :CharArg => "CharArg", :DecimalArg => TE, + :ObjectArg => "ObjectArg", :NullableInt32Arg => "NullableInt32Arg" }, + :abc => {:NoArg => AE, :Int32Arg => "Int32Arg", :DoubleArg => TE, :BigIntegerArg => "BigIntegerArg", :StringArg => "StringArg", + :BooleanArg => "BooleanArg", :SByteArg => RE, :Int16Arg => RE, :Int64Arg => "Int64Arg", :SingleArg => TE, + :ByteArg => RE, :UInt16Arg => RE, :UInt32Arg => "UInt32Arg", :UInt64Arg => "UInt64Arg", :CharArg => "CharArg", :DecimalArg => TE, + :ObjectArg => "ObjectArg", :NullableInt32Arg => "NullableInt32Arg" }, "false" => {:NoArg => AE, :Int32Arg => TE, :DoubleArg => TE, :BigIntegerArg => TE, :StringArg => TE, :BooleanArg => "BooleanArg", :SByteArg => TE, :Int16Arg => TE, :Int64Arg => TE, :SingleArg => TE, @@ -317,7 +340,9 @@ describe "Method parameter binding" do @target.send(meth, @values[input]).should == result end end + next if result.class == Class && result < Exception + it "passes the correct input (#{input}) into method (#{meth})" do value = @values[input] @target.send(meth, value) @@ -349,6 +374,22 @@ describe "Method parameter binding" do elsif value.is_a? String value[0..0] end + when /Int32|BigInteger/ + if value.is_a? Symbol + value.to_i + end + when /Int64/ + if value.is_a? Symbol + System::Int64.induced_from(value.to_i) + end + when /UInt32/ + if value.is_a? Symbol + System::UInt32.induced_from(value.to_i) + end + when /UInt64/ + if value.is_a? Symbol + System::UInt64.induced_from(value.to_i) + end else value end Merlin/Main/Languages/Ruby/Tests/Interop/net/method/invocation/binding_spec.rb @@ -66,3 +66,21 @@ fails:Method parameter binding passes the correct input (System::CharMaxValue) i fails:Method parameter binding passes the correct input (System::CharMaxValue) into method (SingleArg) fails:Method parameter binding passes the correct input (System::SingleMaxValue) into method (BigIntegerArg) fails:Method parameter binding passes the correct input (System::SingleMinValue) into method (BigIntegerArg) +fails:Method parameter binding binds 'BooleanArg' for 'System::String''' with 'BooleanArg' +fails:Method parameter binding passes the correct input (System::String'') into method (BooleanArg) +fails:Method parameter binding binds 'BooleanArg' for 'System::String'a'' with 'BooleanArg' +fails:Method parameter binding passes the correct input (System::String'a') into method (BooleanArg) +fails:Method parameter binding binds 'CharArg' for 'System::String'a'' with 'CharArg' +fails:Method parameter binding passes the correct input (System::String'a') into method (CharArg) +fails:Method parameter binding binds 'BooleanArg' for 'System::String'abc'' with 'BooleanArg' +fails:Method parameter binding passes the correct input (System::String'abc') into method (BooleanArg) +fails:Method parameter binding binds 'CharArg' for 'System::String'abc'' with 'CharArg' +fails:Method parameter binding passes the correct input (System::String'abc') into method (CharArg) +fails:Method parameter binding binds 'CharArg' for 'a' with 'CharArg' +fails:Method parameter binding passes the correct input (a) into method (CharArg) +fails:Method parameter binding binds 'NullableInt32Arg' for 'a' with 'NullableInt32Arg' +fails:Method parameter binding passes the correct input (a) into method (NullableInt32Arg) +fails:Method parameter binding binds 'CharArg' for 'abc' with 'CharArg' +fails:Method parameter binding passes the correct input (abc) into method (CharArg) +fails:Method parameter binding binds 'NullableInt32Arg' for 'abc' with 'NullableInt32Arg' +fails:Method parameter binding passes the correct input (abc) into method (NullableInt32Arg) Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/method/invocation/binding_tags.txt 1e50a35c1b0d5fd9f5a48daa7c8686ba85bd60ac Jim Deville jdeville@microsoft.com http://github.com/shri/ironruby/commit/32f6f63b5bb6d5e20820eef80cae6f36feb19221 32f6f63b5bb6d5e20820eef80cae6f36feb19221 2009-09-02T11:27:45-07:00 2009-09-02T11:27:45-07:00 System::String and Symbol specs for binding. bcfcf29af4cc894af441d011ef9ef92322fdc1c3 Jim Deville jdeville@microsoft.com