* ext/win32ole/win32ole.c (ole_set_safe_array, ole_variant2val,

  ole_val_ary2variant_ary): fix WIN32OLE_VARIANT.new bug when
  1st argument is empty array, and when 2nd argument is 
  VT_ARRAY|VT_BYREF.

* test/win32ole/test_win32ole_variant.rb: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11670 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 32 insertions, 1 deletions

diff --git a/test/win32ole/test_win32ole_variant.rb b/test/win32ole/test_win32ole_variant.rb
index 418ce57751..b84f5855cf 100644
--- a/test/win32ole/test_win32ole_variant.rb
+++ b/test/win32ole/test_win32ole_variant.rb
@@ -7,6 +7,7 @@ require "test/unit"
 if defined?(WIN32OLE_VARIANT)
 
   class TestWIN32OLE_VARIANT < Test::Unit::TestCase
+
     def test_new
       obj = WIN32OLE_VARIANT.new('foo')
       assert_instance_of(WIN32OLE_VARIANT, obj)
@@ -94,6 +95,10 @@ if defined?(WIN32OLE_VARIANT)
       obj = WIN32OLE_VARIANT.new([1.2, 2.3], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_R8)
       assert_equal([1.2, 2.3], obj.value)
       assert_equal(WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_R8, obj.vartype)
+
+      obj = WIN32OLE_VARIANT.new([1.2, 2.3], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_R8|WIN32OLE::VARIANT::VT_BYREF)
+      assert_equal([1.2, 2.3], obj.value)
+      assert_equal(WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_R8|WIN32OLE::VARIANT::VT_BYREF, obj.vartype)
     end
 
     def test_create_vt_array2
@@ -106,12 +111,39 @@ if defined?(WIN32OLE_VARIANT)
       assert_equal(WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_VARIANT, obj.vartype)
     end
 
+
     def test_create_vt_nested_array
       obj = WIN32OLE_VARIANT.new([[1.2, "a", "b"], [3.4, "C", "D"]], WIN32OLE::VARIANT::VT_ARRAY)
       assert_equal([[1.2, "a", "b"], [3.4, "C", "D"]], obj.value)
 
       obj = WIN32OLE_VARIANT.new([[1.2, "a", "b"], [3.4, "C", "D"]])
       assert_equal([[1.2, "a", "b"], [3.4, "C", "D"]], obj.value)
+
+      obj = WIN32OLE_VARIANT.new([[1.2, "a", "b"], [3.4, "C", "D"], [5.6, "E", "F"]])
+      assert_equal([[1.2, "a", "b"], [3.4, "C", "D"], [5.6, "E", "F"]], obj.value)
+
+      obj = WIN32OLE_VARIANT.new([[[1.2], [3.4]], [[5.6], [7.8]], [[9.1],[9.2]]])
+      assert_equal([[[1.2], [3.4]], [[5.6], [7.8]], [[9.1],[9.2]]], obj.value)
+    end
+
+    def test_create_vt_array3
+      obj = WIN32OLE_VARIANT.new([])
+      assert_equal([], obj.value)
+
+      obj = WIN32OLE_VARIANT.new([[]])
+      assert_equal([[]], obj.value)
+
+      obj = WIN32OLE_VARIANT.new([[],[]])
+      assert_equal([[],[]], obj.value)
+
+      obj = WIN32OLE_VARIANT.new([], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_BYREF)
+      assert_equal([], obj.value)
+
+      obj = WIN32OLE_VARIANT.new([[]], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_BYREF)
+      assert_equal([[]], obj.value)
+
+      obj = WIN32OLE_VARIANT.new([[],[]], WIN32OLE::VARIANT::VT_ARRAY|WIN32OLE::VARIANT::VT_BYREF)
+      assert_equal([[],[]], obj.value)
     end
 
     def test_create_vt_array_exc
@@ -168,6 +200,5 @@ if defined?(WIN32OLE_VARIANT)
       assert_nil(WIN32OLE_VARIANT::Null.value)
     end
 
-
   end
 end