archive-zip 0.6.0 → 0.7.0

data/spec/binary_stringio/new_spec.rb

@@ -1,34 +1,40 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'minitest/autorun'
+
 require 'archive/support/binary_stringio'
 
 describe "BinaryStringIO.new" do
   it "returns a new instance" do
     io = BinaryStringIO.new
-    io.class.should == BinaryStringIO
+    io.must_be_instance_of BinaryStringIO
     io.close
   end
 
   it "creates a decendent of StringIO" do
     io = BinaryStringIO.new
-    io.should be_kind_of StringIO
+    io.must_be_kind_of StringIO
     io.close
   end
 
+  # TODO:
+  # This is lame.  Break this out as augmentation for the "returns a new
+  # instance" test.
   it "takes the same arguments as StringIO.new" do
-    lambda { BinaryStringIO.new }.should_not raise_error(ArgumentError)
-    lambda { BinaryStringIO.new('') }.should_not raise_error(ArgumentError)
-    lambda { BinaryStringIO.new('', 'r') }.should_not raise_error(ArgumentError)
-    lambda { BinaryStringIO.new('', 'w') }.should_not raise_error(ArgumentError)
+    BinaryStringIO.new.must_be_instance_of BinaryStringIO
+    BinaryStringIO.new('').must_be_instance_of BinaryStringIO
+    BinaryStringIO.new('', 'r').must_be_instance_of BinaryStringIO
+    BinaryStringIO.new('', 'w').must_be_instance_of BinaryStringIO
 
-    lambda { BinaryStringIO.new('', 'w', 42) }.should raise_error(ArgumentError)
+    lambda { BinaryStringIO.new('', 'w', 42) }.must_raise ArgumentError
   end
 
-  with_feature :encoding do
-    it "sets the external encoding to binary" do
-      io = BinaryStringIO.new
-      io.external_encoding.should == Encoding::ASCII_8BIT
+  it "sets the external encoding to binary" do
+    unless Object.const_defined?(:Encoding)
+      skip("Encoding methods are not supported on current Ruby (#{RUBY_DESCRIPTION})")
     end
+
+    io = BinaryStringIO.new
+    io.external_encoding.must_equal Encoding::ASCII_8BIT
   end
 end

data/spec/binary_stringio/set_encoding_spec.rb

@@ -1,14 +1,17 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'minitest/autorun'
+
 require 'archive/support/binary_stringio'
 
-with_feature :encoding do
-  describe "BinaryStringIO#set_encoding" do
-    it "should be private" do
-      lambda do
-        BinaryStringIO.new.set_encoding('utf-8')
-      end.should raise_error(NoMethodError)
+describe "BinaryStringIO#set_encoding" do
+  it "raises an exception when called" do
+    unless Object.const_defined?(:Encoding)
+      skip("Encoding methods are not supported on current Ruby (#{RUBY_DESCRIPTION})")
     end
+
+    lambda do
+      BinaryStringIO.new.set_encoding('utf-8')
+    end.must_raise RuntimeError
   end
 end

data/spec/ioextensions/read_exactly_spec.rb

@@ -1,50 +1,52 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'minitest/autorun'
+
 require 'archive/support/ioextensions.rb'
 require 'archive/support/binary_stringio'
 
 describe "IOExtensions.read_exactly" do
   it "reads and returns length bytes from a given IO object" do
     io = BinaryStringIO.new('This is test data')
-    IOExtensions.read_exactly(io, 4).should == 'This'
-    IOExtensions.read_exactly(io, 13).should == ' is test data'
+    IOExtensions.read_exactly(io, 4).must_equal 'This'
+    IOExtensions.read_exactly(io, 13).must_equal ' is test data'
   end
 
   it "raises an error when too little data is available" do
     io = BinaryStringIO.new('This is test data')
     lambda do
       IOExtensions.read_exactly(io, 18)
-    end.should raise_error(EOFError)
+    end.must_raise EOFError
   end
 
   it "takes an optional buffer argument and fills it" do
     io = BinaryStringIO.new('This is test data')
     buffer = ''
     IOExtensions.read_exactly(io, 4, buffer)
-    buffer.should == 'This'
+    buffer.must_equal 'This'
     buffer = ''
     IOExtensions.read_exactly(io, 13, buffer)
-    buffer.should == ' is test data'
+    buffer.must_equal ' is test data'
   end
 
   it "empties the optional buffer before filling it" do
     io = BinaryStringIO.new('This is test data')
     buffer = ''
     IOExtensions.read_exactly(io, 4, buffer)
-    buffer.should == 'This'
+    buffer.must_equal 'This'
     IOExtensions.read_exactly(io, 13, buffer)
-    buffer.should == ' is test data'
+    buffer.must_equal ' is test data'
   end
 
   it "can read 0 bytes" do
     io = BinaryStringIO.new('This is test data')
-    IOExtensions.read_exactly(io, 0).should == ''
+    IOExtensions.read_exactly(io, 0).must_equal ''
   end
 
   it "retries partial reads" do
-    io = mock('io')
-    io.should_receive(:read).exactly(2).and_return('hello')
-    IOExtensions.read_exactly(io, 10).should == 'hellohello'
+    io = MiniTest::Mock.new
+    io.expect(:read, 'hello', [10])
+    io.expect(:read, 'hello', [5])
+    IOExtensions.read_exactly(io, 10).must_equal 'hellohello'
   end
 end

data/spec/zlib/zreader/checksum_spec.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/support/zlib'
 
 describe "Zlib::ZReader#checksum" do
@@ -9,32 +11,32 @@ describe "Zlib::ZReader#checksum" do
     closed_zr = ZlibSpecs.compressed_data do |f|
       Zlib::ZReader.open(f, 15) do |zr|
         zr.read
-        zr.checksum.should == Zlib.adler32(ZlibSpecs.test_data)
+        zr.checksum.must_equal Zlib.adler32(ZlibSpecs.test_data)
         zr
       end
     end
-    closed_zr.checksum.should == Zlib.adler32(ZlibSpecs.test_data)
+    closed_zr.checksum.must_equal Zlib.adler32(ZlibSpecs.test_data)
   end
 
   it "computes the CRC32 checksum of gzip formatted data" do
     closed_zr = ZlibSpecs.compressed_data_gzip do |f|
       Zlib::ZReader.open(f, 31) do |zr|
         zr.read
-        zr.checksum.should == Zlib.crc32(ZlibSpecs.test_data)
+        zr.checksum.must_equal Zlib.crc32(ZlibSpecs.test_data)
         zr
       end
     end
-    closed_zr.checksum.should == Zlib.crc32(ZlibSpecs.test_data)
+    closed_zr.checksum.must_equal Zlib.crc32(ZlibSpecs.test_data)
   end
 
   it "does not compute a checksum for raw zlib data" do
     closed_zr = ZlibSpecs.compressed_data_raw do |f|
       Zlib::ZReader.open(f, -15) do |zr|
         zr.read
-        zr.checksum.should == nil
+        zr.checksum.must_equal nil
         zr
       end
     end
-    closed_zr.checksum.should == nil
+    closed_zr.checksum.must_equal nil
   end
 end

data/spec/zlib/zreader/close_spec.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/support/zlib'
 require 'archive/support/binary_stringio'
 
@@ -9,6 +11,6 @@ describe "Zlib::ZReader.close" do
   it "closes the stream" do
     zr = Zlib::ZReader.new(BinaryStringIO.new)
     zr.close
-    zr.closed?.should be_true
+    zr.closed?.must_equal true
   end
 end

data/spec/zlib/zreader/compressed_size_spec.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/support/zlib'
 
 describe "Zlib::ZReader#compressed_size" do
@@ -9,10 +11,10 @@ describe "Zlib::ZReader#compressed_size" do
     closed_zr = ZlibSpecs.compressed_data_raw do |compressed_data|
       Zlib::ZReader.open(compressed_data, -15) do |zr|
         zr.read
-        zr.compressed_size.should == 160
+        zr.compressed_size.must_equal 160
         zr
       end
     end
-    closed_zr.compressed_size.should == 160
+    closed_zr.compressed_size.must_equal 160
   end
 end

data/spec/zlib/zreader/new_spec.rb

@@ -1,13 +1,15 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/support/zlib'
 require 'archive/support/binary_stringio'
 
 describe "Zlib::ZReader.new" do
   it "returns a new instance" do
-    Zlib::ZReader.new(BinaryStringIO.new).class.should == Zlib::ZReader
+    Zlib::ZReader.new(BinaryStringIO.new).class.must_equal Zlib::ZReader
   end
 
   it "does not require window_bits to be set" do
@@ -19,7 +21,7 @@ describe "Zlib::ZReader.new" do
     compressed_data.rewind
 
     zr = Zlib::ZReader.new(compressed_data)
-    zr.read.should == data
+    zr.read.must_equal data
     zr.close
   end
 
@@ -35,7 +37,7 @@ describe "Zlib::ZReader.new" do
     compressed_data.rewind
 
     zr = Zlib::ZReader.new(compressed_data, window_bits)
-    zr.read.should == data
+    zr.read.must_equal data
     zr.close
   end
 end

data/spec/zlib/zreader/open_spec.rb

@@ -1,21 +1,23 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/support/zlib'
 require 'archive/support/binary_stringio'
 
 describe "Zlib::ZReader.open" do
   it "returns a new instance when run without a block" do
-    Zlib::ZReader.open(BinaryStringIO.new).class.should == Zlib::ZReader
+    Zlib::ZReader.open(BinaryStringIO.new).class.must_equal Zlib::ZReader
   end
 
   it "executes a block with a new instance as an argument" do
-    Zlib::ZReader.open(BinaryStringIO.new) { |zr| zr.class.should == Zlib::ZReader }
+    Zlib::ZReader.open(BinaryStringIO.new) { |zr| zr.class.must_equal Zlib::ZReader }
   end
 
   it "closes the object after executing a block" do
-    Zlib::ZReader.open(BinaryStringIO.new) { |zr| zr }.closed?.should.be_true
+    Zlib::ZReader.open(BinaryStringIO.new) { |zr| zr }.closed?.must_equal true
   end
 
   it "does not require window_bits to be set" do
@@ -27,7 +29,7 @@ describe "Zlib::ZReader.open" do
     compressed_data.rewind
 
     Zlib::ZReader.open(compressed_data) do |zr|
-      zr.read.should == data
+      zr.read.must_equal data
     end
   end
 
@@ -43,7 +45,7 @@ describe "Zlib::ZReader.open" do
     compressed_data.rewind
 
     Zlib::ZReader.open(compressed_data, window_bits) do |zr|
-      zr.read.should == data
+      zr.read.must_equal data
     end
   end
 end

data/spec/zlib/zreader/read_spec.rb

@@ -1,14 +1,16 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/support/zlib'
 require 'archive/support/binary_stringio'
 
 describe "Zlib::ZReader#read" do
   it "calls the read method of the delegate" do
-    delegate = mock('delegate')
-    delegate.should_receive(:read).and_return(nil)
+    delegate = MiniTest::Mock.new
+    delegate.expect(:read, nil, [Integer])
     Zlib::ZReader.open(delegate) do |zr|
       # Capture and ignore the Zlib::BufError which is generated due to mocking.
       begin
@@ -21,27 +23,27 @@ describe "Zlib::ZReader#read" do
   it "decompresses compressed data" do
     ZlibSpecs.compressed_data do |cd|
       Zlib::ZReader.open(cd) do |zr|
-        zr.read.should == ZlibSpecs.test_data
+        zr.read.must_equal ZlibSpecs.test_data
       end
     end
   end
 
   it "raises Zlib::DataError when reading invalid data" do
     Zlib::ZReader.open(BinaryStringIO.new('This is not compressed data')) do |zr|
-      lambda { zr.read }.should raise_error(Zlib::DataError)
+      lambda { zr.read }.must_raise Zlib::DataError
     end
   end
 
   it "raises Zlib::BufError when reading truncated data" do
     truncated_data = ZlibSpecs.compressed_data { |cd| cd.read(100) }
     Zlib::ZReader.open(BinaryStringIO.new(truncated_data)) do |zr|
-      lambda { zr.read }.should raise_error(Zlib::BufError)
+      lambda { zr.read }.must_raise Zlib::BufError
     end
   end
 
   it "raises Zlib::BufError when reading empty data" do
     Zlib::ZReader.open(BinaryStringIO.new()) do |zr|
-      lambda { zr.read }.should raise_error(Zlib::BufError)
+      lambda { zr.read }.must_raise Zlib::BufError
     end
   end
 end

data/spec/zlib/zreader/rewind_spec.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/support/zlib'
 
 describe "Zlib::ZReader#rewind" do
@@ -9,15 +11,15 @@ describe "Zlib::ZReader#rewind" do
     ZlibSpecs.compressed_data do |cd|
       Zlib::ZReader.open(cd) do |zr|
         zr.read(4)
-        lambda { zr.rewind }.should_not raise_error
-        zr.read.should == ZlibSpecs.test_data
+        zr.rewind
+        zr.read.must_equal ZlibSpecs.test_data
       end
     end
   end
 
   it "raises Errno::EINVAL when attempting to rewind the stream when the delegate does not respond to rewind" do
     Zlib::ZReader.open(Object.new) do |zr|
-      lambda { zr.rewind }.should raise_error(Errno::EINVAL)
+      lambda { zr.rewind }.must_raise Errno::EINVAL
     end
   end
 end

data/spec/zlib/zreader/seek_spec.rb

@@ -1,7 +1,9 @@
 # encoding: UTF-8
 
-require File.dirname(__FILE__) + '/../../../spec_helper'
-require File.dirname(__FILE__) + '/../fixtures/classes'
+require 'minitest/autorun'
+
+require File.expand_path('../../fixtures/classes', __FILE__)
+
 require 'archive/support/zlib'
 
 describe "Zlib::ZReader#seek" do
@@ -9,14 +11,14 @@ describe "Zlib::ZReader#seek" do
     ZlibSpecs.compressed_data do |cd|
       Zlib::ZReader.open(cd) do |zr|
         zr.read(4)
-        lambda { zr.seek(0) }.should_not raise_error
+        zr.seek(0).must_equal 0
       end
     end
   end
 
   it "raises Errno::EINVAL when attempting to seek to the beginning of the stream when the delegate does not respond to rewind" do
     Zlib::ZReader.open(Object.new) do |zr|
-      lambda { zr.seek(0) }.should raise_error(Errno::EINVAL)
+      lambda { zr.seek(0) }.must_raise Errno::EINVAL
     end
   end
 
@@ -28,8 +30,8 @@ describe "Zlib::ZReader#seek" do
         zr.fill_size = 0
 
         zr.read(4)
-        lambda { zr.seek(1, IO::SEEK_CUR) }.should raise_error(Errno::EINVAL)
-        lambda { zr.seek(-1, IO::SEEK_CUR) }.should raise_error(Errno::EINVAL)
+        lambda { zr.seek(1, IO::SEEK_CUR) }.must_raise Errno::EINVAL
+        lambda { zr.seek(-1, IO::SEEK_CUR) }.must_raise Errno::EINVAL
       end
     end
   end
@@ -37,8 +39,8 @@ describe "Zlib::ZReader#seek" do
   it "raises Errno::EINVAL when seeking a non-zero offset relative to the beginning of the stream" do
     ZlibSpecs.compressed_data do |cd|
       Zlib::ZReader.open(cd) do |zr|
-        lambda { zr.seek(-1, IO::SEEK_SET) }.should raise_error(Errno::EINVAL)
-        lambda { zr.seek(1, IO::SEEK_SET) }.should raise_error(Errno::EINVAL)
+        lambda { zr.seek(-1, IO::SEEK_SET) }.must_raise Errno::EINVAL
+        lambda { zr.seek(1, IO::SEEK_SET) }.must_raise Errno::EINVAL
       end
     end
   end
@@ -46,9 +48,9 @@ describe "Zlib::ZReader#seek" do
   it "raises Errno::EINVAL when seeking relative to the end of the stream" do
     ZlibSpecs.compressed_data do |cd|
       Zlib::ZReader.open(cd) do |zr|
-        lambda { zr.seek(0, IO::SEEK_END) }.should raise_error(Errno::EINVAL)
-        lambda { zr.seek(-1, IO::SEEK_END) }.should raise_error(Errno::EINVAL)
-        lambda { zr.seek(1, IO::SEEK_END) }.should raise_error(Errno::EINVAL)
+        lambda { zr.seek(0, IO::SEEK_END) }.must_raise Errno::EINVAL
+        lambda { zr.seek(-1, IO::SEEK_END) }.must_raise Errno::EINVAL
+        lambda { zr.seek(1, IO::SEEK_END) }.must_raise Errno::EINVAL
       end
     end
   end