bindata 2.1.0 → 2.2.0

data/test/alignment_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), "common"))
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 describe BinData::ResumeByteAlignment do
   class ResumeAlignmentRecord < BinData::Record
@@ -21,7 +21,7 @@ describe BinData::ResumeByteAlignment do
   it "resets write alignment" do
     obj.assign(:a => 2, :b => 7)
 
-    obj.to_binary_s.must_equal "\x20\x70"
+    obj.to_binary_s.must_equal_binary "\x20\x70"
   end
 end
 
@@ -57,6 +57,6 @@ describe BinData::BitAligned do
 
   it "writes as expected" do
     obj.assign(:preamble => 5, :str => "ab", :afterward => 1)
-    obj.to_binary_s.must_equal "\x56\x16\x21"
+    obj.to_binary_s.must_equal_binary "\x56\x16\x21"
   end
 end

data/test/array_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), "common"))
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 describe BinData::Array, "when instantiating" do
   describe "with no mandatory parameters supplied" do
@@ -35,7 +35,7 @@ describe BinData::Array, "when instantiating" do
 end
 
 describe BinData::Array, "with no elements" do
-  let(:obj) { BinData::Array.new(:type => :example_single) }
+  let(:obj) { BinData::Array.new(:type => :uint32le) }
 
   it "initial state" do
     assert obj.clear?
@@ -56,7 +56,7 @@ end
 
 describe BinData::Array, "with several elements" do
   let(:obj) {
-    type = [:example_single, {:initial_value => lambda { index + 1 }}]
+    type = [:uint32le, {:initial_value => lambda { index + 1 }}]
     BinData::Array.new(:type => type, :initial_length => 5)
   }
 
@@ -83,12 +83,12 @@ describe BinData::Array, "with several elements" do
   end
 
   it "assigns bindata objects" do
-    obj.assign([ExampleSingle.new(4), ExampleSingle.new(5), ExampleSingle.new(6)])
+    obj.assign([BinData::Uint32le.new(4), BinData::Uint32le.new(5), BinData::Uint32le.new(6)])
     obj.must_equal [4, 5, 6]
   end
 
   it "assigns a bindata array" do
-    array = BinData::Array.new([4, 5, 6], :type => :example_single)
+    array = BinData::Array.new([4, 5, 6], :type => :uint32le)
     obj.assign(array)
     obj.must_equal [4, 5, 6]
   end
@@ -168,21 +168,21 @@ describe BinData::Array, "with several elements" do
   end
 
   it "has correct offset" do
-    obj[2].rel_offset.must_equal ExampleSingle.new.num_bytes * 2
+    obj[2].rel_offset.must_equal 2 * 4
   end
 
   it "has correct num_bytes" do
-    obj.num_bytes.must_equal 5 * ExampleSingle.new.num_bytes
+    obj.num_bytes.must_equal 5 * 4
   end
 
   it "has correct num_bytes for individual elements" do
-    obj[0].num_bytes.must_equal ExampleSingle.new.num_bytes
+    obj[0].num_bytes.must_equal 4
   end
 end
 
 describe BinData::Array, "when accessing elements" do
   let(:obj) {
-    type = [:example_single, {:initial_value => lambda { index + 1 }}]
+    type = [:uint32le, {:initial_value => lambda { index + 1 }}]
     data = BinData::Array.new(:type => type, :initial_length => 5)
     data.assign([1, 2, 3, 4, 5])
     data
@@ -327,7 +327,7 @@ describe BinData::Array, "subclassed" do
 
   it "overrides default parameters" do
     obj = IntArray.new(:initial_length => 3, :initial_element_value => 5)
-    obj.to_binary_s.must_equal "\x00\x05\x00\x05\x00\x05"
+    obj.to_binary_s.must_equal_binary "\x00\x05\x00\x05\x00\x05"
   end
 end
 
@@ -356,7 +356,7 @@ describe BinData::Array, "of bits" do
 
   it "writes" do
     obj[3] = 1
-    obj.to_binary_s.must_equal [0b0001_0000, 0b0000_0000].pack("CC")
+    obj.to_binary_s.must_equal_binary [0b0001_0000, 0b0000_0000].pack("CC")
   end
 
   it "returns num_bytes" do

data/test/base_primitive_test.rb

@@ -1,6 +1,26 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), "common"))
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
+
+class ExampleSingle < BinData::BasePrimitive
+  def self.io_with_value(val)
+    StringIO.new([val].pack("V"))
+  end
+
+  private
+
+  def value_to_binary_string(val)
+    [val].pack("V")
+  end
+
+  def read_and_return_value(io)
+    io.readbytes(4).unpack("V").at(0)
+  end
+
+  def sensible_default
+    0
+  end
+end
 
 describe BinData::BasePrimitive do
   it "is not registered" do

data/test/base_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), "common"))
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 describe "BinData::Base", "framework" do
   class FrameworkBase < BinData::Base
@@ -108,6 +108,12 @@ describe BinData::Base do
     obj.write("").must_equal obj
   end
 
+  it "#to_hex uses #to_binary_s representation" do
+    obj.stub :to_binary_s, "\x01\xab\xCD" do
+      obj.to_hex.must_equal "01abcd"
+    end
+  end
+
   it "#inspect is forwarded to snapshot" do
     obj.stub :snapshot, [1, 2, 3] do
       obj.inspect.must_equal obj.snapshot.inspect

data/test/bits_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), "common"))
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 module AllBitfields
 

data/test/buffer_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), "common"))
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 describe BinData::Buffer, "when instantiating" do
   describe "with no mandatory parameters supplied" do
@@ -49,7 +49,7 @@ describe BinData::Buffer, "subclassed with a single type" do
 
   it "writes data" do
     obj = IntBuffer.new(3)
-    obj.to_binary_s.must_equal "\000\003\000\000\000"
+    obj.to_binary_s.must_equal_binary "\000\003\000\000\000"
   end
 
   it "has total num_bytes" do
@@ -86,7 +86,7 @@ describe BinData::Buffer, "subclassed with multiple types" do
 
   it "writes data" do
     obj = TupleBuffer.new(:a => 1, :b => 2)
-    obj.to_binary_s.must_equal "\000\001\000\002\000"
+    obj.to_binary_s.must_equal_binary "\000\001\000\002\000"
   end
 end
 
@@ -98,7 +98,7 @@ describe BinData::Buffer, "inside a Record" do
     buffer :list, :length => :buffer_length do
       array :type => :int16, :read_until => :eof
     end
-    string :footer, :length => 2, :asserted_value => "ZZ"
+    string :footer, :read_length => 2, :asserted_value => "ZZ"
   end
 
   it "reads" do
@@ -108,7 +108,7 @@ describe BinData::Buffer, "inside a Record" do
 
   it "writes" do
     obj = BufferRecord.new(:list => [1, 2, 3, 4, 5])
-    obj.to_binary_s.must_equal "\013\000\001\000\002\000\003\000\004\000\005\000\000ZZ"
+    obj.to_binary_s.must_equal_binary "\013\000\001\000\002\000\003\000\004\000\005\000\000ZZ"
   end
 end
 
@@ -138,7 +138,7 @@ describe BinData::Buffer, "nested buffers" do
     obj.a.bb = "ABCDEFGHIJ"
     obj.b = "12345"
 
-    obj.to_binary_s.must_equal "abcdeABCDE12345"
+    obj.to_binary_s.must_equal_binary "abcdeABCDE12345"
   end
 end
 

data/test/choice_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), "common"))
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 class Chooser
   attr_accessor :choice
@@ -46,12 +46,12 @@ describe BinData::Choice, "when instantiating" do
   end
 
   it "fails when :choices Hash has a symbol as key" do
-    args = {:choices => {:a => :example_single}, :selection => 0}
+    args = {:choices => {:a => :uint8}, :selection => 0}
     lambda { BinData::Choice.new(args) }.must_raise ArgumentError
   end
 
   it "fails when :choices Hash has a nil key" do
-    args = {:choices => {nil => :example_single}, :selection => 0}
+    args = {:choices => {nil => :uint8}, :selection => 0}
     lambda { BinData::Choice.new(args) }.must_raise ArgumentError
   end
 end
@@ -103,7 +103,7 @@ module ChoiceInitializedWithArrayOrHash
 
   def test_delegates_methods_to_the_selected_single_choice
     obj.choice = 5
-    obj.num_bytes.must_equal ExampleSingle.new.num_bytes
+    obj.num_bytes.must_equal 1
   end
 end
 
@@ -112,9 +112,9 @@ describe BinData::Choice, "with sparse choices array" do
 
   let(:obj) {
     choices = [nil, nil, nil,
-               [:example_single, {:value => 30}], nil,
-               [:example_single, {:value => 50}], nil,
-               [:example_single, {:value => 70}]]
+               [:uint8, {:value => 30}], nil,
+               [:uint8, {:value => 50}], nil,
+               [:uint8, {:value => 70}]]
     create_choice(choices)
   }
 end
@@ -123,19 +123,16 @@ describe BinData::Choice, "with choices hash" do
   include ChoiceInitializedWithArrayOrHash
 
   let(:obj) {
-    choices = {3 => [:example_single, {:value => 30}],
-               5 => [:example_single, {:value => 50}],
-               7 => [:example_single, {:value => 70}]}
+    choices = {3 => [:uint8, {:value => 30}],
+               5 => [:uint8, {:value => 50}],
+               7 => [:uint8, {:value => 70}]}
     create_choice(choices)
   }
 end
 
 describe BinData::Choice, "with single values" do
   let(:obj) {
-    choices = {3 => :example_single,
-               5 => :example_single,
-               7 => :example_single}
-    create_choice(choices)
+    create_choice({3 => :uint8, 5 => :uint8, 7 => :uint8})
   }
 
   it "assigns raw values" do
@@ -144,8 +141,8 @@ describe BinData::Choice, "with single values" do
     obj.must_equal 254
   end
 
-  it "assigns Single values" do
-    data = ExampleSingle.new(11)
+  it "assigns BinData values" do
+    data = BinData::Uint8.new(11)
 
     obj.choice = 3
     obj.assign(data)
@@ -204,9 +201,7 @@ end
 
 describe BinData::Choice, "with copy_on_change => true" do
   let(:obj) {
-    choices = {3 => :example_single,
-               5 => :example_single,
-               7 => :example_single}
+    choices = {3 => :uint8, 5 => :uint8, 7 => :uint8}
     create_choice(choices, :copy_on_change => true)
   }
 

data/test/count_bytes_remaining_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), "common"))
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 describe BinData::CountBytesRemaining do
   let(:obj) { BinData::CountBytesRemaining.new }
@@ -23,13 +23,13 @@ describe BinData::CountBytesRemaining do
   end
 
   it "does not write any data" do
-    obj.to_binary_s.must_equal ""
+    obj.to_binary_s.must_equal_binary ""
   end
 
   it "allows setting value for completeness" do
     obj.assign("123")
     obj.must_equal "123"
-    obj.to_binary_s.must_equal ""
+    obj.to_binary_s.must_equal_binary ""
   end
 
   it "accepts BinData::BasePrimitive parameters" do

data/test/float_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), "common"))
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 module FloatTest
   def test_num_bytes
@@ -30,7 +30,7 @@ describe "A FloatLe" do
   end
 
   it "#to_binary_s" do
-    @obj.to_binary_s.must_equal [Math::PI].pack('e')
+    @obj.to_binary_s.must_equal_binary [Math::PI].pack('e')
   end
 end
 
@@ -42,7 +42,7 @@ describe "A FloatBe" do
   end
 
   it "#to_binary_s" do
-    @obj.to_binary_s.must_equal [Math::PI].pack('g')
+    @obj.to_binary_s.must_equal_binary [Math::PI].pack('g')
   end
 end
 
@@ -54,7 +54,7 @@ describe "A DoubleLe" do
   end
 
   it "#to_binary_s" do
-    @obj.to_binary_s.must_equal [Math::PI].pack('E')
+    @obj.to_binary_s.must_equal_binary [Math::PI].pack('E')
   end
 end
 
@@ -67,6 +67,6 @@ describe "A DoubleBe" do
   end
 
   it "#to_binary_s" do
-    @obj.to_binary_s.must_equal [Math::PI].pack('G')
+    @obj.to_binary_s.must_equal_binary [Math::PI].pack('G')
   end
 end

data/test/int_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), "common"))
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 module AllIntegers
 
@@ -82,7 +82,7 @@ module AllIntegers
       subject = int_class.new
       subject.assign(val)
 
-      subject.to_binary_s.must_equal int_to_binary_str(val)
+      subject.to_binary_s.must_equal_binary int_to_binary_str(val)
     end
   end
 
@@ -94,7 +94,7 @@ module AllIntegers
         subject = int_class.new
         subject.assign(val)
 
-        subject.to_binary_s.must_equal int_to_binary_str(val)
+        subject.to_binary_s.must_equal_binary int_to_binary_str(val)
       end
     end
   end
@@ -128,7 +128,7 @@ module AllIntegers
   end
 
   def int_to_binary_str(val)
-    str = binary("")
+    str = "".force_encoding(Encoding::BINARY)
     v = val & ((1 << (@nbytes * 8)) - 1)
     @nbytes.times do
       str.concat(v & 0xff)

data/test/io_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), "common"))
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 describe BinData::IO::Read, "reading from non seekable stream" do
   before do

data/test/lazy_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), "common"))
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 # A mock data object with customizable fields.
 class MockBinDataObject

data/test/offset_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), "common"))
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 describe BinData::Base, "offsets" do
   class ThreeByteReader < BinData::Base

data/test/params_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), "common"))
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 
 describe BinData::Base, "parameters" do

data/test/primitive_test.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.expand_path(File.join(File.dirname(__FILE__), "common"))
+require File.expand_path(File.join(File.dirname(__FILE__), "test_helper"))
 
 describe BinData::Primitive do
   it "is not registered" do
@@ -76,7 +76,7 @@ describe BinData::Primitive do
 
   it "produces binary string" do
     obj.assign(5)
-    obj.to_binary_s.must_equal "\x05\x00"
+    obj.to_binary_s.must_equal_binary "\x05\x00"
   end
 
   it "reads value" do
@@ -86,7 +86,7 @@ describe BinData::Primitive do
 
   it "accepts standard parameters" do
     obj = PrimitiveWithEndian.new(:initial_value => 2)
-    obj.to_binary_s.must_equal "\x02\x00"
+    obj.to_binary_s.must_equal_binary "\x02\x00"
   end
 
   it "returns num_bytes" do
@@ -180,12 +180,12 @@ describe BinData::Primitive, "subclassed with default parameter" do
 
   it "overrides initial_value" do
     a = ChildDerivedPrimitive.new(:initial_value => 7)
-    a.to_binary_s.must_equal "\000\007"
+    a.to_binary_s.must_equal_binary "\000\007"
   end
 
   it "uses default parameter" do
     a = ChildDerivedPrimitive.new
-    a.to_binary_s.must_equal "\000\005"
+    a.to_binary_s.must_equal_binary "\000\005"
   end
 end
 
@@ -205,6 +205,6 @@ describe BinData::Primitive, "with mutating #get and #set" do
   it "#to_binary_s applies mutator" do
     obj = MutatingPrimitive.new
     obj.assign(-50)
-    obj.to_binary_s.must_equal "\062\000"
+    obj.to_binary_s.must_equal_binary "\062\000"
   end
 end