ffi 1.2.1-x86-mingw32 → 1.3.0-x86-mingw32

data/spec/ffi/ffi_spec.rb

@@ -1,17 +1,6 @@
 #
 # This file is part of ruby-ffi.
-#
-# This code is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License version 3 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-# version 3 for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+# For licensing, see LICENSE.SPECS
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
@@ -24,15 +13,15 @@ describe "FFI" do
     let(:suffix) { FFI::Platform::LIBSUFFIX }
     
     it "should add platform library extension if not present" do
-      FFI.map_library_name("#{prefix}dummy").should eq "#{prefix}dummy.#{suffix}"
+      FFI.map_library_name("#{prefix}dummy").should == "#{prefix}dummy.#{suffix}"
     end
 
     it "should add platform library extension even if lib suffix is present in name" do
-      FFI.map_library_name("#{prefix}dummy_with_#{suffix}").should eq "#{prefix}dummy_with_#{suffix}.#{suffix}"
+      FFI.map_library_name("#{prefix}dummy_with_#{suffix}").should == "#{prefix}dummy_with_#{suffix}.#{suffix}"
     end
 
     it "should return Platform::LIBC when called with 'c'" do
-      FFI.map_library_name('c').should eq FFI::Library::LIBC
+      FFI.map_library_name('c').should == FFI::Library::LIBC
     end
 
   end

data/spec/ffi/function_spec.rb

@@ -1,17 +1,6 @@
 #
 # This file is part of ruby-ffi.
-#
-# This code is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License version 3 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-# version 3 for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+# For licensing, see LICENSE.SPECS
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
@@ -37,20 +26,20 @@ describe FFI::Function do
   end
   it 'can be used as callback from C passing to it a block' do
     function_add = FFI::Function.new(:int, [:int, :int]) { |a, b| a + b }
-    LibTest.testFunctionAdd(10, 10, function_add).should eq 20
+    LibTest.testFunctionAdd(10, 10, function_add).should == 20
   end
   it 'can be used as callback from C passing to it a Proc object' do
     function_add = FFI::Function.new(:int, [:int, :int], Proc.new { |a, b| a + b })
-    LibTest.testFunctionAdd(10, 10, function_add).should eq 20
+    LibTest.testFunctionAdd(10, 10, function_add).should == 20
   end
   it 'can be used to wrap an existing function pointer' do
-    FFI::Function.new(:int, [:int, :int], @libtest.find_function('testAdd')).call(10, 10).should eq 20
+    FFI::Function.new(:int, [:int, :int], @libtest.find_function('testAdd')).call(10, 10).should == 20
   end
   it 'can be attached to a module' do
     module Foo; end
     fp = FFI::Function.new(:int, [:int, :int], @libtest.find_function('testAdd'))
     fp.attach(Foo, 'add')
-    Foo.add(10, 10).should eq 20
+    Foo.add(10, 10).should == 20
   end
   it 'can be used to extend an object' do
     fp = FFI::Function.new(:int, [:int, :int], @libtest.find_function('testAdd'))
@@ -61,7 +50,7 @@ describe FFI::Function do
       end
     end
     fp.attach(foo.singleton_class, 'add')
-    foo.add(10, 10).should eq 20    
+    foo.add(10, 10).should == 20    
   end
   it 'can wrap a blocking function' do
     fp = FFI::Function.new(:void, [ :int ], @libtest.find_function('testBlocking'), :blocking => true)

data/spec/ffi/library_spec.rb

@@ -1,17 +1,6 @@
 #
 # This file is part of ruby-ffi.
-#
-# This code is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License version 3 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-# version 3 for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+# For licensing, see LICENSE.SPECS
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
@@ -21,7 +10,7 @@ describe "Library" do
       m = Module.new do
         extend FFI::Library
       end
-      m.ffi_convention.should eq :default
+      m.ffi_convention.should == :default
     end
 
     it "should be settable" do
@@ -29,12 +18,23 @@ describe "Library" do
         extend FFI::Library
       end
 
-      m.ffi_convention.should eq :default
+      m.ffi_convention.should == :default
       m.ffi_convention :stdcall
-      m.ffi_convention.should eq :stdcall
+      m.ffi_convention.should == :stdcall
     end
   end
 
+  describe "ffi_lib" do
+    it "empty name list should raise error" do
+      lambda {
+        Module.new do |m|
+          m.extend FFI::Library
+          ffi_lib
+        end
+      }.should raise_error(LoadError)
+    end
+    
+  end
   unless RbConfig::CONFIG['target_os'] =~ /mswin|mingw/
     it "attach_function with no library specified" do
       lambda {
@@ -50,7 +50,7 @@ describe "Library" do
           m.extend FFI::Library
           ffi_lib FFI::Library::CURRENT_PROCESS
           attach_function :getpid, [ ], :uint
-        end.getpid.should eq Process.pid
+        end.getpid.should == Process.pid
       }.should_not raise_error
     end
     it "attach_function :getpid from [ 'c', 'libc.so.6'] " do
@@ -59,7 +59,7 @@ describe "Library" do
           m.extend FFI::Library
           ffi_lib [ 'c', 'libc.so.6' ]
           attach_function :getpid, [ ], :uint
-        end.getpid.should eq Process.pid
+        end.getpid.should == Process.pid
       }.should_not raise_error
     end
     it "attach_function :getpid from [ 'libc.so.6', 'c' ] " do
@@ -68,7 +68,7 @@ describe "Library" do
           m.extend FFI::Library
           ffi_lib [ 'libc.so.6', 'c' ]
           attach_function :getpid, [ ], :uint
-        end.getpid.should eq Process.pid
+        end.getpid.should == Process.pid
       }.should_not raise_error
     end
     it "attach_function :getpid from [ 'libfubar.so.0xdeadbeef', nil, 'c' ] " do
@@ -77,7 +77,7 @@ describe "Library" do
           m.extend FFI::Library
           ffi_lib [ 'libfubar.so.0xdeadbeef', nil, 'c' ]
           attach_function :getpid, [ ], :uint
-        end.getpid.should eq Process.pid
+        end.getpid.should == Process.pid
       }.should_not raise_error
     end
     it "attach_function :getpid from [ 'libfubar.so.0xdeadbeef' ] " do
@@ -86,7 +86,7 @@ describe "Library" do
           m.extend FFI::Library
           ffi_lib 'libfubar.so.0xdeadbeef'
           attach_function :getpid, [ ], :uint
-        end.getpid.should eq Process.pid
+        end.getpid.should == Process.pid
       }.should raise_error(LoadError)
     end
   end
@@ -103,10 +103,10 @@ describe "Library" do
   def gvar_test(name, type, val)
     lib = gvar_lib(name, type)
     lib.set(val)
-    lib.gvar.should eq val
+    lib.gvar.should == val
     lib.set(0)
     lib.gvar = val
-    lib.get.should eq val
+    lib.get.should == val
   end
   [ 0, 127, -128, -1 ].each do |i|
     it ":char variable" do
@@ -175,10 +175,10 @@ describe "Library" do
     lib = gvar_lib("pointer", :pointer)
     val = FFI::MemoryPointer.new :long
     lib.set(val)
-    lib.gvar.should eq val
+    lib.gvar.should == val
     lib.set(nil)
     lib.gvar = val
-    lib.get.should eq val
+    lib.get.should == val
   end
 
   [ 0, 0x7fffffff, -0x80000000, -1 ].each do |i|
@@ -198,11 +198,11 @@ describe "Library" do
       val = GlobalStruct.new
       val[:data] = i
       lib.set(val)
-      lib.gvar[:data].should eq i
+      lib.gvar[:data].should == i
       val[:data] = 0
       lib.gvar[:data] = i
       val = GlobalStruct.new(lib.get)
-      val[:data].should eq i
+      val[:data].should == i
     end
   end
 end

data/spec/ffi/long_double.rb

@@ -1,17 +1,6 @@
 #
 # This file is part of ruby-ffi.
-#
-# This code is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License version 3 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-# version 3 for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+# For licensing, see LICENSE.SPECS
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))

data/spec/ffi/managed_struct_spec.rb

@@ -1,17 +1,6 @@
 #
 # This file is part of ruby-ffi.
-#
-# This code is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License version 3 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-# version 3 for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+# For licensing, see LICENSE.SPECS
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
@@ -36,7 +25,7 @@ describe "Managed Struct" do
       end
     end    
 
-    WhatClassAmI.new(ManagedStructTestLib.ptr_from_address(0x12345678)).class.should eq WhatClassAmI
+    WhatClassAmI.new(ManagedStructTestLib.ptr_from_address(0x12345678)).class.should == WhatClassAmI
   end
 
   it "should release memory properly" do
@@ -50,11 +39,7 @@ describe "Managed Struct" do
         loop = 5
         while loop > 0 && @@count < count
           loop -= 1
-          if RUBY_PLATFORM =~ /java/
-            java.lang.System.gc
-          else
-            GC.start
-          end
+          TestLibrary.force_gc
           sleep 0.05 if @@count < count
         end
       end

data/spec/ffi/number_spec.rb

@@ -1,17 +1,6 @@
 #
 # This file is part of ruby-ffi.
-#
-# This code is free software: you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License version 3 only, as
-# published by the Free Software Foundation.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-# version 3 for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+# For licensing, see LICENSE.SPECS
 #
 
 require File.expand_path(File.join(File.dirname(__FILE__), "spec_helper"))
@@ -37,95 +26,95 @@ describe "Function with primitive integer arguments" do
     attach_function :get_double, [ ], :double
   end
   it "int8.size" do
-    FFI::TYPE_INT8.size.should eq 1
+    FFI::TYPE_INT8.size.should == 1
   end
   it "uint8.size" do
-    FFI::TYPE_UINT8.size.should eq 1
+    FFI::TYPE_UINT8.size.should == 1
   end
   it "int16.size" do
-    FFI::TYPE_INT16.size.should eq 2
+    FFI::TYPE_INT16.size.should == 2
   end
   it "uint16.size" do
-    FFI::TYPE_UINT16.size.should eq 2
+    FFI::TYPE_UINT16.size.should == 2
   end
   it "int32.size" do
-    FFI::TYPE_INT32.size.should eq 4
+    FFI::TYPE_INT32.size.should == 4
   end
   it "uint32.size" do
-    FFI::TYPE_UINT32.size.should eq 4
+    FFI::TYPE_UINT32.size.should == 4
   end
   it "int64.size" do
-    FFI::TYPE_INT64.size.should eq 8
+    FFI::TYPE_INT64.size.should == 8
   end
   it "uint64.size" do
-    FFI::TYPE_UINT64.size.should eq 8
+    FFI::TYPE_UINT64.size.should == 8
   end
   it "float.size" do
-    FFI::TYPE_FLOAT32.size.should eq 4
+    FFI::TYPE_FLOAT32.size.should == 4
   end
   it "double.size" do
-    FFI::TYPE_FLOAT64.size.should eq 8
+    FFI::TYPE_FLOAT64.size.should == 8
   end
   [ 0, 127, -128, -1 ].each do |i|
     it ":char call(:char (#{i}))" do
-      LibTest.ret_s8(i).should eq i
+      LibTest.ret_s8(i).should == i
     end
   end
   [ 0, 0x7f, 0x80, 0xff ].each do |i|
     it ":uchar call(:uchar (#{i}))" do
-      LibTest.ret_u8(i).should eq i
+      LibTest.ret_u8(i).should == i
     end
   end
   [ 0, 0x7fff, -0x8000, -1 ].each do |i|
     it ":short call(:short (#{i}))" do
-      LibTest.ret_s16(i).should eq i
+      LibTest.ret_s16(i).should == i
     end
   end
   [ 0, 0x7fff, 0x8000, 0xffff ].each do |i|
     it ":ushort call(:ushort (#{i}))" do
-      LibTest.ret_u16(i).should eq i
+      LibTest.ret_u16(i).should == i
     end
   end
   [ 0, 0x7fffffff, -0x80000000, -1 ].each do |i|
     it ":int call(:int (#{i}))" do
-      LibTest.ret_s32(i).should eq i
+      LibTest.ret_s32(i).should == i
     end
   end
   [ 0, 0x7fffffff, 0x80000000, 0xffffffff ].each do |i|
     it ":uint call(:uint (#{i}))" do
-      LibTest.ret_u32(i).should eq i
+      LibTest.ret_u32(i).should == i
     end
   end
   [ 0, 0x7fffffffffffffff, -0x8000000000000000, -1 ].each do |i|
     it ":long_long call(:long_long (#{i}))" do
-      LibTest.ret_s64(i).should eq i
+      LibTest.ret_s64(i).should == i
     end
   end
   [ 0, 0x7fffffffffffffff, 0x8000000000000000, 0xffffffffffffffff ].each do |i|
     it ":ulong_long call(:ulong_long (#{i}))" do
-      LibTest.ret_u64(i).should eq i
+      LibTest.ret_u64(i).should == i
     end
   end
   if FFI::Platform::LONG_SIZE == 32
     [ 0, 0x7fffffff, -0x80000000, -1 ].each do |i|
       it ":long call(:long (#{i}))" do
-        LibTest.ret_long(i).should eq i
+        LibTest.ret_long(i).should == i
       end
     end
     [ 0, 0x7fffffff, 0x80000000, 0xffffffff ].each do |i|
       it ":ulong call(:ulong (#{i}))" do
-        LibTest.ret_ulong(i).should eq i
+        LibTest.ret_ulong(i).should == i
       end
     end
   else
     [ 0, 0x7fffffffffffffff, -0x8000000000000000, -1 ].each do |i|
       it ":long call(:long (#{i}))" do
-        LibTest.ret_long(i).should eq i
+        LibTest.ret_long(i).should == i
       end
     end
     [ 0, 0x7fffffffffffffff, 0x8000000000000000, 0xffffffffffffffff ].each do |i|
       it ":ulong call(:ulong (#{i}))" do
-        LibTest.ret_ulong(i).should eq i
+        LibTest.ret_ulong(i).should == i
       end
     end
     [ 0.0, 0.1, 1.1, 1.23 ].each do |f|
@@ -145,32 +134,32 @@ end
 describe "Integer parameter range checking" do
   [ 128, -129 ].each do |i|
     it ":char call(:char (#{i}))" do
-      lambda { LibTest.ret_int8_t(i).should eq i }.should raise_error
+      lambda { LibTest.ret_int8_t(i).should == i }.should raise_error
     end
   end
   [ -1, 256 ].each do |i|
     it ":uchar call(:uchar (#{i}))" do
-      lambda { LibTest.ret_u_int8_t(i).should eq i }.should raise_error
+      lambda { LibTest.ret_u_int8_t(i).should == i }.should raise_error
     end
   end
   [ 0x8000, -0x8001 ].each do |i|
     it ":short call(:short (#{i}))" do
-      lambda { LibTest.ret_int16_t(i).should eq i }.should raise_error
+      lambda { LibTest.ret_int16_t(i).should == i }.should raise_error
     end
   end
   [ -1, 0x10000 ].each do |i|
     it ":ushort call(:ushort (#{i}))" do
-      lambda { LibTest.ret_u_int16_t(i).should eq i }.should raise_error
+      lambda { LibTest.ret_u_int16_t(i).should == i }.should raise_error
     end
   end
   [ 0x80000000, -0x80000001 ].each do |i|
     it ":int call(:int (#{i}))" do
-      lambda { LibTest.ret_int32_t(i).should eq i }.should raise_error
+      lambda { LibTest.ret_int32_t(i).should == i }.should raise_error
     end
   end
   [ -1, 0x100000000 ].each do |i|
     it ":ushort call(:ushort (#{i}))" do
-      lambda { LibTest.ret_u_int32_t(i).should eq i }.should raise_error
+      lambda { LibTest.ret_u_int32_t(i).should == i }.should raise_error
     end
   end
 end
@@ -217,11 +206,11 @@ describe "Three different size Integer arguments" do
 
   def verify(p, off, t, v)
     if t == 'f32'
-      p.get_float32(off).should eq v
+      p.get_float32(off).should == v
     elsif t == 'f64'
-      p.get_float64(off).should eq v
+      p.get_float64(off).should == v
     else
-      p.get_int64(off).should eq v
+      p.get_int64(off).should == v
     end
   end