Changeset 1862

Timestamp:

06/25/07 20:38:04 (11 months ago)

Author:

nahi

Message:

• passing nil as a basetype through wsdl2ruby.rb generated mapping_registry was broken in 1.5.6. closes #369.
  

Files:

• trunk/lib/soap/mapping/registry.rb (modified) (1 diff)
• trunk/test/soap/test_httpconfigloader.rb (modified) (1 diff)
• trunk/test/wsdl/datetime/datetimeServant.rb (modified) (1 diff)
• trunk/test/wsdl/datetime/test_datetime.rb (modified) (1 diff)
• trunk/test/wsdl/rpc/test_rpc.rb (modified) (2 diffs)

trunk/lib/soap/mapping/registry.rb

@@ -241 +241 @@
-
-  def base2soap(obj, type, qualified = nil)
+    return SOAPNil.new if obj.nil?
-    soap_obj = nil
-    if type <= XSD::XSDString

trunk/test/soap/test_httpconfigloader.rb

@@ -38 +38 @@
-        ['http://www.example.com/foo3/', 'user3', 'password3']
-      h = @client.streamhandler.client
-instance_eval { @basic_auth }
+www_auth.basic_auth
-      cred1 = ["user1:password1"].pack('m').tr("\n", '')
-      cred2 = ["user2:password2"].pack('m').tr("\n", '')

trunk/test/wsdl/datetime/datetimeServant.rb

@@ -16 +16 @@
-  def now(now)
-    #raise NotImplementedError.new
+    return nil if now.nil?
-    now + 1
-  end

trunk/test/wsdl/datetime/test_datetime.rb

@@ -76 +76 @@
-    assert_equal(d1.sec, d2.sec)
-  end
+
+  def test_nil
+    assert_nil(@client.now(nil))
+  end
-end
-

trunk/test/wsdl/rpc/test_rpc.rb

@@ -44 +44 @@
-
-    def echo_basetype(arg1, arg2)
+      return nil if arg1.nil? and arg2.nil?
-      raise unless arg1.is_a?(Date)
-      arg1
@@ -159 +160 @@
-    assert_nil(ret.given_name)
-    assert_nil(ret.age)
+    #
+    assert_nil(@client.echo_basetype(nil, nil))
-  end
-