[macruby-changes] [3302] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 3302
          http://trac.macosforge.org/projects/ruby/changeset/3302
Author:   ernest.prabhakar at gmail.com
Date:     2010-01-19 15:56:48 -0800 (Tue, 19 Jan 2010)
Log Message:
-----------
gcd_prelude specs run, but fail

Modified Paths:
--------------
    MacRuby/trunk/gcd_prelude.rb
    MacRuby/trunk/spec/macruby/core/gcd/prelude_spec.rb

Modified: MacRuby/trunk/gcd_prelude.rb
===================================================================
--- MacRuby/trunk/gcd_prelude.rb	2010-01-19 23:56:47 UTC (rev 3301)
+++ MacRuby/trunk/gcd_prelude.rb	2010-01-19 23:56:48 UTC (rev 3302)
@@ -32,7 +32,7 @@
     end
 
     def on_process_event(pid, *events, &block)
-      mask = events.collect {|e| Dispatch::Source::proc_event(x)}.reduce(:|)
+      mask = events.collect {|e| Dispatch::Source::proc_event(e)}.reduce(:|)
       Dispatch::Source.new(Dispatch::Source::DATA_PROC, pid, mask, self, &block)
     end
 
@@ -50,7 +50,7 @@
     end
 
     def on_file_event(file, *events, &block)
-      mask = events.collect {|e| Dispatch::Source::vnode_event(x)}.reduce(:|)
+      mask = events.collect {|e| Dispatch::Source::vnode_event(e)}.reduce(:|)
       Dispatch::Source.new(Dispatch::Source::DATA_VNODE, file,mask, self,&block)
     end
 

Modified: MacRuby/trunk/spec/macruby/core/gcd/prelude_spec.rb
===================================================================
--- MacRuby/trunk/spec/macruby/core/gcd/prelude_spec.rb	2010-01-19 23:56:47 UTC (rev 3301)
+++ MacRuby/trunk/spec/macruby/core/gcd/prelude_spec.rb	2010-01-19 23:56:48 UTC (rev 3302)
@@ -1,8 +1,9 @@
 require File.dirname(__FILE__) + "/../../spec_helper"
+require File.dirname(__FILE__) + "/../../../../gcd_prelude"
 
 if MACOSX_VERSION >= 10.6
 
-  describe "Dispatch::Queue source methods" do
+  describe "Dispatch::Queue convenience method:" do
     before :each do
       @q = Dispatch::Queue.new('org.macruby.gcd_spec.sources')
       @src = nil
@@ -17,10 +18,10 @@
       it "fires with data on summed inputs" do
         @count = 0
         @src = @q.on_add {|s| @count += s.data}
-        @src.suspend
+        @src.suspend!
         @src << 20
         @src << 22
-        @src.resume
+        @src.resume!
         @q.sync {}
         @count.should == 42
       end
@@ -30,10 +31,10 @@
       it "fires with data on ORed inputs" do
         @count = 0
         @src = @q.on_or {|s| @count += s.data}
-        @src.suspend
+        @src.suspend!
         @src << 0xb101_000
         @src << 0xb000_010
-        @src.resume
+        @src.resume!
         @q.sync {}
         @count.should == 42
       end
@@ -67,18 +68,6 @@
       end
     end    
 
-    describe "on_interval" do
-      it "fires with data on how often the timer has fired" do
-        @count = -1
-        repeats = 2
-        @interval = 0.02
-        @src = @q.on_interval(@interval) {|s| @count += s.data}
-        sleep repeats*@interval
-        @q.sync { }
-        @count.should == repeats
-      end
-    end
-    
     describe "file:" do
       before :each do
         @msg = "#{$$}: #{Time.now}"
@@ -141,6 +130,19 @@
           @flag.should == Dispatch::Source::VNODE_WRITE
         end
       end          
+
+      describe "on_interval" do
+        it "fires with data on how often the timer has fired" do
+          @count = -1
+          repeats = 2
+          @interval = 0.02
+          @src = @q.on_interval(@interval) {|s| @count += s.data}
+          sleep repeats*@interval
+          @q.sync { }
+          @count.should == repeats
+        end
+      end
     end
   end
+  
 end
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100119/1cf0feea/attachment-0001.html>