[macruby-changes] [2146] MacRuby/branches/experimental/spec/frozen/library/stringscanner

[source_changes at macosforge.org]

Revision: 2146
          http://trac.macosforge.org/projects/ruby/changeset/2146
Author:   mattaimonetti at gmail.com
Date:     2009-08-02 01:57:05 -0700 (Sun, 02 Aug 2009)
Log Message:
-----------
updated the specs to be ruby1.9.2 compatible

Modified Paths:
--------------
    MacRuby/branches/experimental/spec/frozen/library/stringscanner/shared/concat.rb
    MacRuby/branches/experimental/spec/frozen/library/stringscanner/shared/get_byte.rb

Removed Paths:
-------------
    MacRuby/branches/experimental/spec/frozen/library/stringscanner/matchedsize_spec.rb

Deleted: MacRuby/branches/experimental/spec/frozen/library/stringscanner/matchedsize_spec.rb
===================================================================
--- MacRuby/branches/experimental/spec/frozen/library/stringscanner/matchedsize_spec.rb	2009-08-02 04:07:26 UTC (rev 2145)
+++ MacRuby/branches/experimental/spec/frozen/library/stringscanner/matchedsize_spec.rb	2009-08-02 08:57:05 UTC (rev 2146)
@@ -1,25 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.dirname(__FILE__) + '/shared/matched_size.rb'
-require 'strscan'
-
-describe "StringScanner#matchedsize" do
-  it_behaves_like(:strscan_matched_size, :matchedsize)
-
-  it "warns in verbose mode that the method is obsolete" do
-    s = StringScanner.new("abc")
-    begin
-      old = $VERBOSE
-      lambda {
-        $VERBOSE = true
-        s.matchedsize
-      }.should complain(/matchedsize.*obsolete.*matched_size/)
-
-      lambda {
-        $VERBOSE = false
-        s.matchedsize
-      }.should_not complain
-    ensure
-      $VERBOSE = old
-    end 
-  end
-end

Modified: MacRuby/branches/experimental/spec/frozen/library/stringscanner/shared/concat.rb
===================================================================
--- MacRuby/branches/experimental/spec/frozen/library/stringscanner/shared/concat.rb	2009-08-02 04:07:26 UTC (rev 2145)
+++ MacRuby/branches/experimental/spec/frozen/library/stringscanner/shared/concat.rb	2009-08-02 08:57:05 UTC (rev 2146)
@@ -6,8 +6,8 @@
     s.eos?.should be_false
   end
 
-  it "raises a TypeError if the given argument can't be converted to a String" do
-    lambda { a = StringScanner.new('hello').send(@method, :world)    }.should raise_error(TypeError)
+  it "raises a TypeError if the given argument can't be converted to a String" do 
+    lambda { a = StringScanner.new('hello').send(@method, [1,2,3])    }.should raise_error(TypeError)
     lambda { a = StringScanner.new('hello').send(@method, mock('x')) }.should raise_error(TypeError)
   end
 end

Modified: MacRuby/branches/experimental/spec/frozen/library/stringscanner/shared/get_byte.rb
===================================================================
--- MacRuby/branches/experimental/spec/frozen/library/stringscanner/shared/get_byte.rb	2009-08-02 04:07:26 UTC (rev 2145)
+++ MacRuby/branches/experimental/spec/frozen/library/stringscanner/shared/get_byte.rb	2009-08-02 08:57:05 UTC (rev 2146)
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require 'spec/frozen/library/stringscanner/shared/eucjp'
+require File.expand_path('../eucjp', __FILE__)
 
 describe :strscan_get_byte, :shared => true do
   it "scans one byte and returns it" do
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090802/3da8f8aa/attachment-0001.html>