bindata 2.4.10 → 2.5.0

data/test/string_test.rb

@@ -5,17 +5,17 @@ require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 describe BinData::String, "with mutually exclusive parameters" do
   it ":value and :initial_value" do
     params = {value: "", initial_value: ""}
-    lambda { BinData::String.new(params) }.must_raise ArgumentError
+    _ { BinData::String.new(params) }.must_raise ArgumentError
   end
 
   it ":length and :read_length" do
     params = {length: 5, read_length: 5}
-    lambda { BinData::String.new(params) }.must_raise ArgumentError
+    _ { BinData::String.new(params) }.must_raise ArgumentError
   end
 
   it ":value and :length" do
     params = {value: "", length: 5}
-    lambda { BinData::String.new(params) }.must_raise ArgumentError
+    _ { BinData::String.new(params) }.must_raise ArgumentError
   end
 end
 
@@ -25,12 +25,12 @@ describe BinData::String, "when assigning" do
 
   it "copies data from small to large" do
     large.assign(small)
-    large.must_equal "AAABB"
+    _(large).must_equal "AAABB"
   end
 
   it "copies data from large to small" do
     small.assign(large)
-    small.must_equal "BBB"
+    _(small).must_equal "BBB"
   end
 end
 
@@ -38,96 +38,96 @@ describe BinData::String do
   let(:obj) { BinData::String.new("testing") }
 
   it "compares with regexp" do
-    (/es/ =~ obj).must_equal 1
+    _((/es/ =~ obj)).must_equal 1
   end
 
   it "compares with regexp" do
-    (obj =~ /es/).must_equal 1
+    _((obj =~ /es/)).must_equal 1
   end
 end
 
 describe BinData::String, "with :read_length" do
   let(:obj) { BinData::String.new(read_length: 5) }
 
-  specify { obj.num_bytes.must_equal 0 }
-  specify { obj.value.must_equal "" }
+  specify { _(obj.num_bytes).must_equal 0 }
+  specify { _(obj.value).must_equal "" }
 
   it "reads :read_length bytes" do
     obj.read("abcdefghij")
-    obj.must_equal "abcde"
+    _(obj).must_equal "abcde"
   end
 
   it "remembers :read_length after value is cleared" do
     obj.assign("abc")
-    obj.num_bytes.must_equal 3
+    _(obj.num_bytes).must_equal 3
     obj.clear
 
     obj.read("abcdefghij")
-    obj.must_equal "abcde"
+    _(obj).must_equal "abcde"
   end
 end
 
 describe BinData::String, "with :length" do
   let(:obj) { BinData::String.new(length: 5) }
 
-  specify { obj.num_bytes.must_equal 5 }
-  specify { obj.value.must_equal "\0\0\0\0\0" }
+  specify { _(obj.num_bytes).must_equal 5 }
+  specify { _(obj.value).must_equal "\0\0\0\0\0" }
 
   it "retains :length after value is set" do
     obj.assign("abcdefghij")
-    obj.num_bytes.must_equal 5
+    _(obj.num_bytes).must_equal 5
   end
 
   it "reads :length bytes" do
     obj.read("abcdefghij")
-    obj.must_equal "abcde"
+    _(obj).must_equal "abcde"
   end
 
   it "pads values less than :length" do
     obj.assign("abc")
-    obj.must_equal "abc\0\0"
+    _(obj).must_equal "abc\0\0"
   end
 
   it "accepts values exactly :length" do
     obj.assign("abcde")
-    obj.must_equal "abcde"
+    _(obj).must_equal "abcde"
   end
 
   it "truncates values greater than :length" do
     obj.assign("abcdefghij")
-    obj.must_equal "abcde"
+    _(obj).must_equal "abcde"
   end
 end
 
 describe BinData::String, "with :read_length and :initial_value" do
   let(:obj) { BinData::String.new(read_length: 5, initial_value: "abcdefghij") }
 
-  specify { obj.num_bytes.must_equal 10 }
-  specify { obj.value.must_equal "abcdefghij" }
+  specify { _(obj.num_bytes).must_equal 10 }
+  specify { _(obj.value).must_equal "abcdefghij" }
 
   it "uses :read_length for reading" do
     io = StringIO.new("ABCDEFGHIJKLMNOPQRST")
     obj.read(io)
-    io.pos.must_equal 5
+    _(io.pos).must_equal 5
    end
 
   it "forgets :initial_value after reading" do
     obj.read("ABCDEFGHIJKLMNOPQRST")
-    obj.num_bytes.must_equal 5
-    obj.must_equal "ABCDE"
+    _(obj.num_bytes).must_equal 5
+    _(obj).must_equal "ABCDE"
   end
 end
 
 describe BinData::String, "with :read_length and :value" do
   let(:obj) { BinData::String.new(read_length: 5, value: "abcdefghij") }
 
-  specify { obj.num_bytes.must_equal 10 }
-  specify { obj.value.must_equal "abcdefghij" }
+  specify { _(obj.num_bytes).must_equal 10 }
+  specify { _(obj.value).must_equal "abcdefghij" }
 
   it "uses :read_length for reading" do
     io = StringIO.new("ABCDEFGHIJKLMNOPQRST")
     obj.read(io)
-    io.pos.must_equal 5
+    _(io.pos).must_equal 5
   end
 
   describe "after reading" do
@@ -136,13 +136,13 @@ describe BinData::String, "with :read_length and :value" do
     end
 
     it "is not affected by :read_length after reading" do
-      obj.num_bytes.must_equal 10
-      obj.must_equal "abcdefghij"
+      _(obj.num_bytes).must_equal 10
+      _(obj).must_equal "abcdefghij"
     end
 
     it "returns read value while reading" do
       obj.stub :reading?, true do
-        obj.must_equal "ABCDE"
+        _(obj).must_equal "ABCDE"
       end
     end
   end
@@ -151,15 +151,15 @@ end
 describe BinData::String, "with :length and :initial_value" do
   let(:obj) { BinData::String.new(length: 5, initial_value: "abcdefghij") }
 
-  specify { obj.num_bytes.must_equal 5 }
-  specify { obj.value.must_equal "abcde" }
+  specify { _(obj.num_bytes).must_equal 5 }
+  specify { _(obj.value).must_equal "abcde" }
 
   it "forgets :initial_value after reading" do
     io = StringIO.new("ABCDEFGHIJKLMNOPQRST")
     obj.read(io)
-    io.pos.must_equal 5
-    obj.num_bytes.must_equal 5
-    obj.must_equal "ABCDE"
+    _(io.pos).must_equal 5
+    _(obj.num_bytes).must_equal 5
+    _(obj).must_equal "ABCDE"
   end
 end
 
@@ -167,18 +167,18 @@ describe BinData::String, "with :pad_byte" do
   it "accepts a numeric value for :pad_byte" do
     str = BinData::String.new(length: 5, pad_byte: 6)
     str.assign("abc")
-    str.must_equal "abc\x06\x06"
+    _(str).must_equal "abc\x06\x06"
   end
 
   it "accepts a character for :pad_byte" do
     str = BinData::String.new(length: 5, pad_byte: "R")
     str.assign("abc")
-    str.must_equal "abcRR"
+    _(str).must_equal "abcRR"
   end
 
   it "does not accept a string for :pad_byte" do
     params = {length: 5, pad_byte: "RR"}
-    lambda { BinData::String.new(params) }.must_raise ArgumentError
+    _ { BinData::String.new(params) }.must_raise ArgumentError
   end
 end
 
@@ -188,8 +188,8 @@ describe BinData::String, "with :trim_padding" do
     str2 = BinData::String.new(length: 5, trim_padding: false)
     str1.assign("abc")
     str2.assign("abc")
-    str1.must_equal "abc\0\0"
-    str2.must_equal "abc\0\0"
+    _(str1).must_equal "abc\0\0"
+    _(str2).must_equal "abc\0\0"
   end
 
   describe "trim padding set" do
@@ -197,22 +197,22 @@ describe BinData::String, "with :trim_padding" do
 
     it "trims the value" do
       obj.assign("abcRR")
-      obj.must_equal "abc"
+      _(obj).must_equal "abc"
     end
 
     it "does not affect num_bytes" do
       obj.assign("abcRR")
-      obj.num_bytes.must_equal 5
+      _(obj.num_bytes).must_equal 5
     end
 
     it "trims if last char is :pad_byte" do
       obj.assign("abcRR")
-      obj.must_equal "abc"
+      _(obj).must_equal "abc"
     end
 
     it "does not trim if value contains :pad_byte not at the end" do
       obj.assign("abcRRde")
-      obj.must_equal "abcRRde"
+      _(obj).must_equal "abcRRde"
     end
   end
 end
@@ -223,20 +223,20 @@ describe BinData::String, "with :pad_front" do
     str2 = BinData::String.new(length: 5, pad_front: false)
     str1.assign("abc")
     str2.assign("abc")
-    str1.must_equal "abc\0\0"
-    str2.must_equal "abc\0\0"
+    _(str1).must_equal "abc\0\0"
+    _(str2).must_equal "abc\0\0"
   end
 
   it "pads to the front" do
     str = BinData::String.new(length: 5, pad_byte: 'R', pad_front: true)
     str.assign("abc")
-    str.must_equal "RRabc"
+    _(str).must_equal "RRabc"
   end
 
   it "can alternatively be accesses by :pad_left" do
     str = BinData::String.new(length: 5, pad_byte: 'R', pad_left: true)
     str.assign("abc")
-    str.must_equal "RRabc"
+    _(str).must_equal "RRabc"
   end
 
   describe "and :trim_padding" do
@@ -244,17 +244,17 @@ describe BinData::String, "with :pad_front" do
 
     it "assigns" do
       obj.assign("abc")
-      obj.must_equal "abc"
+      _(obj).must_equal "abc"
     end
 
     it "has to_binary_s" do
       obj.assign("abc")
-      obj.to_binary_s.must_equal_binary "RRabc"
+      _(obj.to_binary_s).must_equal_binary "RRabc"
     end
 
     it "reads" do
       obj.read "RRabc"
-      obj.must_equal "abc"
+      _(obj).must_equal "abc"
     end
   end
 end
@@ -272,41 +272,41 @@ describe BinData::String, "with Ruby 1.9 encodings" do
 
   it "stores assigned values as binary" do
     obj.assign(utf8_str)
-    obj.to_binary_s.must_equal_binary binary_str
+    _(obj.to_binary_s).must_equal_binary binary_str
   end
 
   it "stores read values as binary" do
     obj = UTF8String.new(read_length: binary_str.bytesize)
     obj.read(binary_str)
 
-    obj.to_binary_s.must_equal_binary binary_str
+    _(obj.to_binary_s).must_equal_binary binary_str
   end
 
   it "returns values in correct encoding" do
     obj.assign(utf8_str)
 
-    obj.snapshot.must_equal utf8_str
+    _(obj.snapshot).must_equal utf8_str
   end
 
   it "has correct num_bytes" do
     obj.assign(utf8_str)
 
-    obj.num_bytes.must_equal binary_str.bytesize
+    _(obj.num_bytes).must_equal binary_str.bytesize
   end
 end
 
 describe BinData::String, "warnings" do
   it "warns if has :asserted_value but no :length" do
     obj = BinData::String.new(asserted_value: "ABC")
-    obj.must_warn "obj does not have a :read_length parameter - returning empty string" do
-      lambda { obj.read("abcde") }.must_raise BinData::ValidityError
-    end
+    _ {
+      _ { obj.read("abcde") }.must_raise BinData::ValidityError
+    }.must_warn "obj does not have a :read_length parameter - returning empty string"
   end
 
   it "warns if has :value but no :read_length" do
     obj = BinData::String.new(value: "ABC")
-    obj.must_warn "obj does not have a :read_length parameter - returning empty string" do
+    _ {
       obj.read("abcde")
-    end
+    }.must_warn "obj does not have a :read_length parameter - returning empty string"
   end
 end

data/test/stringz_test.rb

@@ -6,9 +6,9 @@ describe BinData::Stringz, "when empty" do
   let(:obj) { BinData::Stringz.new }
 
   it "initial state" do
-    obj.value.must_equal ""
-    obj.num_bytes.must_equal 1
-    obj.to_binary_s.must_equal_binary "\0"
+    _(obj.value).must_equal ""
+    _(obj.num_bytes).must_equal 1
+    _(obj.to_binary_s).must_equal_binary "\0"
   end
 end
 
@@ -16,9 +16,9 @@ describe BinData::Stringz, "with value set" do
   let(:obj) { BinData::Stringz.new("abcd") }
 
   it "initial state" do
-    obj.value.must_equal "abcd"
-    obj.num_bytes.must_equal 5
-    obj.to_binary_s.must_equal_binary "abcd\0"
+    _(obj.value).must_equal "abcd"
+    _(obj.num_bytes).must_equal 5
+    _(obj.to_binary_s).must_equal_binary "abcd\0"
   end
 end
 
@@ -28,19 +28,19 @@ describe BinData::Stringz, "when reading" do
   it "stops at the first zero byte" do
     io = StringIO.new("abcd\0xyz\0")
     obj.read(io)
-    io.pos.must_equal 5
-    obj.must_equal "abcd"
+    _(io.pos).must_equal 5
+    _(obj).must_equal "abcd"
   end
 
   it "handles a zero length string" do
     io = StringIO.new("\0abcd")
     obj.read(io)
-    io.pos.must_equal 1
-    obj.must_equal ""
+    _(io.pos).must_equal 1
+    _(obj).must_equal ""
   end
 
   it "fails if no zero byte is found" do
-    lambda {obj.read("abcd") }.must_raise EOFError
+    _ {obj.read("abcd") }.must_raise EOFError
   end
 end
 
@@ -49,79 +49,87 @@ describe BinData::Stringz, "when setting the value" do
 
   it "includes the zero byte in num_bytes total" do
     obj.assign("abcd")
-    obj.num_bytes.must_equal 5
+    _(obj.num_bytes).must_equal 5
   end
 
   it "accepts empty strings" do
     obj.assign("")
-    obj.must_equal ""
+    _(obj).must_equal ""
   end
 
   it "accepts strings that aren't zero terminated" do
     obj.assign("abcd")
-    obj.must_equal "abcd"
+    _(obj).must_equal "abcd"
   end
 
   it "accepts strings that are zero terminated" do
     obj.assign("abcd\0")
-    obj.must_equal "abcd"
+    _(obj).must_equal "abcd"
   end
 
   it "accepts up to the first zero byte" do
     obj.assign("abcd\0xyz\0")
-    obj.must_equal "abcd"
+    _(obj).must_equal "abcd"
   end
 end
 
 describe BinData::Stringz, "with max_length" do
   let(:obj) { BinData::Stringz.new(max_length: 5) }
 
+  it "fails if max_length is less that 1" do
+    obj = BinData::Stringz.new(max_length: 0)
+
+    _{ obj.read "abc\0" }.must_raise ArgumentError
+    _{ obj.to_binary_s }.must_raise ArgumentError
+    _{ obj.num_bytes }.must_raise ArgumentError
+  end
+
   it "reads less than max_length" do
     io = StringIO.new("abc\0xyz")
     obj.read(io)
-    obj.must_equal "abc"
+    _(obj).must_equal "abc"
   end
 
   it "reads exactly max_length" do
     io = StringIO.new("abcd\0xyz")
     obj.read(io)
-    obj.must_equal "abcd"
+    _(obj).must_equal "abcd"
   end
 
   it "reads no more than max_length" do
     io = StringIO.new("abcdefg\0xyz")
     obj.read(io)
-    io.pos.must_equal 5
-    obj.must_equal "abcd"
+    _(io.pos).must_equal 5
+    _(obj).must_equal "abcd"
   end
 
   it "accepts values less than max_length" do
     obj.assign("abc")
-    obj.must_equal "abc"
+    _(obj).must_equal "abc"
   end
 
   it "accepts values exactly max_length" do
     obj.assign("abcd")
-    obj.must_equal "abcd"
+    _(obj).must_equal "abcd"
   end
 
   it "trims values greater than max_length" do
     obj.assign("abcdefg")
-    obj.must_equal "abcd"
+    _(obj).must_equal "abcd"
   end
 
   it "writes values greater than max_length" do
     obj.assign("abcdefg")
-    obj.to_binary_s.must_equal_binary "abcd\0"
+    _(obj.to_binary_s).must_equal_binary "abcd\0"
   end
 
   it "writes values less than max_length" do
     obj.assign("abc")
-    obj.to_binary_s.must_equal_binary "abc\0"
+    _(obj.to_binary_s).must_equal_binary "abc\0"
   end
 
   it "writes values exactly max_length" do
     obj.assign("abcd")
-    obj.to_binary_s.must_equal_binary "abcd\0"
+    _(obj.to_binary_s).must_equal_binary "abcd\0"
   end
 end