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

[source_changes at macosforge.org]

Revision: 2153
          http://trac.macosforge.org/projects/ruby/changeset/2153
Author:   mattaimonetti at gmail.com
Date:     2009-08-02 12:16:53 -0700 (Sun, 02 Aug 2009)
Log Message:
-----------
fixed the stringscanner specs to run on ruby1.8 and 1.9 

Modified Paths:
--------------
    MacRuby/branches/experimental/spec/frozen/library/stringscanner/getch_spec.rb
    MacRuby/branches/experimental/spec/frozen/library/stringscanner/initialize_copy_spec.rb
    MacRuby/branches/experimental/spec/frozen/library/stringscanner/initialize_spec.rb

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

Modified: MacRuby/branches/experimental/spec/frozen/library/stringscanner/getch_spec.rb
===================================================================
--- MacRuby/branches/experimental/spec/frozen/library/stringscanner/getch_spec.rb	2009-08-02 18:58:20 UTC (rev 2152)
+++ MacRuby/branches/experimental/spec/frozen/library/stringscanner/getch_spec.rb	2009-08-02 19:16:53 UTC (rev 2153)
@@ -13,15 +13,24 @@
   end
 
   it "is multi-byte character sensitive" do
-    s = StringScanner.new("あ") # Japanese hira-kana "A" 
-    s.getch.should == "あ" 
-    s.getch.should be_nil
+    ruby_version_is "" ... "1.9" do
+      @s = StringScanner.new("\244\242")
+      @s.getch.should == "\244"
+      @s.getch.should == "\242"
+    end
+    ruby_version_is "1.9" do
+      @s = StringScanner.new("あ") # Japanese hira-kana "A" 
+      @s.getch.should == "あ" 
+    end
+    @s.getch.should be_nil
   end
-  
-  it "should keep the encoding" do
-    s = StringScanner.new(TestStrings.eucjp)
-    s.getch.encoding.to_s.should == "EUC-JP"
-  end
+   
+  ruby_version_is "1.9" do  
+    it "should keep the encoding" do
+      s = StringScanner.new(TestStrings.eucjp)
+      s.getch.encoding.to_s.should == "EUC-JP"
+    end
+  end  
 
   it "returns nil at the end of the string" do
     # empty string case

Modified: MacRuby/branches/experimental/spec/frozen/library/stringscanner/initialize_copy_spec.rb
===================================================================
--- MacRuby/branches/experimental/spec/frozen/library/stringscanner/initialize_copy_spec.rb	2009-08-02 18:58:20 UTC (rev 2152)
+++ MacRuby/branches/experimental/spec/frozen/library/stringscanner/initialize_copy_spec.rb	2009-08-02 19:16:53 UTC (rev 2153)
@@ -8,7 +8,12 @@
   end
 
   it "is a private method" do
-    @s.private_methods.should include(:initialize)
+    ruby_version_is "" ... "1.9" do
+      @s.private_methods.should include('initialize')
+    end
+    ruby_version_is "1.9" do
+      @s.private_methods.should include(:initialize)
+    end
   end
 
   it "copies the passed StringScanner's content to self" do

Modified: MacRuby/branches/experimental/spec/frozen/library/stringscanner/initialize_spec.rb
===================================================================
--- MacRuby/branches/experimental/spec/frozen/library/stringscanner/initialize_spec.rb	2009-08-02 18:58:20 UTC (rev 2152)
+++ MacRuby/branches/experimental/spec/frozen/library/stringscanner/initialize_spec.rb	2009-08-02 19:16:53 UTC (rev 2153)
@@ -7,7 +7,12 @@
   end
 
   it "is a private method" do
-    @s.private_methods.should include(:initialize)
+    ruby_version_is "" ... "1.9" do
+     @s.private_methods.should include('initialize')
+    end
+    ruby_version_is "1.9" do
+      @s.private_methods.should include(:initialize)
+    end
   end
 
   it "returns an instance of StringScanner" do

Added: MacRuby/branches/experimental/spec/frozen/library/stringscanner/matchedsize_spec.rb
===================================================================
--- MacRuby/branches/experimental/spec/frozen/library/stringscanner/matchedsize_spec.rb	                        (rev 0)
+++ MacRuby/branches/experimental/spec/frozen/library/stringscanner/matchedsize_spec.rb	2009-08-02 19:16:53 UTC (rev 2153)
@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/shared/matched_size.rb'
+require 'strscan'
+
+ruby_version_is "" ... "1.9" do
+  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 
+end
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20090802/6b65300a/attachment.html>