caricature 0.7.2 → 0.7.5

data/spec/bacon/integration/clr_to_clr_spec.rb

@@ -27,7 +27,6 @@ describe "CLR to CLR interactions" do
       @weapon.when_receiving(:attack).with(ClrModels::Ninja.new).return(5)
 
       @ninja.attack(ClrModels::Ninja.new, @weapon).should.equal 0
-      #@ninja.attack(ClrModels::Ninja.new, ClrModels::Sword.new).should.equal 0
     end
 
     it "should work for expectations with an argument constraint and an assertion argument constraint" do
@@ -235,7 +234,7 @@ describe "CLR to CLR interactions" do
 
       result = @weapon.attack @ninja
       result.should.equal 5
-      var = @ninja.did_receive?(:survive_attack_with).with(:any)
+      @ninja.did_receive?(:survive_attack_with).with(:any).should.be.successful
       @ninja.did_receive?(:survive_attack_with).with(@weapon).should.be.successful
     end
 

data/spec/bacon/integration/event_spec.rb

@@ -0,0 +1,98 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+class DoNothingEventArgs < System::EventArgs
+  
+  
+end
+
+shared "an event publisher" do
+  
+  it "should not raise an error when subscribing to an event" do
+    lambda { ClrModels::ExposedChangedSubscriber.new(@proxy) }.should.not.raise
+  end
+  
+  it "should have 1 event subscription" do
+    @proxy.isolation_context.events.size.should == 1
+  end
+  
+   it "should raise an event when no block is given" do
+     @proxy.when_receiving(:explode).return(nil).raise_event(:on_is_exposed_changed)
+     @proxy.explode
+     @subscriber.counter.should == 1
+   end
+
+   it "should raise an event with the provided parameters" do
+     sender = { :the => "sender" }
+     ags = DoNothingEventArgs.new
+     @proxy.when_receiving(:explode).return(nil).raise_event(:on_is_exposed_changed, sender, ags)
+     @proxy.explode
+     @subscriber.sender.should == sender
+     @subscriber.args.should == ags
+   end
+
+   it "should allow overriding the default event handler" do
+     sender = { :the => "sender" }
+     ags = DoNothingEventArgs.new
+     cnt, rsen, rar = 0, nil, nil
+     handler = lambda { |sen, ar| cnt +=1; rsen = sen; rar=ar   }
+     @proxy.when_receiving(:explode).return(nil).raise_event(:on_is_exposed_changed, sender, ags, &handler)
+     @proxy.explode
+     rsen.should == sender
+     rar.should == ags
+     cnt.should == 1
+     @subscriber.counter.should == 0
+   end
+
+
+   it "should allow adding a block to the default event handler" do
+     sender = { :the => "sender" }
+     ags = DoNothingEventArgs.new
+     cnt = 0
+     handler = lambda { |sen, ar| cnt +=1   }
+     @proxy.when_receiving(:explode).return(nil).raise_event(:on_is_exposed_changed, sender, ags, &handler).raise_subscriptions
+     @proxy.explode
+     cnt.should == 1
+     @subscriber.counter.should == 1
+   end
+
+   it "should verify if an event was raised" do
+     @proxy.when_receiving(:explode).return(nil).raise_event(:on_is_exposed_changed)
+     @proxy.explode
+     @proxy.should.have_raised_event?(:on_is_exposed_changed)
+   end
+
+   it "should verify if an event was raised with specific parameters" do
+     sender = { :the => "sender" }
+     ags = DoNothingEventArgs.new
+     @proxy.when_receiving(:explode).return(nil).raise_event(:on_is_exposed_changed, sender, ags)
+     @proxy.explode
+     @proxy.should.have_raised_event?(:on_is_exposed_changed) { |ev| ev.with(sender, ags)}
+   end
+  
+end
+
+describe "CLR event handling" do
+
+   describe "for CLR interfaces" do
+
+     before do
+       @proxy = isolate ClrModels::IExplodingWarrior
+       @subscriber = ClrModels::ExposedChangedSubscriber.new(@proxy)
+     end
+
+     behaves_like "an event publisher"
+
+   end
+  
+  describe "for CLR classes" do
+    
+    before do
+      @proxy = isolate ClrModels::ExposingWarrior
+      @subscriber = ClrModels::ExposedChangedSubscriber.new(@proxy)
+    end
+
+    behaves_like "an event publisher"
+    
+  end
+
+end

data/spec/bacon/integration/indexer_spec.rb

@@ -15,7 +15,7 @@ describe "CLR to CLR interactions" do
       end
 
       it "should work with an expectation" do
-        @ind.when_receiving(:__getitem__).return("5")
+        @ind.when_receiving(:get_Item).return("5")
         
         @cons.call_index_on_class(@ind, "key1").should.equal "5"
       end

data/spec/bacon/spec_helper.rb

@@ -1,5 +1,5 @@
-require 'rubygems'
-# load the bacon library
-require 'bacon' unless defined? Bacon
-
+require 'rubygems'
+# load the bacon library
+require 'bacon' unless defined? Bacon
+
 require File.dirname(__FILE__) + "/../spec_helper"

data/spec/bacon/unit/descriptor_spec.rb

@@ -66,71 +66,124 @@ describe "Caricature::MemberDescriptor" do
 
 end
 
-describe "Caricature::ClrInterfaceDescriptor" do
+describe Caricature::ClrEventDescriptor.to_s do
 
-  before do
-    @des = Caricature::ClrInterfaceDescriptor.new ClrModels::IWeapon
+  it "should have an event name" do
+    des = Caricature::ClrEventDescriptor.new "EventName"
+    des.event_name.should == "EventName"
   end
 
-  it "should have 2 instance members" do
-    @des.instance_members.size.should.equal 2
+  it "should correctly identify when it's not an instance member" do
+    des = Caricature::ClrEventDescriptor.new "EventName", false
+    des.should.not.be.instance_member
   end
 
-  it "should contain only instance members" do
-    result = true
-    @des.instance_members.each do |mem|
-     result = false unless mem.instance_member?
+end
+
+describe "Caricature::ClrInterfaceDescriptor" do
+
+  describe "when collecting methods" do
+
+    before do
+      @des = Caricature::ClrInterfaceDescriptor.new ClrModels::IWeapon
     end
 
-    result.should.be.true
-  end
+    it "should have 2 instance members" do
+      @des.instance_members.size.should.equal 2
+    end
 
-  it "should have a damage instance member" do
-    @des.instance_members.select { |mem| mem.name == "damage" }.should.not.be.empty
-  end
+    it "should contain only instance members" do
+      result = true
+      @des.instance_members.each do |mem|
+        result = false unless mem.instance_member?
+      end
+
+      result.should.be.true
+    end
+
+    it "should have a damage instance member" do
+      @des.instance_members.select { |mem| mem.name == "damage" }.should.not.be.empty
+    end
+
+    it "should correctly identify indexers" do
+      des = Caricature::ClrInterfaceDescriptor.new ClrModels::IHaveAnIndexer
+      des.instance_members.select { |mem| mem.name == "get_Item" }.should.not.be.empty
+    end
 
-  it "should correctly identify indexers" do
-    des = Caricature::ClrInterfaceDescriptor.new ClrModels::IHaveAnIndexer
-    des.instance_members.select { |mem| mem.name == "__getitem__" }.should.not.be.empty
+    it "should correctly identify indexers" do
+      des = Caricature::ClrInterfaceDescriptor.new ClrModels::IHaveAnIndexer
+      des.instance_members.select { |mem| mem.name == "set_Item" }.should.not.be.empty
+    end
   end
 
-  it "should correctly identify indexers" do
-    des = Caricature::ClrInterfaceDescriptor.new ClrModels::IHaveAnIndexer
-    des.instance_members.select { |mem| mem.name == "__setitem__" }.should.not.be.empty
+  describe "when collecting events" do
+
+    before do
+      @des = Caricature::ClrInterfaceDescriptor.new ClrModels::IExplodingWarrior
+    end
+
+    it "should have collected 2 events" do
+      @des.events.size.should == 2
+    end
+
+    it "should have collected 2 instance events" do
+      @des.events.all? { |ev| ev.instance_member? }.should.be.true?
+    end
+
+
   end
-    
+
 end
 
 describe "Caricature::ClrClassDescriptor" do
 
-  before do
-    @des = Caricature::ClrClassDescriptor.new ClrModels::SwordWithStatics
-  end
+  describe "when collecting methods" do
 
-  it "should have 11 instance members" do
-    @des.instance_members.size.should.equal 11
-  end
+    before do
+      @des = Caricature::ClrClassDescriptor.new ClrModels::SwordWithStatics
+    end
 
-  it "should have 5 static members" do
-    @des.class_members.size.should.equal 5
-  end
+    it "should have 11 instance members" do
+      @des.instance_members.size.should.equal 11
+    end
 
-  it "should have a damage instance member" do
-    @des.instance_members.select { |mem| mem.name == "damage" }.should.not.be.empty
-  end
+    it "should have 5 static members" do
+      @des.class_members.size.should.equal 5
+    end
 
-  it "should have a another method instance member" do
-    @des.instance_members.select { |mem| mem.name == "another_method" }.should.not.be.empty
-  end
+    it "should have a damage instance member" do
+      @des.instance_members.select { |mem| mem.name == "damage" }.should.not.be.empty
+    end
+
+    it "should have a another method instance member" do
+      @des.instance_members.select { |mem| mem.name == "another_method" }.should.not.be.empty
+    end
 
-  it "should correctly identify indexers" do
-    des = Caricature::ClrClassDescriptor.new ClrModels::IndexerContained
-    des.instance_members.select { |mem| mem.name == "__getitem__" }.should.not.be.empty
+    it "should correctly identify indexers" do
+      des = Caricature::ClrClassDescriptor.new ClrModels::IndexerContained
+      des.instance_members.select { |mem| mem.name == "get_Item" }.should.not.be.empty
+    end
+
+    it "should correctly identify indexers" do
+      des = Caricature::ClrClassDescriptor.new ClrModels::IndexerContained
+      des.instance_members.select { |mem| mem.name == "set_Item" }.should.not.be.empty
+    end
   end
 
-  it "should correctly identify indexers" do
-    des = Caricature::ClrClassDescriptor.new ClrModels::IndexerContained
-    des.instance_members.select { |mem| mem.name == "__setitem__" }.should.not.be.empty
+  describe "when collecting events" do
+
+    before do
+      @des = Caricature::ClrClassDescriptor.new ClrModels::ExposingWarrior
+    end
+
+    it "should have 2 instance events" do
+      @des.events.size.should == 2
+    end
+
+    it "should should have 1 class event" do
+      @des.class_events.size.should == 1
+    end
+
   end
 
 end

data/spec/bacon/unit/expectation_spec.rb

@@ -208,9 +208,9 @@ describe "Caricature::ExpectationBuilder" do
     before do
       builder = Caricature::ExpectationBuilder.new :some_method
       @counter, @args = 0, []
-      builder.with(5) do |*args| 
+      builder.with(5) do |*ags| 
         @counter += 1 
-        @args = args
+        @args = ags
       end
       @expectation = builder.build
     end

data/spec/bacon/unit/interop_spec.rb

@@ -25,19 +25,6 @@ describe "Event handling" do
       subscriber.counter.should.equal 1
     end
 
-  end
-
-  describe "for an IR generated interface proxy" do
-
-    before do
-      @proxy = isolate ClrModels::IExposingWarrior
-    end
-
-    # apparently events don't work yet in IronRuby.. keeping this spec here to find out when it does
-#    it "should not raise an error when subcribing to an event" do
-#      lambda { ClrModels::ExposedChangedSubscriber.new(@proxy) }.should.not.raise
-#    end
-
-  end
+  end 
 
 end

data/spec/bacon/unit/isolation_spec.rb

@@ -83,5 +83,5 @@ describe "Caricature::Isolation" do
     end
 
   end
-
+  
 end

data/spec/bacon/unit/isolator_spec.rb

@@ -68,7 +68,7 @@ describe "Caricature::RubyIsolator" do
   end
 end
 
-describe "Caricature::RecordingClrProxy" do
+describe "Caricature::ClrIsolator" do
 
   describe "for an instance of a CLR class" do
 
@@ -172,11 +172,11 @@ describe "Caricature::RecordingClrProxy" do
     end
 
     it "should create an add method for the event" do
-      @proxy.should.respond_to?(:add_is_exposed_changed)
+      @proxy.should.respond_to?(:add_OnIsExposedChanged)
     end
 
     it "should create a remove method for the event" do
-      @proxy.should.respond_to?(:remove_is_exposed_changed)
+      @proxy.should.respond_to?(:remove_OnIsExposedChanged)
     end
 
   end
@@ -201,11 +201,11 @@ describe "Caricature::RecordingClrProxy" do
     end
 
     it "should create an add method for an event defined on a composing interface" do
-      @proxy.should.respond_to?(:add_is_exposed_changed)
+      @proxy.should.respond_to?(:add_OnIsExposedChanged)
     end
 
     it "should create a remove method for an event defined on a composing interface" do
-      @proxy.should.respond_to?(:remove_is_exposed_changed)
+      @proxy.should.respond_to?(:remove_OnIsExposedChanged)
     end
 
     it "should create a getter for a property on the proxy" do

data/spec/models/ClrModels.cs

@@ -18,7 +18,7 @@ namespace ClrModels{
     }
 
     public interface IExposing {
-        event EventHandler<EventArgs> IsExposedChanged;
+        event EventHandler<EventArgs> OnIsExposedChanged;
         bool IsExposed {get; set; }
     }
 
@@ -30,6 +30,12 @@ namespace ClrModels{
         void OwnMethod();
     }
 
+    public interface IExplodingWarrior : IExposingBridge{
+        event EventHandler<EventArgs> OnExploding;
+        void Explode();
+
+    }
+
     public class ExposingWarrior : IExposingWarrior{
         private readonly int _id;
 
@@ -45,9 +51,23 @@ namespace ClrModels{
             return weapon.Damage() > 3;
         }
 
-        public event EventHandler<EventArgs> IsExposedChanged;
+        public virtual event EventHandler<EventArgs> OnIsExposedChanged;
         public bool IsExposed {get; set; }
 
+
+        public event EventHandler<EventArgs> OnIsAliveChanged;
+
+        public void Die(){
+            OnIsAliveChanged(this, EventArgs.Empty);
+        }
+
+        public static event EventHandler<EventArgs> OnCountChanged;
+
+        public static void ChangeCount(){
+            OnCountChanged(null, EventArgs.Empty);
+        }
+
+
         public void SomeMethod(){}
         public void OwnMethod(){
 
@@ -58,30 +78,34 @@ namespace ClrModels{
             return _life - weapon.Damage();
         }
 
-        public void ChangeIsExposed(){
+        public void Explode(){
             IsExposed = !IsExposed;
-            var handler = IsExposedChanged;
+            var handler = OnIsExposedChanged;
             if(handler != null){
                 handler(this, EventArgs.Empty);
             }
         }
 
-        public bool HasEventSubscriptions{ get { return IsExposedChanged != null; } }
+        public bool HasEventSubscriptions{ get { return OnIsExposedChanged != null; } }
     }
 
     public class ExposedChangedSubscriber{
 
-        private readonly IExposingWarrior _warrior;
+        private readonly IExposingBridge _warrior;
 
-        public ExposedChangedSubscriber(IExposingWarrior warrior){
+        public ExposedChangedSubscriber(IExposingBridge warrior){
           _warrior = warrior;
-          _warrior.IsExposedChanged += OnExposedChanged;
+          _warrior.OnIsExposedChanged += OnExposedChanged;
         }
 
         public int Counter { get; set; }
+		public object Sender {get; set;  }
+		public EventArgs Args { get; set; }
 
         private void OnExposedChanged(object sender, EventArgs args){
             Counter++;            
+            Sender = sender;
+            Args = args;
         }
 
     }