ffi 1.0.10 → 1.0.11

data/spec/ffi/callback_spec.rb

@@ -29,7 +29,7 @@ describe "Callback" do
 #    cmp = proc do |p1, p2| args.push(p1.get_int(0)); args.push(p2.get_int(0)); 0; end
 #    # this is a bit dodgey, as it relies on qsort passing the args in order
 #    LibC.qsort(p, 2, 4, cmp)
-#    args.should == [ 1, 2 ]
+#    args.should eq [ 1, 2 ]
 #  end
 #
 #  it "Block can be substituted for Callback as last argument" do
@@ -42,7 +42,7 @@ describe "Callback" do
 #      args.push(p2.get_int(0))
 #      0
 #    end
-#    args.should == [ 1, 2 ]
+#    args.should eq [ 1, 2 ]
 #  end
   module LibTest
     extend FFI::Library
@@ -87,7 +87,6 @@ describe "Callback" do
     attach_function :testCallbackVrU64, :testClosureVrLL, [ :cbVrU64 ], :ulong_long
     attach_function :testCallbackVrP, :testClosureVrP, [ :cbVrP ], :pointer
     attach_function :testCallbackVrY, :testClosureVrP, [ :cbVrY ], S8F32S32.ptr
-    attach_function :testCallbackCrV, :testClosureBrV, [ :cbCrV, :char ], :void
     attach_function :testCallbackVrT, :testClosureVrT, [ :cbVrT ], S8F32S32.by_value
     attach_function :testCallbackTrV, :testClosureTrV, [ :cbTrV, S8F32S32.ptr ], :void
     attach_variable :cbVrS8, :gvar_pointer, :cbVrS8
@@ -96,142 +95,139 @@ describe "Callback" do
     attach_function :testOptionalCallbackCrV, :testOptionalClosureBrV, [ :cbCrV, :char ], :void
 
   end
-  it "function with Callback plus another arg should raise error if no arg given" do
-    lambda { LibTest.testCallbackCrV { |*a| }}.should raise_error
-  end
   it "returning :char (0)" do
-    LibTest.testCallbackVrS8 { 0 }.should == 0
+    LibTest.testCallbackVrS8 { 0 }.should eq 0
   end
   it "returning :char (127)" do
-    LibTest.testCallbackVrS8 { 127 }.should == 127
+    LibTest.testCallbackVrS8 { 127 }.should eq 127
   end
   it "returning :char (-128)" do
-    LibTest.testCallbackVrS8 { -128 }.should == -128
+    LibTest.testCallbackVrS8 { -128 }.should eq(-128)
   end
   # test wrap around
   it "returning :char (128)" do
-    LibTest.testCallbackVrS8 { 128 }.should == -128
+    LibTest.testCallbackVrS8 { 128 }.should eq(-128)
   end
   it "returning :char (255)" do
-    LibTest.testCallbackVrS8 { 0xff }.should == -1
+    LibTest.testCallbackVrS8 { 0xff }.should eq(-1)
   end
   it "returning :uchar (0)" do
-    LibTest.testCallbackVrU8 { 0 }.should == 0
+    LibTest.testCallbackVrU8 { 0 }.should eq 0
   end
   it "returning :uchar (0xff)" do
-    LibTest.testCallbackVrU8 { 0xff }.should == 0xff
+    LibTest.testCallbackVrU8 { 0xff }.should eq 0xff
   end
   it "returning :uchar (-1)" do
-    LibTest.testCallbackVrU8 { -1 }.should == 0xff
+    LibTest.testCallbackVrU8 { -1 }.should eq 0xff
   end
   it "returning :uchar (128)" do
-    LibTest.testCallbackVrU8 { 128 }.should == 128
+    LibTest.testCallbackVrU8 { 128 }.should eq 128
   end
   it "returning :uchar (-128)" do
-    LibTest.testCallbackVrU8 { -128 }.should == 128
+    LibTest.testCallbackVrU8 { -128 }.should eq 128
   end
   it "returning :short (0)" do
-    LibTest.testCallbackVrS16 { 0 }.should == 0
+    LibTest.testCallbackVrS16 { 0 }.should eq 0
   end
   it "returning :short (0x7fff)" do
-    LibTest.testCallbackVrS16 { 0x7fff }.should == 0x7fff
+    LibTest.testCallbackVrS16 { 0x7fff }.should eq 0x7fff
   end
   # test wrap around
   it "returning :short (0x8000)" do
-    LibTest.testCallbackVrS16 { 0x8000 }.should == -0x8000
+    LibTest.testCallbackVrS16 { 0x8000 }.should eq(-0x8000)
   end
   it "returning :short (0xffff)" do
-    LibTest.testCallbackVrS16 { 0xffff }.should == -1
+    LibTest.testCallbackVrS16 { 0xffff }.should eq(-1)
   end
   it "returning :ushort (0)" do
-    LibTest.testCallbackVrU16 { 0 }.should == 0
+    LibTest.testCallbackVrU16 { 0 }.should eq 0
   end
   it "returning :ushort (0x7fff)" do
-    LibTest.testCallbackVrU16 { 0x7fff }.should == 0x7fff
+    LibTest.testCallbackVrU16 { 0x7fff }.should eq 0x7fff
   end
   it "returning :ushort (0x8000)" do
-    LibTest.testCallbackVrU16 { 0x8000 }.should == 0x8000
+    LibTest.testCallbackVrU16 { 0x8000 }.should eq 0x8000
   end
   it "returning :ushort (0xffff)" do
-    LibTest.testCallbackVrU16 { 0xffff }.should == 0xffff
+    LibTest.testCallbackVrU16 { 0xffff }.should eq 0xffff
   end
   it "returning :ushort (-1)" do
-    LibTest.testCallbackVrU16 { -1 }.should == 0xffff
+    LibTest.testCallbackVrU16 { -1 }.should eq 0xffff
   end
   it "returning :int (0)" do
-    LibTest.testCallbackVrS32 { 0 }.should == 0
+    LibTest.testCallbackVrS32 { 0 }.should eq 0
   end
   it "returning :int (0x7fffffff)" do
-    LibTest.testCallbackVrS32 { 0x7fffffff }.should == 0x7fffffff
+    LibTest.testCallbackVrS32 { 0x7fffffff }.should eq 0x7fffffff
   end
   # test wrap around
   it "returning :int (-0x80000000)" do
-    LibTest.testCallbackVrS32 { -0x80000000 }.should == -0x80000000
+    LibTest.testCallbackVrS32 { -0x80000000 }.should eq(-0x80000000)
   end
   it "returning :int (-1)" do
-    LibTest.testCallbackVrS32 { -1 }.should == -1
+    LibTest.testCallbackVrS32 { -1 }.should eq(-1)
   end
   it "returning :uint (0)" do
-    LibTest.testCallbackVrU32 { 0 }.should == 0
+    LibTest.testCallbackVrU32 { 0 }.should eq 0
   end
   it "returning :uint (0x7fffffff)" do
-    LibTest.testCallbackVrU32 { 0x7fffffff }.should == 0x7fffffff
+    LibTest.testCallbackVrU32 { 0x7fffffff }.should eq 0x7fffffff
   end
   # test wrap around
   it "returning :uint (0x80000000)" do
-    LibTest.testCallbackVrU32 { 0x80000000 }.should == 0x80000000
+    LibTest.testCallbackVrU32 { 0x80000000 }.should eq 0x80000000
   end
   it "returning :uint (0xffffffff)" do
-    LibTest.testCallbackVrU32 { 0xffffffff }.should == 0xffffffff
+    LibTest.testCallbackVrU32 { 0xffffffff }.should eq 0xffffffff
   end
   it "returning :uint (-1)" do
-    LibTest.testCallbackVrU32 { -1 }.should == 0xffffffff
+    LibTest.testCallbackVrU32 { -1 }.should eq 0xffffffff
   end
   it "returning :long (0)" do
-    LibTest.testCallbackVrL { 0 }.should == 0
+    LibTest.testCallbackVrL { 0 }.should eq 0
   end
   it "returning :long (0x7fffffff)" do
-    LibTest.testCallbackVrL { 0x7fffffff }.should == 0x7fffffff
+    LibTest.testCallbackVrL { 0x7fffffff }.should eq 0x7fffffff
   end
   # test wrap around
   it "returning :long (-0x80000000)" do
-    LibTest.testCallbackVrL { -0x80000000 }.should == -0x80000000
+    LibTest.testCallbackVrL { -0x80000000 }.should eq(-0x80000000)
   end
   it "returning :long (-1)" do
-    LibTest.testCallbackVrL { -1 }.should == -1
+    LibTest.testCallbackVrL { -1 }.should eq(-1)
   end
   it "returning :ulong (0)" do
-    LibTest.testCallbackVrUL { 0 }.should == 0
+    LibTest.testCallbackVrUL { 0 }.should eq 0
   end
   it "returning :ulong (0x7fffffff)" do
-    LibTest.testCallbackVrUL { 0x7fffffff }.should == 0x7fffffff
+    LibTest.testCallbackVrUL { 0x7fffffff }.should eq 0x7fffffff
   end
   # test wrap around
   it "returning :ulong (0x80000000)" do
-    LibTest.testCallbackVrUL { 0x80000000 }.should == 0x80000000
+    LibTest.testCallbackVrUL { 0x80000000 }.should eq 0x80000000
   end
   it "returning :ulong (0xffffffff)" do
-    LibTest.testCallbackVrUL { 0xffffffff }.should == 0xffffffff
+    LibTest.testCallbackVrUL { 0xffffffff }.should eq 0xffffffff
   end
   it "Callback returning :ulong (-1)" do
     if FFI::Platform::LONG_SIZE == 32
-      LibTest.testCallbackVrUL { -1 }.should == 0xffffffff
+      LibTest.testCallbackVrUL { -1 }.should eq 0xffffffff
     else
-      LibTest.testCallbackVrUL { -1 }.should == 0xffffffffffffffff
+      LibTest.testCallbackVrUL { -1 }.should eq 0xffffffffffffffff
     end
   end
   it "returning :long_long (0)" do
-    LibTest.testCallbackVrS64 { 0 }.should == 0
+    LibTest.testCallbackVrS64 { 0 }.should eq 0
   end
   it "returning :long_long (0x7fffffffffffffff)" do
-    LibTest.testCallbackVrS64 { 0x7fffffffffffffff }.should == 0x7fffffffffffffff
+    LibTest.testCallbackVrS64 { 0x7fffffffffffffff }.should eq 0x7fffffffffffffff
   end
   # test wrap around
   it "returning :long_long (-0x8000000000000000)" do
-    LibTest.testCallbackVrS64 { -0x8000000000000000 }.should == -0x8000000000000000
+    LibTest.testCallbackVrS64 { -0x8000000000000000 }.should eq(-0x8000000000000000)
   end
   it "returning :long_long (-1)" do
-    LibTest.testCallbackVrS64 { -1 }.should == -1
+    LibTest.testCallbackVrS64 { -1 }.should eq(-1)
   end
   it "returning bool" do
     LibTest.testCallbackVrZ { true }.should be_true
@@ -241,7 +237,7 @@ describe "Callback" do
   end
   it "returning :pointer (MemoryPointer)" do
     p = FFI::MemoryPointer.new :long
-    LibTest.testCallbackVrP { p }.should == p
+    LibTest.testCallbackVrP { p }.should eq p
   end
 
 
@@ -251,9 +247,9 @@ describe "Callback" do
     s[:s32] = 0x1eefbeef
     s[:f32] = 1.234567
     ret = LibTest.testCallbackVrT { s }
-    ret[:s8].should == s[:s8]
-    ret[:f32].should == s[:f32]
-    ret[:s32].should == s[:s32]
+    ret[:s8].should eq s[:s8]
+    ret[:f32].should eq s[:f32]
+    ret[:s32].should eq s[:s32]
 
   end
 
@@ -274,7 +270,7 @@ describe "Callback" do
   it "global variable" do
     proc = Proc.new { 0x1e }
     LibTest.cbVrS8 = proc
-    LibTest.testGVarCallbackVrS8(LibTest.pVrS8).should == 0x1e
+    LibTest.testGVarCallbackVrS8(LibTest.pVrS8).should eq 0x1e
   end
 
   describe "When the callback is considered optional by the underlying library" do
@@ -288,9 +284,9 @@ describe "Callback" do
       module LibTest
         extend FFI::Library
         ffi_lib TestLibrary::PATH
-        attach_function :testCallbackVrS8, :testClosureVrB, [ callback([ ], :char) ], :char
+        attach_function :testAnonymousCallbackVrS8, :testClosureVrB, [ callback([ ], :char) ], :char
       end
-      LibTest.testCallbackVrS8 { 0 }.should == 0
+      LibTest.testAnonymousCallbackVrS8 { 0 }.should eq 0
     end
   end
 
@@ -328,7 +324,7 @@ describe "Callback" do
       end
 
       val = LibTest.testReturnsCallback(lookup_proc, 0x1234)
-      val.should == 0x1234 * 2
+      val.should eq 0x1234 * 2
       lookup_proc_called.should be_true
       return_proc_called.should be_true
     end
@@ -339,7 +335,7 @@ describe "Callback" do
         ffi_lib TestLibrary::PATH
         callback :cb_return_type, [ :int ], :int
         callback :cb_lookup, [ ], :cb_return_type
-        attach_function :testReturnsCallback, :testReturnsClosure, [ :cb_lookup, :int ], :int
+        attach_function :testReturnsCallback_2, :testReturnsClosure, [ :cb_lookup, :int ], :int
       end
       module MethodCallback
         def self.lookup
@@ -350,7 +346,7 @@ describe "Callback" do
         end
       end
 
-      LibTest.testReturnsCallback(MethodCallback.method(:lookup), 0x1234).should == 0x2468
+      LibTest.testReturnsCallback_2(MethodCallback.method(:lookup), 0x1234).should eq 0x2468
     end
 
     it 'should not blow up when a callback takes a callback as argument' do
@@ -359,7 +355,7 @@ describe "Callback" do
         ffi_lib TestLibrary::PATH
         callback :cb_argument, [ :int ], :int
         callback :cb_with_cb_argument, [ :cb_argument, :int ], :int
-        attach_function :testCallbackAsArgument, :testArgumentClosure, [ :cb_with_cb_argument, :int ], :int
+        attach_function :testCallbackAsArgument_2, :testArgumentClosure, [ :cb_with_cb_argument, :int ], :int
       end   
     end
     it 'should be able to use the callback argument' do
@@ -381,7 +377,7 @@ describe "Callback" do
         cb.call(val)
       end
       val = LibTest.testCallbackAsArgument(callback_with_callback_arg, callback_arg, 0xff1)
-      val.should == 0xff1 * 2
+      val.should eq 0xff1 * 2
       callback_arg_called.should be_true
       callback_with_callback_arg_called.should be_true         
     end
@@ -393,7 +389,7 @@ describe "Callback" do
         attach_function :testReturnsFunctionPointer, [  ], :funcptr
       end
       f = LibTest.testReturnsFunctionPointer
-      f.call(3).should == 6
+      f.call(3).should eq 6
     end
   end
 
@@ -444,86 +440,89 @@ describe "Callback with " do
     attach_function :testCallbackPrV, :testClosurePrV, [ :cbPrV, :pointer], :void
     attach_function :testCallbackYrV, :testClosurePrV, [ :cbYrV, S8F32S32.in ], :void
   end
+  it "function with Callback plus another arg should raise error if no arg given" do
+    lambda { LibTest.testCallbackCrV { |*a| }}.should raise_error
+  end
   it ":char (0) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackCrV(0) { |i| v = i }
-    v.should == 0
+    v.should eq 0
   end
   it ":char (127) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackCrV(127) { |i| v = i }
-    v.should == 127
+    v.should eq 127
   end
   it ":char (-128) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackCrV(-128) { |i| v = i }
-    v.should == -128
+    v.should eq(-128)
   end
   it ":char (-1) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackCrV(-1) { |i| v = i }
-    v.should == -1
+    v.should eq(-1)
   end
   it ":uchar (0) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU8rV(0) { |i| v = i }
-    v.should == 0
+    v.should eq 0
   end
   it ":uchar (127) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU8rV(127) { |i| v = i }
-    v.should == 127
+    v.should eq 127
   end
   it ":uchar (128) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU8rV(128) { |i| v = i }
-    v.should == 128
+    v.should eq 128
   end
   it ":uchar (255) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU8rV(255) { |i| v = i }
-    v.should == 255
+    v.should eq 255
   end
 
   it ":short (0) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackSrV(0) { |i| v = i }
-    v.should == 0
+    v.should eq 0
   end
   it ":short (0x7fff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackSrV(0x7fff) { |i| v = i }
-    v.should == 0x7fff
+    v.should eq 0x7fff
   end
   it ":short (-0x8000) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackSrV(-0x8000) { |i| v = i }
-    v.should == -0x8000
+    v.should eq(-0x8000)
   end
   it ":short (-1) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackSrV(-1) { |i| v = i }
-    v.should == -1
+    v.should eq(-1)
   end
   it ":ushort (0) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU16rV(0) { |i| v = i }
-    v.should == 0
+    v.should eq 0
   end
   it ":ushort (0x7fff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU16rV(0x7fff) { |i| v = i }
-    v.should == 0x7fff
+    v.should eq 0x7fff
   end
   it ":ushort (0x8000) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU16rV(0x8000) { |i| v = i }
-    v.should == 0x8000
+    v.should eq 0x8000
   end
   it ":ushort (0xffff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU16rV(0xffff) { |i| v = i }
-    v.should == 0xffff
+    v.should eq 0xffff
   end
   it ":bool (true) argument" do
     v = false
@@ -533,107 +532,107 @@ describe "Callback with " do
   it ":int (0) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackIrV(0) { |i| v = i }
-    v.should == 0
+    v.should eq 0
   end
   it ":int (0x7fffffff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackIrV(0x7fffffff) { |i| v = i }
-    v.should == 0x7fffffff
+    v.should eq 0x7fffffff
   end
   it ":int (-0x80000000) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackIrV(-0x80000000) { |i| v = i }
-    v.should == -0x80000000
+    v.should eq(-0x80000000)
   end
   it ":int (-1) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackIrV(-1) { |i| v = i }
-    v.should == -1
+    v.should eq(-1)
   end
   it ":uint (0) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU32rV(0) { |i| v = i }
-    v.should == 0
+    v.should eq 0
   end
   it ":uint (0x7fffffff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU32rV(0x7fffffff) { |i| v = i }
-    v.should == 0x7fffffff
+    v.should eq 0x7fffffff
   end
   it ":uint (0x80000000) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU32rV(0x80000000) { |i| v = i }
-    v.should == 0x80000000
+    v.should eq 0x80000000
   end
   it ":uint (0xffffffff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackU32rV(0xffffffff) { |i| v = i }
-    v.should == 0xffffffff
+    v.should eq 0xffffffff
   end
   it ":long (0) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackLrV(0) { |i| v = i }
-    v.should == 0
+    v.should eq 0
   end
   it ":long (0x7fffffff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackLrV(0x7fffffff) { |i| v = i }
-    v.should == 0x7fffffff
+    v.should eq 0x7fffffff
   end
   it ":long (-0x80000000) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackLrV(-0x80000000) { |i| v = i }
-    v.should == -0x80000000
+    v.should eq(-0x80000000)
   end
   it ":long (-1) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackLrV(-1) { |i| v = i }
-    v.should == -1
+    v.should eq(-1)
   end
   it ":ulong (0) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackULrV(0) { |i| v = i }
-    v.should == 0
+    v.should eq 0
   end
   it ":ulong (0x7fffffff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackULrV(0x7fffffff) { |i| v = i }
-    v.should == 0x7fffffff
+    v.should eq 0x7fffffff
   end
   it ":ulong (0x80000000) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackULrV(0x80000000) { |i| v = i }
-    v.should == 0x80000000
+    v.should eq 0x80000000
   end
   it ":ulong (0xffffffff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackULrV(0xffffffff) { |i| v = i }
-    v.should == 0xffffffff
+    v.should eq 0xffffffff
   end
   it ":long_long (0) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackLLrV(0) { |i| v = i }
-    v.should == 0
+    v.should eq 0
   end
   it ":long_long (0x7fffffffffffffff) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackLLrV(0x7fffffffffffffff) { |i| v = i }
-    v.should == 0x7fffffffffffffff
+    v.should eq 0x7fffffffffffffff
   end
   it ":long_long (-0x8000000000000000) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackLLrV(-0x8000000000000000) { |i| v = i }
-    v.should == -0x8000000000000000
+    v.should eq(-0x8000000000000000)
   end
   it ":long_long (-1) argument" do
     v = 0xdeadbeef
     LibTest.testCallbackLLrV(-1) { |i| v = i }
-    v.should == -1
+    v.should eq(-1)
   end
   it ":string argument" do
     v = nil
     LibTest.testCallbackArV("Hello, World") { |i| v = i }
-    v.should == "Hello, World"
+    v.should eq "Hello, World"
   end
   it ":string (nil) argument" do
     v = "Hello, World"
@@ -644,18 +643,18 @@ describe "Callback with " do
     v = nil
     magic = FFI::Pointer.new(0xdeadbeef)
     LibTest.testCallbackPrV(magic) { |i| v = i }
-    v.should == magic
+    v.should eq magic
   end
   it ":pointer (nil) argument" do
     v = "Hello, World"
     LibTest.testCallbackPrV(nil) { |i| v = i }
-    v.should == FFI::Pointer::NULL
+    v.should eq FFI::Pointer::NULL
   end
   it "struct by reference argument" do
     v = nil
     magic = LibTest::S8F32S32.new
     LibTest.testCallbackYrV(magic) { |i| v = i }
-    v.class.should == magic.class
+    v.class.should eq magic.class
     v.pointer == magic.pointer
   end
 
@@ -663,7 +662,7 @@ describe "Callback with " do
     v = LibTest::S8F32S32.new
     LibTest.testCallbackYrV(nil) { |i| v = i }
     v.is_a?(FFI::Struct).should be_true
-    v.pointer.should == FFI::Pointer::NULL
+    v.pointer.should eq FFI::Pointer::NULL
   end
 
 end # unless true