Remove tests for obsolete StringScanner methods

ruby/strscan#168

16 files changed, 157 insertions, 293 deletions

diff --git a/spec/ruby/library/stringscanner/clear_spec.rb b/spec/ruby/library/stringscanner/clear_spec.rb
deleted file mode 100644
index 7ae089704a..0000000000
--- a/spec/ruby/library/stringscanner/clear_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require_relative '../../spec_helper'
-require_relative 'shared/terminate'
-require 'strscan'
-
-describe "StringScanner#clear" do
-  it_behaves_like :strscan_terminate, :clear
-
-  it "warns in verbose mode that the method is obsolete" do
-    s = StringScanner.new("abc")
-    -> {
-      s.clear
-    }.should complain(/clear.*obsolete.*terminate/, verbose: true)
-
-    -> {
-      s.clear
-    }.should_not complain(verbose: false)
-  end
-end
diff --git a/spec/ruby/library/stringscanner/empty_spec.rb b/spec/ruby/library/stringscanner/empty_spec.rb
deleted file mode 100644
index d9449bea6e..0000000000
--- a/spec/ruby/library/stringscanner/empty_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require_relative '../../spec_helper'
-require_relative 'shared/eos'
-require 'strscan'
-
-describe "StringScanner#empty?" do
-  it_behaves_like :strscan_eos, :empty?
-
-  it "warns in verbose mode that the method is obsolete" do
-    s = StringScanner.new("abc")
-    -> {
-      s.empty?
-    }.should complain(/empty?.*obsolete.*eos?/, verbose: true)
-
-    -> {
-      s.empty?
-    }.should_not complain(verbose: false)
-  end
-end
diff --git a/spec/ruby/library/stringscanner/eos_spec.rb b/spec/ruby/library/stringscanner/eos_spec.rb
index b58ee1e473..03c2804e5b 100644
--- a/spec/ruby/library/stringscanner/eos_spec.rb
+++ b/spec/ruby/library/stringscanner/eos_spec.rb
@@ -1,7 +1,20 @@
 require_relative '../../spec_helper'
-require_relative 'shared/eos'
 require 'strscan'
 
 describe "StringScanner#eos?" do
-  it_behaves_like :strscan_eos, :eos?
+  before :each do
+    @s = StringScanner.new("This is a test")
+  end
+
+  it "returns true if the scan pointer is at the end of the string" do
+    @s.terminate
+    @s.should.eos?
+
+    s = StringScanner.new('')
+    s.should.eos?
+  end
+
+  it "returns false if the scan pointer is not at the end of the string" do
+    @s.should_not.eos?
+  end
 end
diff --git a/spec/ruby/library/stringscanner/get_byte_spec.rb b/spec/ruby/library/stringscanner/get_byte_spec.rb
index 29e2f557de..b3c2b7f678 100644
--- a/spec/ruby/library/stringscanner/get_byte_spec.rb
+++ b/spec/ruby/library/stringscanner/get_byte_spec.rb
@@ -1,7 +1,88 @@
+# encoding: binary
 require_relative '../../spec_helper'
-require_relative 'shared/get_byte'
 require 'strscan'
 
 describe "StringScanner#get_byte" do
-  it_behaves_like :strscan_get_byte, :get_byte
+  it "scans one byte and returns it" do
+    s = StringScanner.new('abc5.')
+    s.get_byte.should == 'a'
+    s.get_byte.should == 'b'
+    s.get_byte.should == 'c'
+    s.get_byte.should == '5'
+    s.get_byte.should == '.'
+  end
+
+  it "is not multi-byte character sensitive" do
+    s = StringScanner.new("\244\242")
+    s.get_byte.should == "\244"
+    s.get_byte.should == "\242"
+  end
+
+  it "returns nil at the end of the string" do
+    # empty string case
+    s = StringScanner.new('')
+    s.get_byte.should == nil
+    s.get_byte.should == nil
+
+    # non-empty string case
+    s = StringScanner.new('a')
+    s.get_byte # skip one
+    s.get_byte.should == nil
+  end
+
+  describe "#[] successive call with a capture group name" do
+    # https://github.com/ruby/strscan/issues/139
+    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+    version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+      it "returns nil" do
+        s = StringScanner.new("This is a test")
+        s.get_byte
+        s.should.matched?
+        s[:a].should be_nil
+      end
+    end
+    end
+    version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
+      it "raises IndexError" do
+        s = StringScanner.new("This is a test")
+        s.get_byte
+        s.should.matched?
+        -> { s[:a] }.should raise_error(IndexError)
+      end
+    end
+
+    it "returns a matching character when given Integer index" do
+      s = StringScanner.new("This is a test")
+      s.get_byte
+      s[0].should == "T"
+    end
+
+    # https://github.com/ruby/strscan/issues/135
+    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
+    version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
+      it "ignores the previous matching with Regexp" do
+        s = StringScanner.new("This is a test")
+        s.exist?(/(?<a>This)/)
+        s.should.matched?
+        s[:a].should == "This"
+
+        s.get_byte
+        s.should.matched?
+        s[:a].should be_nil
+      end
+    end
+    end
+    version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
+      it "ignores the previous matching with Regexp" do
+        s = StringScanner.new("This is a test")
+        s.exist?(/(?<a>This)/)
+        s.should.matched?
+        s[:a].should == "This"
+
+        s.get_byte
+        s.should.matched?
+        -> { s[:a] }.should raise_error(IndexError)
+      end
+    end
+  end
 end
diff --git a/spec/ruby/library/stringscanner/getbyte_spec.rb b/spec/ruby/library/stringscanner/getbyte_spec.rb
deleted file mode 100644
index e0659a5829..0000000000
--- a/spec/ruby/library/stringscanner/getbyte_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-require_relative '../../spec_helper'
-require_relative 'shared/get_byte'
-require_relative 'shared/extract_range'
-require 'strscan'
-
-describe "StringScanner#getbyte" do
-  it_behaves_like :strscan_get_byte, :getbyte
-
-  it "warns in verbose mode that the method is obsolete" do
-    s = StringScanner.new("abc")
-    -> {
-      s.getbyte
-    }.should complain(/getbyte.*obsolete.*get_byte/, verbose: true)
-
-    -> {
-      s.getbyte
-    }.should_not complain(verbose: false)
-  end
-
-  it_behaves_like :extract_range, :getbyte
-end
diff --git a/spec/ruby/library/stringscanner/peek_spec.rb b/spec/ruby/library/stringscanner/peek_spec.rb
index cbb5630ff9..d490abecf9 100644
--- a/spec/ruby/library/stringscanner/peek_spec.rb
+++ b/spec/ruby/library/stringscanner/peek_spec.rb
@@ -1,7 +1,42 @@
 require_relative '../../spec_helper'
-require_relative 'shared/peek'
 require 'strscan'
 
 describe "StringScanner#peek" do
-  it_behaves_like :strscan_peek, :peek
+  before :each do
+    @s = StringScanner.new('This is a test')
+  end
+
+  it "returns at most the specified number of bytes from the current position" do
+    @s.peek(4).should == "This"
+    @s.pos.should == 0
+    @s.pos = 5
+    @s.peek(2).should == "is"
+    @s.peek(1000).should == "is a test"
+
+    s = StringScanner.new("été")
+    s.peek(2).should == "é"
+  end
+
+  it "returns an empty string when the passed argument is zero" do
+    @s.peek(0).should == ""
+  end
+
+  it "raises a ArgumentError when the passed argument is negative" do
+    -> { @s.peek(-2) }.should raise_error(ArgumentError)
+  end
+
+  it "raises a RangeError when the passed argument is a Bignum" do
+    -> { @s.peek(bignum_value) }.should raise_error(RangeError)
+  end
+
+  it "returns an instance of String when passed a String subclass" do
+    cls = Class.new(String)
+    sub = cls.new("abc")
+
+    s = StringScanner.new(sub)
+
+    ch = s.peek(1)
+    ch.should_not be_kind_of(cls)
+    ch.should be_an_instance_of(String)
+  end
 end
diff --git a/spec/ruby/library/stringscanner/peep_spec.rb b/spec/ruby/library/stringscanner/peep_spec.rb
deleted file mode 100644
index bf6d579325..0000000000
--- a/spec/ruby/library/stringscanner/peep_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require_relative '../../spec_helper'
-require_relative 'shared/peek'
-require 'strscan'
-
-describe "StringScanner#peep" do
-  it_behaves_like :strscan_peek, :peep
-
-  it "warns in verbose mode that the method is obsolete" do
-    s = StringScanner.new("abc")
-    -> {
-      s.peep(1)
-    }.should complain(/peep.*obsolete.*peek/, verbose: true)
-
-    -> {
-      s.peep(1)
-    }.should_not complain(verbose: false)
-  end
-end
diff --git a/spec/ruby/library/stringscanner/rest_size_spec.rb b/spec/ruby/library/stringscanner/rest_size_spec.rb
index e62e3a8f8c..a5e971631a 100644
--- a/spec/ruby/library/stringscanner/rest_size_spec.rb
+++ b/spec/ruby/library/stringscanner/rest_size_spec.rb
@@ -1,7 +1,21 @@
 require_relative '../../spec_helper'
-require_relative 'shared/rest_size'
 require 'strscan'
 
 describe "StringScanner#rest_size" do
-  it_behaves_like :strscan_rest_size, :rest_size
+  before :each do
+    @s = StringScanner.new('This is a test')
+  end
+
+  it "returns the length of the rest of the string" do
+    @s.rest_size.should == 14
+    @s.scan(/This/)
+    @s.rest_size.should == 10
+    @s.terminate
+    @s.rest_size.should == 0
+  end
+
+  it "is equivalent to rest.size" do
+    @s.scan(/This/)
+    @s.rest_size.should == @s.rest.size
+  end
 end
diff --git a/spec/ruby/library/stringscanner/rest_spec.rb b/spec/ruby/library/stringscanner/rest_spec.rb
index 67072f880d..25dcaf30ce 100644
--- a/spec/ruby/library/stringscanner/rest_spec.rb
+++ b/spec/ruby/library/stringscanner/rest_spec.rb
@@ -25,24 +25,3 @@ describe "StringScanner#rest" do
   it_behaves_like :extract_range_matched, :rest
 
 end
-
-describe "StringScanner#rest?" do
-  before :each do
-    @s = StringScanner.new("This is a test")
-  end
-
-  it "returns true if there is more data in the string" do
-    @s.rest?.should be_true
-    @s.scan(/This/)
-    @s.rest?.should be_true
-  end
-
-  it "returns false if there is no more data in the string" do
-    @s.terminate
-    @s.rest?.should be_false
-  end
-
-  it "is the opposite of eos?" do
-    @s.rest?.should_not == @s.eos?
-  end
-end
diff --git a/spec/ruby/library/stringscanner/restsize_spec.rb b/spec/ruby/library/stringscanner/restsize_spec.rb
deleted file mode 100644
index 710520afae..0000000000
--- a/spec/ruby/library/stringscanner/restsize_spec.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-require_relative '../../spec_helper'
-require_relative 'shared/rest_size'
-require 'strscan'
-
-describe "StringScanner#restsize" do
-  it_behaves_like :strscan_rest_size, :restsize
-
-  it "warns in verbose mode that the method is obsolete" do
-    s = StringScanner.new("abc")
-    -> {
-      s.restsize
-    }.should complain(/restsize.*obsolete.*rest_size/, verbose: true)
-
-    -> {
-      s.restsize
-    }.should_not complain(verbose: false)
-  end
-end
diff --git a/spec/ruby/library/stringscanner/shared/eos.rb b/spec/ruby/library/stringscanner/shared/eos.rb
deleted file mode 100644
index ea04c764a2..0000000000
--- a/spec/ruby/library/stringscanner/shared/eos.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-describe :strscan_eos, shared: true do
-  before :each do
-    @s = StringScanner.new("This is a test")
-  end
-
-  it "returns true if the scan pointer is at the end of the string" do
-    @s.terminate
-    @s.send(@method).should be_true
-
-    s = StringScanner.new('')
-    s.send(@method).should be_true
-  end
-
-  it "returns false if the scan pointer is not at the end of the string" do
-    @s.send(@method).should be_false
-  end
-end
diff --git a/spec/ruby/library/stringscanner/shared/get_byte.rb b/spec/ruby/library/stringscanner/shared/get_byte.rb
deleted file mode 100644
index 1f7378d5c6..0000000000
--- a/spec/ruby/library/stringscanner/shared/get_byte.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-# encoding: binary
-require 'strscan'
-
-describe :strscan_get_byte, shared: true do
-  it "scans one byte and returns it" do
-    s = StringScanner.new('abc5.')
-    s.send(@method).should == 'a'
-    s.send(@method).should == 'b'
-    s.send(@method).should == 'c'
-    s.send(@method).should == '5'
-    s.send(@method).should == '.'
-  end
-
-  it "is not multi-byte character sensitive" do
-    s = StringScanner.new("\244\242")
-    s.send(@method).should == "\244"
-    s.send(@method).should == "\242"
-  end
-
-  it "returns nil at the end of the string" do
-    # empty string case
-    s = StringScanner.new('')
-    s.send(@method).should == nil
-    s.send(@method).should == nil
-
-    # non-empty string case
-    s = StringScanner.new('a')
-    s.send(@method) # skip one
-    s.send(@method).should == nil
-  end
-
-  describe "#[] successive call with a capture group name" do
-    # https://github.com/ruby/strscan/issues/139
-    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
-    version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
-      it "returns nil" do
-        s = StringScanner.new("This is a test")
-        s.send(@method)
-        s.should.matched?
-        s[:a].should be_nil
-      end
-    end
-    end
-    version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
-      it "raises IndexError" do
-        s = StringScanner.new("This is a test")
-        s.send(@method)
-        s.should.matched?
-        -> { s[:a] }.should raise_error(IndexError)
-      end
-    end
-
-    it "returns a matching character when given Integer index" do
-      s = StringScanner.new("This is a test")
-      s.send(@method)
-      s[0].should == "T"
-    end
-
-    # https://github.com/ruby/strscan/issues/135
-    ruby_version_is ""..."3.5" do # Don't run on 3.5.0dev that already contains not released fixes
-    version_is StringScanner::Version, "3.1.1"..."3.1.3" do # ruby_version_is "3.4.0"..."3.4.3"
-      it "ignores the previous matching with Regexp" do
-        s = StringScanner.new("This is a test")
-        s.exist?(/(?<a>This)/)
-        s.should.matched?
-        s[:a].should == "This"
-
-        s.send(@method)
-        s.should.matched?
-        s[:a].should be_nil
-      end
-    end
-    end
-    version_is StringScanner::Version, "3.1.3" do # ruby_version_is "3.4.3"
-      it "ignores the previous matching with Regexp" do
-        s = StringScanner.new("This is a test")
-        s.exist?(/(?<a>This)/)
-        s.should.matched?
-        s[:a].should == "This"
-
-        s.send(@method)
-        s.should.matched?
-        -> { s[:a] }.should raise_error(IndexError)
-      end
-    end
-  end
-end
diff --git a/spec/ruby/library/stringscanner/shared/peek.rb b/spec/ruby/library/stringscanner/shared/peek.rb
deleted file mode 100644
index 4c757866c1..0000000000
--- a/spec/ruby/library/stringscanner/shared/peek.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-describe :strscan_peek, shared: true do
-  before :each do
-    @s = StringScanner.new('This is a test')
-  end
-
-  it "returns at most the specified number of bytes from the current position" do
-    @s.send(@method, 4).should == "This"
-    @s.pos.should == 0
-    @s.pos = 5
-    @s.send(@method, 2).should == "is"
-    @s.send(@method, 1000).should == "is a test"
-
-    s = StringScanner.new("été")
-    s.send(@method, 2).should == "é"
-  end
-
-  it "returns an empty string when the passed argument is zero" do
-    @s.send(@method, 0).should == ""
-  end
-
-  it "raises a ArgumentError when the passed argument is negative" do
-    -> { @s.send(@method, -2) }.should raise_error(ArgumentError)
-  end
-
-  it "raises a RangeError when the passed argument is a Bignum" do
-    -> { @s.send(@method, bignum_value) }.should raise_error(RangeError)
-  end
-
-  it "returns an instance of String when passed a String subclass" do
-    cls = Class.new(String)
-    sub = cls.new("abc")
-
-    s = StringScanner.new(sub)
-
-    ch = s.send(@method, 1)
-    ch.should_not be_kind_of(cls)
-    ch.should be_an_instance_of(String)
-  end
-end
diff --git a/spec/ruby/library/stringscanner/shared/rest_size.rb b/spec/ruby/library/stringscanner/shared/rest_size.rb
deleted file mode 100644
index 4c4f49e45c..0000000000
--- a/spec/ruby/library/stringscanner/shared/rest_size.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-describe :strscan_rest_size, shared: true do
-  before :each do
-    @s = StringScanner.new('This is a test')
-  end
-
-  it "returns the length of the rest of the string" do
-    @s.send(@method).should == 14
-    @s.scan(/This/)
-    @s.send(@method).should == 10
-    @s.terminate
-    @s.send(@method).should == 0
-  end
-
-  it "is equivalent to rest.size" do
-    @s.scan(/This/)
-    @s.send(@method).should == @s.rest.size
-  end
-end
diff --git a/spec/ruby/library/stringscanner/shared/terminate.rb b/spec/ruby/library/stringscanner/shared/terminate.rb
deleted file mode 100644
index bf41d097e2..0000000000
--- a/spec/ruby/library/stringscanner/shared/terminate.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-describe :strscan_terminate, shared: true do
-  it "set the scan pointer to the end of the string and clear matching data." do
-    s = StringScanner.new('This is a test')
-    s.send(@method)
-    s.bol?.should be_false
-    s.eos?.should be_true
-  end
-end
diff --git a/spec/ruby/library/stringscanner/terminate_spec.rb b/spec/ruby/library/stringscanner/terminate_spec.rb
index 7943efe0f9..3cff5c010c 100644
--- a/spec/ruby/library/stringscanner/terminate_spec.rb
+++ b/spec/ruby/library/stringscanner/terminate_spec.rb
@@ -1,7 +1,11 @@
 require_relative '../../spec_helper'
-require_relative 'shared/terminate'
 require 'strscan'
 
 describe "StringScanner#terminate" do
-  it_behaves_like :strscan_terminate, :terminate
+  it "set the scan pointer to the end of the string and clear matching data." do
+    s = StringScanner.new('This is a test')
+    s.terminate
+    s.should_not.bol?
+    s.should.eos?
+  end
 end