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

data/spec/ffi/pointer_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"))
 require 'delegate'
@@ -40,7 +29,7 @@ describe "Pointer" do
     magic = 0x12345678
     memory.put_int32(0, magic)
     tp = ToPtrTest.new(memory)
-    PointerTestLib.ptr_ret_int32_t(tp, 0).should eq magic
+    PointerTestLib.ptr_ret_int32_t(tp, 0).should == magic
   end
   class PointerDelegate < DelegateClass(FFI::Pointer)
     def initialize(ptr)
@@ -55,7 +44,7 @@ describe "Pointer" do
     magic = 0x12345678
     memory.put_int32(0, magic)
     ptr = PointerDelegate.new(memory)
-    PointerTestLib.ptr_ret_int32_t(ptr, 0).should eq magic
+    PointerTestLib.ptr_ret_int32_t(ptr, 0).should == magic
   end
   it "Fixnum cannot be used as a Pointer argument" do
     lambda { PointerTestLib.ptr_ret_int32(0, 0) }.should raise_error
@@ -69,13 +58,13 @@ describe "Pointer" do
     it "#read_pointer" do
       memory = FFI::MemoryPointer.new :pointer
       PointerTestLib.ptr_set_pointer(memory, 0, PointerTestLib.ptr_from_address(0xdeadbeef))
-      memory.read_pointer.address.should eq 0xdeadbeef
+      memory.read_pointer.address.should == 0xdeadbeef
     end
 
     it "#write_pointer" do
       memory = FFI::MemoryPointer.new :pointer
       memory.write_pointer(PointerTestLib.ptr_from_address(0xdeadbeef))
-      PointerTestLib.ptr_ret_pointer(memory, 0).address.should eq 0xdeadbeef
+      PointerTestLib.ptr_ret_pointer(memory, 0).address.should == 0xdeadbeef
     end
 
     it "#read_array_of_pointer" do
@@ -86,7 +75,7 @@ describe "Pointer" do
       end
       array = memory.read_array_of_pointer(values.size)
       values.each_with_index do |address, j|
-        array[j].address.should eq address
+        array[j].address.should == address
       end
     end
     
@@ -129,11 +118,7 @@ describe "AutoPointer" do
       loop = 5
       while @@count < count && loop > 0
         loop -= 1
-        if RUBY_PLATFORM =~ /java/
-          java.lang.System.gc
-        else
-          GC.start
-        end
+        TestLibrary.force_gc
         sleep 0.05 unless @@count == count
       end
       @@count = 0

data/spec/ffi/rbx/memory_pointer_spec.rb

@@ -12,8 +12,8 @@ end
 describe "MemoryPointer" do
   it "makes a pointer from a string" do
     m = FFI::MemoryPointer.from_string("FFI is Awesome")
-    m.total.should eq 15
-    m.type_size.should eq 1
+    m.total.should == 15
+    m.type_size.should == 1
   end
 
   it "does not make a pointer from non-strings" do
@@ -22,38 +22,38 @@ describe "MemoryPointer" do
 
   it "makes a pointer from a string with multibyte characters" do
     m = FFI::MemoryPointer.from_string("ぱんだ")
-    m.total.should eq 10
-    m.type_size.should eq 1
+    m.total.should == 10
+    m.type_size.should == 1
   end
 
   it "reads back a string" do
     m = FFI::MemoryPointer.from_string("FFI is Awesome")
-    m.read_string.should eq "FFI is Awesome"
+    m.read_string.should == "FFI is Awesome"
   end
   
   it "makes a pointer for a certain number of bytes" do
     m = FFI::MemoryPointer.new(8)
     m.write_array_of_int([1,2])
-    m.read_array_of_int(2).should eq [1,2]
+    m.read_array_of_int(2).should == [1,2]
   end
 
   it "allows access to an element of the pointer (as an array)" do
     m = FFI::MemoryPointer.new(:int, 2)
     m.write_array_of_int([1,2])
-    m[0].read_int.should eq 1
-    m[1].read_int.should eq 2
+    m[0].read_int.should == 1
+    m[1].read_int.should == 2
   end
   
   it "allows writing as an int" do
     m = FFI::MemoryPointer.new(:int)
     m.write_int(1)
-    m.read_int.should eq 1
+    m.read_int.should == 1
   end
   
   it "allows writing as a long" do
     m = FFI::MemoryPointer.new(:long)
     m.write_long(10)
-    m.read_long.should eq 10
+    m.read_long.should == 10
   end
   
   it "raises an error if you try putting a long into a pointer of size 1" do
@@ -76,40 +76,40 @@ describe "MemoryPointer" do
   it "makes a pointer for a certain type" do
     m = FFI::MemoryPointer.new(:int)
     m.write_int(10)
-    m.read_int.should eq 10
+    m.read_int.should == 10
   end
   
   it "makes a memory pointer for a number of a certain type" do
     m = FFI::MemoryPointer.new(:int, 2)
     m.write_array_of_int([1,2])
-    m.read_array_of_int(2).should eq [1,2]
+    m.read_array_of_int(2).should == [1,2]
   end
   
   it "makes a pointer for an object responding to #size" do
     m = FFI::MemoryPointer.new(Struct.new(:size).new(8))
     m.write_array_of_int([1,2])
-    m.read_array_of_int(2).should eq [1,2]
+    m.read_array_of_int(2).should == [1,2]
   end
 
   it "makes a pointer for a number of an object responding to #size" do
     m = FFI::MemoryPointer.new(Struct.new(:size).new(4), 2)
     m.write_array_of_int([1,2])
-    m.read_array_of_int(2).should eq [1,2]
+    m.read_array_of_int(2).should == [1,2]
   end  
   it "MemoryPointer#address returns correct value" do
     m = FFI::MemoryPointer.new(:long_long)
     magic = 0x12345678
     m.write_long(magic)
-    m.read_pointer.address.should eq magic
+    m.read_pointer.address.should == magic
   end
   it "MemoryPointer#null? returns true for zero value" do
     m = FFI::MemoryPointer.new(:long_long)
     m.write_long(0)    
-    m.read_pointer.null?.should eq true
+    m.read_pointer.null?.should == true
   end
   it "MemoryPointer#null? returns false for non-zero value" do
     m = FFI::MemoryPointer.new(:long_long)
     m.write_long(0x12345678)
-    m.read_pointer.null?.should eq false
+    m.read_pointer.null?.should == false
   end
 end

data/spec/ffi/rbx/struct_spec.rb

@@ -8,6 +8,6 @@ describe FFI::Struct do
   it "allows setting fields" do
     t = Timeval.new
     t[:tv_sec] = 12
-    t[:tv_sec].should eq 12
+    t[:tv_sec].should == 12
   end
-end
+end

data/spec/ffi/spec_helper.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 'rubygems'
 require 'rbconfig'
@@ -28,6 +17,15 @@ require "ffi"
 
 module TestLibrary
   PATH = "build/libtest.#{FFI::Platform::LIBSUFFIX}"
+  def self.force_gc
+    if RUBY_PLATFORM =~ /java/
+      java.lang.System.gc
+    elsif defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+      GC.run(true)
+    else
+      GC.start
+    end
+  end
 end
 module LibTest
   extend FFI::Library

data/spec/ffi/string_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"))
@@ -29,7 +18,7 @@ describe "String tests" do
     mp = FFI::MemoryPointer.new 1024
     mp.put_string(0, "test\0")
     str = mp.get_string(0)
-    str.tainted?.should eq true
+    str.tainted?.should == true
   end
   it "String returned by a method is tainted" do
     mp = FFI::MemoryPointer.new :pointer
@@ -37,8 +26,8 @@ describe "String tests" do
     sp.put_string(0, "test")
     mp.put_pointer(0, sp)
     str = StrLibTest.ptr_ret_pointer(mp, 0)
-    str.should eq "test"
-    str.tainted?.should eq true
+    str.should == "test"
+    str.tainted?.should == true
   end
   it "Poison null byte raises error" do
     s = "123\0abc"
@@ -49,7 +38,7 @@ describe "String tests" do
     str = "test"
     str.taint
     begin
-      LibTest.string_equals(str, str).should eq false
+      LibTest.string_equals(str, str).should == false
     rescue SecurityError
     end
   end if false
@@ -57,7 +46,7 @@ describe "String tests" do
     StrLibTest.string_dummy(nil)
   end
   it "return nil for NULL char*" do
-    StrLibTest.string_null.should eq nil
+    StrLibTest.string_null.should == nil
   end
   it "reads an array of strings until encountering a NULL pointer" do
     strings = ["foo", "bar", "baz", "testing", "ffi"]
@@ -69,7 +58,7 @@ describe "String tests" do
     end
     ary.insert(3, nil)
     ptrary.write_array_of_pointer(ary)
-    ptrary.get_array_of_string(0).should eq ["foo", "bar", "baz"]
+    ptrary.get_array_of_string(0).should == ["foo", "bar", "baz"]
   end
   it "reads an array of strings of the size specified, substituting nil when a pointer is NULL" do
     strings = ["foo", "bar", "baz", "testing", "ffi"]
@@ -81,7 +70,7 @@ describe "String tests" do
     end
     ary.insert(2, nil)
     ptrary.write_array_of_pointer(ary)
-    ptrary.get_array_of_string(0, 4).should eq ["foo", "bar", nil, "baz"]
+    ptrary.get_array_of_string(0, 4).should == ["foo", "bar", nil, "baz"]
   end
   it "reads an array of strings, taking a memory offset parameter" do
     strings = ["foo", "bar", "baz", "testing", "ffi"]
@@ -92,7 +81,7 @@ describe "String tests" do
       a << f
     end
     ptrary.write_array_of_pointer(ary)
-    ptrary.get_array_of_string(2 * FFI.type_size(:pointer), 3).should eq ["baz", "testing", "ffi"]
+    ptrary.get_array_of_string(2 * FFI.type_size(:pointer), 3).should == ["baz", "testing", "ffi"]
   end
   it "raises an IndexError when trying to read an array of strings out of bounds" do
     strings = ["foo", "bar", "baz", "testing", "ffi"]

data/spec/ffi/strptr_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"))
@@ -51,7 +40,7 @@ describe "functions returning :strptr" do
 
   it "should return the correct value" do
     result = StrPtr.strdup("test")
-    result[0].should eq "test"
+    result[0].should == "test"
   end
 
   it "should return non-NULL pointer" do

data/spec/ffi/struct_callback_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"))
@@ -53,7 +42,7 @@ describe FFI::Struct, ' with inline callback functions' do
     ts = CallbackMember2::TestStruct.new
     ts[:add] = StructCallbacks.method(:add)
 
-    CallbackMember2.struct_call_add_cb(ts, 1, 2).should eq 3
+    CallbackMember2.struct_call_add_cb(ts, 1, 2).should == 3
   end
 
   it 'should return callable object from []' do
@@ -74,7 +63,7 @@ describe FFI::Struct, ' with inline callback functions' do
     s[:add] = add
     fn = s[:add]
     fn.respond_to?(:call).should be_true
-    fn.call(1, 2).should eq 3
+    fn.call(1, 2).should == 3
   end
 end
 

data/spec/ffi/struct_initialize_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"))
@@ -26,7 +15,7 @@ describe FFI::Struct, ' with an initialize function' do
         self.magic = 42
       end
     end
-    StructWithInitialize.new.magic.should eq 42
+    StructWithInitialize.new.magic.should == 42
   end
 end
 
@@ -41,6 +30,6 @@ describe FFI::ManagedStruct, ' with an initialize function' do
       end
       def self.release;end
     end
-    ManagedStructWithInitialize.new.magic.should eq 42
+    ManagedStructWithInitialize.new.magic.should == 42
   end
 end

data/spec/ffi/struct_packed_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,42 +10,42 @@ describe FFI::Struct do
     Class.new(FFI::Struct) do
       packed
       layout :c, :char, :i, :int
-    end.size.should eq 5
+    end.size.should == 5
   end
 
   it "packed :char followed by :int should have alignment of 1" do
     Class.new(FFI::Struct) do
       packed
       layout :c, :char, :i, :int
-    end.alignment.should eq 1
+    end.alignment.should == 1
   end
 
   it "packed(2) :char followed by :int should have size of 6" do
     Class.new(FFI::Struct) do
       packed 2
       layout :c, :char, :i, :int
-    end.size.should eq 6
+    end.size.should == 6
   end
 
   it "packed(2)  :char followed by :int should have alignment of 2" do
     Class.new(FFI::Struct) do
       packed 2
       layout :c, :char, :i, :int
-    end.alignment.should eq 2
+    end.alignment.should == 2
   end
 
   it "packed :short followed by int should have size of 6" do
     Class.new(FFI::Struct) do
       packed
       layout :s, :short, :i, :int
-    end.size.should eq 6
+    end.size.should == 6
   end
 
   it "packed :short followed by int should have alignment of 1" do
     Class.new(FFI::Struct) do
       packed
       layout :s, :short, :i, :int
-    end.alignment.should eq 1
+    end.alignment.should == 1
   end
 
 end