Merlin/Main/Languages/Ruby/Tests/Interop/cli/profile_spec.rb Merlin/Main/Languages/Ruby/Tests/Interop/net/A/a.generated.dll Merlin/Main/Languages/Ruby/Tests/Interop/net/B/b.generated.dll @@ -127,7 +127,7 @@ describe "Static dependency loading" do end it "does propagate load exceptions" do - ruby_exe("dependencies1/test2.rb", :dir => File.dirname(__FILE__)).chomp.should == "true" + ruby_exe("dependencies1/test2.rb", :dir => File.dirname(__FILE__)).chomp.should == "System::IO::FileLoadException" end end Merlin/Main/Languages/Ruby/Tests/Interop/net/assembly/access/custom_assembly_spec.rb @@ -17,6 +17,6 @@ $raise = true begin p A.Main -rescue - p $!.class.name == "System::IO::FileLoadException" +rescue Exception => e + p e.class.name end Merlin/Main/Languages/Ruby/Tests/Interop/net/assembly/access/dependencies1/test2.rb @@ -32,8 +32,8 @@ describe "Creating a .NET array" do end it "can be referenced" do - @array[1][1].should == 11 - @array.get_value(1,1).should == 11 + @array[1, 1].should == 110 + @array.get_value(1,1).should == 110 end end end Merlin/Main/Languages/Ruby/Tests/Interop/net/bcl/array/instantiation_spec.rb @@ -12,6 +12,9 @@ describe "System::String#method_missing" do it "throws NoMethodError for methods that don't exist" do lambda { @sstr.foo }.should raise_error NoMethodError + end + + it "throws NoMethodError for methods that don't exist that look like mutating methods" do lambda { @sstr.foo! }.should raise_error NoMethodError lambda { @sstr.foo="b" }.should raise_error NoMethodError end Merlin/Main/Languages/Ruby/Tests/Interop/net/bcl/string/method_missing_spec.rb @@ -14,4 +14,4 @@ describe "Removing methods from a Class" do it_behaves_like :removing_a_method, Klass it_behaves_like :removing_class_methods, Klass it_behaves_like :removing_metaclass_methods, Klass -end \ No newline at end of file +end Merlin/Main/Languages/Ruby/Tests/Interop/net/class/modification/removal_spec.rb @@ -48,36 +48,18 @@ describe "Invoking events" do @helper[:method].should == 1 end - it "works with methods via +=" do - @klass.full_event += @method - @klass.invoke_full_event(1) - @helper[:method].should == 1 - end - it "works with lambdas via add" do @klass.full_event.add @lambda @klass.invoke_full_event(1) @helper[:lambda].should == 1 end - it "works with methods via +=" do - @klass.full_event += @lambda - @klass.invoke_full_event(1) - @helper[:lambda].should == 1 - end - it "works with procs via add" do @klass.full_event.add @proc @klass.invoke_full_event(1) @helper[:proc].should == 1 end - it "works with methods via +=" do - @klass.full_event += @proc - @klass.invoke_full_event(1) - @helper[:proc].should == 1 - end - it "works with to_proc syntax" do @klass.full_event &@lambda @klass.invoke_full_event(1) @@ -100,16 +82,6 @@ describe "Invoking events" do @helper[:lambda].should == 1 end - it "works with multiple objects via +=" do - @klass.full_event += @method - @klass.full_event += @proc - @klass.full_event += @lambda - @klass.invoke_full_event(1) - @helper[:proc].should == 1 - @helper[:method].should == 1 - @helper[:lambda].should == 1 - end - it "works with multiple of one callback via add" do @klass.full_event.add @method @klass.full_event.add @method @@ -117,13 +89,6 @@ describe "Invoking events" do @helper[:method].should == 2 end - it "works with multiple of one callback via +=" do - @klass.full_event += @method - @klass.full_event += @method - @klass.invoke_full_event(1) - @helper[:method].should == 2 - end - it "registers adds and removes" do @klass.full_event.add @method @klass.full_event.add @method @@ -132,13 +97,4 @@ describe "Invoking events" do @klass.invoke_full_event(1) @helper[:method].should == 3 end - - it "registers adds and removes" do - @klass.full_event += @method - @klass.full_event += @method - @klass.invoke_full_event(1) - @klass.full_event -= @method - @klass.invoke_full_event(1) - @helper[:method].should == 3 - end end Merlin/Main/Languages/Ruby/Tests/Interop/net/events/invocation_spec.rb @@ -11,6 +11,7 @@ describe ".NET events" do after :all do verb, $VERBOSE = $VERBOSE, nil IronRuby = Foo + Object.send :remove_const, :Foo $VERBOSE = verb end csc <<-EOL Merlin/Main/Languages/Ruby/Tests/Interop/net/events/mapping_spec.rb @@ -265,7 +265,7 @@ public class ClassWithEvents { if (StaticFullEvent != null) StaticFullEvent(new object(), count); } } -#line 16 "./events/mapping_spec.rb" +#line 17 "./events/mapping_spec.rb" #pragma warning disable 67 public delegate void EventHandler(object source, int count); public partial class BasicEventClass { @@ -347,6 +347,22 @@ public interface IExposing { event EventHandler<EventArgs> IsExposedChanged; bool IsExposed {get; set;} } + + public partial class Klass { + public object AddEvent(IExposing arg) { + arg.IsExposedChanged += EH; + return arg; + } + + public object RemoveEvent(IExposing arg) { + arg.IsExposedChanged -= EH; + return arg; + } + + public void EH(object sender, EventArgs e) { + _foo += 1; + } + } #line 4 "./interface/mapping_spec.rb" public interface IEmptyInterface {} public interface IInterface { void m();} @@ -368,7 +384,7 @@ public interface IEmptyInterfaceGroup { } public interface IInterfaceGroup1<T> {void m1();} public interface IInterfaceGroup1<T,V> {void m1();} -#line 226 "./method/invocation/generic_spec.rb" +#line 222 "./method/invocation/generic_spec.rb" public partial class ClassWithMethods { #region private methods private string Private1Generic0Arg<T>() { @@ -497,7 +513,7 @@ public partial class ClassWithMethods { } public partial class SubKlass : Klass {} -#line 264 "./method/invocation/generic_spec.rb" +#line 260 "./method/invocation/generic_spec.rb" #pragma warning disable 693 public partial class GenericClassWithMethods<K> { #region private methods @@ -622,7 +638,7 @@ public partial class ClassWithMethods { } #pragma warning restore 693 -#line 291 "./method/invocation/generic_spec.rb" +#line 287 "./method/invocation/generic_spec.rb" #pragma warning disable 693 public partial class GenericClass2Params<K, J> { #region private methods Merlin/Main/Languages/Ruby/Tests/Interop/net/fixtures.generated.cs Merlin/Main/Languages/Ruby/Tests/Interop/net/fixtures.generated.dll @@ -160,15 +160,26 @@ describe "Implementing interfaces that define events" do event EventHandler<EventArgs> IsExposedChanged; bool IsExposed {get; set;} } + + public partial class Klass { + public object AddEvent(IExposing arg) { + arg.IsExposedChanged += EH; + return arg; + } + + public object RemoveEvent(IExposing arg) { + arg.IsExposedChanged -= EH; + return arg; + } + + public void EH(object sender, EventArgs e) { + _foo += 1; + } + } EOL before(:all) do - class RubyExposerDefault - include IExposing - end - - class RubyExposerMM - include IExposing + module Events attr_reader :handlers def initialize @@ -178,7 +189,18 @@ describe "Implementing interfaces that define events" do def reset @handlers = [] end - + + def trigger + @handlers.each {|e| e.invoke(self, nil)} + end + end + class RubyExposerDefault + include IExposing + end + + class RubyExposerMM + include IExposing + include Events def method_missing(meth, *args, &blk) case meth.to_s when /^add_/ @@ -194,15 +216,7 @@ describe "Implementing interfaces that define events" do class RubyExposer include IExposing - attr_reader :handlers - def initialize - reset - end - - def reset - @handlers = [] - end - + include Events def add_IsExposedChanged(h) @handlers << h "Ruby add handler" @@ -215,25 +229,31 @@ describe "Implementing interfaces that define events" do end end + before(:each) do + @klass = Klass.new + end + it "allows empty implementation without TypeLoadException" do lambda {RubyExposerDefault.new}.should_not raise_error end it "allows method_missing to be the event managment methods" do exposer = RubyExposerMM.new - l = lamdba {|s,e| [s,e]} - (exposer.is_exposed_changed.add(l)).should == "Method Missing add" - exposer.handlers.should include l - (exposer.is_exposed_changed.remove(l)).should == "Method Missing remove" + @klass.add_event(exposer) + exposer.handlers.size.should == 1 + exposer.trigger + @klass.foo.should == 11 + @klass.remove_event(exposer) exposer.handlers.should be_empty end it "allows add and remove event definitions" do exposer = RubyExposer.new - l = lamdba {|s,e| [s,e]} - (exposer.is_exposed_changed.add(l)).should == "Ruby add handler" - exposer.handlers.should include l - (exposer.is_exposed_changed.remove(l)).should == "Ruby remove handler" + @klass.add_event(exposer) + exposer.handlers.size.should == 1 + exposer.trigger + @klass.foo.should == 11 + @klass.remove_event(exposer) exposer.handlers.should be_empty end end Merlin/Main/Languages/Ruby/Tests/Interop/net/interface/implementation_spec.rb @@ -185,7 +185,7 @@ describe :generic_methods, :shared => true do it "has proper errors for constrained generics" do lambda { @klass.method(:struct_constraint_method).of(String).call("a")}.should raise_error(ArgumentError) lambda { @klass.method(:class_constraint_method).of(Fixnum).call(1)}.should raise_error(ArgumentError) - lambda { @klass.method(:constructor_constraint_method).of(ClrString).call}.should raise_error(ArgumentError) + lambda { @klass.method(:constructor_constraint_method).of(System::String).call}.should raise_error(ArgumentError) lambda { @klass.method(:type_constraint_method).of(String, Klass).call("a")}.should raise_error(ArgumentError) end @@ -203,10 +203,6 @@ describe :generic_methods, :shared => true do @klass.method(:type_constraint_method).of(SubFoo, Foo).call(SubFoo.new).foo.should == 10 end - it "has proper error messages for skipping generic" do - lambda {@klass.method(:public_1_generic_1_arg).call("a")}.should raise_error(ArgumentError, /generic/i) - end - it "has proper error messages for incorrect number of arguments" do lambda {@klass.method(:public_1_generic_2_arg).of(Fixnum).call(1)}.should raise_error(ArgumentError, /1 for 2/) end Merlin/Main/Languages/Ruby/Tests/Interop/net/method/invocation/generic_spec.rb @@ -53,7 +53,7 @@ public #{type} #{prefix}SignatureOverload#{suffix}() { #{blk.call "SO void" }; } [lambda {|meth| meth.call("a","b","c")}, "SO string params(string[])"], [lambda {|meth| meth.call("a",1,1)}, "SO string int int"], [lambda {|meth| meth.call(1,2,3)}, "SO params(int[])"]] - @out_or_ref_cals = [[lambda {|meth| meth.overload(System::String.GetType.MakeByRefType.to_class).call()}, "SO ref string"]] #this array will hold more once this works. + @out_or_ref_calls = [[lambda {|meth| meth.overload(System::String.GetType.MakeByRefType.to_class).call()}, "SO ref string"]] #this array will hold more once this works. end it "is performed" do Merlin/Main/Languages/Ruby/Tests/Interop/net/method/invocation/overload_spec.rb @@ -154,8 +154,8 @@ describe "Static .NET methods" do it "don't incorrectly get cached when called on an instance" do #might be related to Rubyforge 24104 - Klass.new.method(:test_method) rescue nil - Klass.method(:test_method).should be_kind_of(Method) + Klass.new.method(:static_void_method) rescue nil + Klass.method(:static_void_method).should be_kind_of(Method) end end Merlin/Main/Languages/Ruby/Tests/Interop/net/method/reflection_spec.rb @@ -51,8 +51,9 @@ describe "Added method clr_new" do end it "raises a TypeError if called on a pure Ruby type" do - class Foo;end - lambda { Foo.clr_new }.should raise_error TypeError + class Bar;end + lambda { Bar.clr_new }.should raise_error TypeError + lambda { Class.new.clr_new }.should raise_error TypeError lambda { Numeric.clr_new }.should raise_error TypeError end end Merlin/Main/Languages/Ruby/Tests/Interop/net/ruby/additions/clr_new_spec.rb @@ -1,17 +1,6 @@ require File.dirname(__FILE__) + "/spec_helper" -describe "Regression dev tests" do - -end - -describe "Command line options" do - describe "-profile" do - s = ruby_exe("puts IronRuby::Clr.profile{ require 'rubygems' }.size", :options => "-profile").chomp.to_i - s.should > 80 - # We check for an upper bound only so that we can increase the lower bound, which is currently lower than we would like it to be - end -end - +#not sure where to put these yet. I might add a ironruby folder to our RubySpec. describe "Enumerable blocks (Codeplex 1301)" do before :each do @b = [2, 5, 3, 6, 1, 4] Merlin/Main/Languages/Ruby/Tests/Interop/net/uncategorized_spec.rb @@ -1 +1 @@ -fails:System::String#method_missing throws NoMethodError for methods that don't exist +fails:System::String#method_missing throws NoMethodError for methods that don't exist that look like mutating methods Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/bcl/string/method_missing_tags.txt @@ -1,3 +1 @@ -fails:Generic methods on generic classes with 2 parameters has proper errors for constrained generics fails:Generic methods on generic classes with 2 parameters can use Ruby types for constrained generics -fails:Generic methods on generic classes with 2 parameters has proper error messages for skipping generic Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/method/invocation/generic_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/cli/repl.rb Merlin/Main/Languages/Ruby/Tests/Interop/tags/com/apps/excel_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/com/apps/word_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/bcl/array/instantiation_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/bcl/numerics/int32_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/delegate/instantiation/array_ref_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/delegate/instantiation/array_val_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/delegate/instantiation/generic_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/delegate/instantiation/ref_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/delegate/instantiation/val_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/delegate/instantiation/void_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/events/invocation_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/interface/implementation_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/method/reflection_tags.txt Merlin/Main/Languages/Ruby/Tests/Interop/tags/net/ruby/additions/clr_new_tags.txt cbe1a493555ec5c996a4c94d62ae1e4604eb6529 Jim Deville jdeville@microsoft.com http://github.com/shri/ironruby/commit/c6d6b40470a858c71d023cb82df6159201a9a107 c6d6b40470a858c71d023cb82df6159201a9a107 2009-08-26T16:36:41-07:00 2009-08-26T16:36:41-07:00 cleaning up failing interop specs. Many of them were test bugs e2f7247446201f13cdb433fc028cd5b60588e651 Jim Deville jdeville@microsoft.com