soap4r 1.5.7 → 1.5.8

data/test/soap/ssl/test_ssl.rb

@@ -42,7 +42,7 @@ class TestSSL < Test::Unit::TestCase
     assert_nil(cfg.verify_callback)
     assert_nil(cfg.timeout)
     assert_equal(OpenSSL::SSL::OP_ALL | OpenSSL::SSL::OP_NO_SSLv2, cfg.options)
-    assert_equal("ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH", cfg.ciphers)
+    assert_equal("ALL:!ADH:!LOW:!EXP:!MD5:+SSLv2:@STRENGTH", cfg.ciphers)
     assert_instance_of(OpenSSL::X509::Store, cfg.cert_store)
     # dummy call to ensure sslsvr initialization finished.
     assert_raise(OpenSSL::SSL::SSLError) do

data/test/soap/struct/test_struct.rb

@@ -46,8 +46,8 @@ class TestStruct < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
-    teardown_client
+    teardown_server if @server
+    teardown_client if @client
   end
 
   def teardown_server

data/test/soap/swa/test_file.rb

@@ -41,10 +41,12 @@ class TestFile < Test::Unit::TestCase
   end
 
   def teardown
-    @server.shutdown
-    @t.kill
-    @t.join
-    @client.reset_stream
+    @server.shutdown if @server
+    if @t
+      @t.kill
+      @t.join
+    end
+    @client.reset_stream if @client
   end
 
   def test_get_file

data/test/soap/test_basetype.rb

@@ -406,7 +406,7 @@ class TestSOAP < Test::Unit::TestCase
     targets = [
       "P1Y2M3DT4H5M6S",
       "P1234Y5678M9012DT3456H7890M1234.5678S",
-      "P0DT3456H7890M1234.5678S",
+      "PT3456H7890M1234.5678S",
       "P1234Y5678M9012D",
       "-P1234Y5678M9012DT3456H7890M1234.5678S",
       "P5678M9012DT3456H7890M1234.5678S",
@@ -418,9 +418,9 @@ class TestSOAP < Test::Unit::TestCase
       "P123400000000000Y",
       "-P567800000000000M",
       "+P901200000000000D",
-      "P0DT345600000000000H",
-      "-P0DT789000000000000M",
-      "+P0DT123400000000000.000000000005678S",
+      "PT345600000000000H",
+      "-PT789000000000000M",
+      "+PT123400000000000.000000000005678S",
       "P1234YT1234.5678S",
       "-P5678MT7890M",
       "+P9012DT3456H",

data/test/soap/test_cookie.rb

@@ -45,8 +45,8 @@ class TestCookie < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_client
-    teardown_server
+    teardown_client if @client
+    teardown_server if @server
   end
 
   def setup_server

data/test/soap/test_custom_ns.rb

@@ -12,11 +12,12 @@ class TestCustomNs < Test::Unit::TestCase
     xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <env:Header>
-      <n1:headeritem xmlns:n1="my:foo"
-          env:mustUnderstand="0">hi</n1:headeritem>
+      <n1:headeritem xmlns:n1="my:foo">hi</n1:headeritem>
   </env:Header>
   <env:Body>
-    <n2:test xmlns:n2="my:foo">bi</n2:test>
+    <n2:test xmlns:n2="my:foo"
+        xmlns:n3="my:bar"
+        n3:baz="qux">bi</n2:test>
   </env:Body>
 </env:Envelope>
 __XML__
@@ -24,16 +25,35 @@ __XML__
   CUSTOM_NS_XML = <<__XML__.chomp
 <?xml version="1.0" encoding="utf-8" ?>
 <ENV:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:ENV="http://schemas.xmlsoap.org/soap/envelope/"
     xmlns:myns="my:foo"
+    xmlns:ENV="http://schemas.xmlsoap.org/soap/envelope/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <ENV:Header>
-      <myns:headeritem ENV:mustUnderstand="0">hi</myns:headeritem>
+      <myns:headeritem>hi</myns:headeritem>
   </ENV:Header>
   <ENV:Body>
-    <myns:test>bi</myns:test>
+    <myns:test xmlns:bar="my:bar"
+        bar:baz="qux">bi</myns:test>
   </ENV:Body>
 </ENV:Envelope>
+__XML__
+
+  XML_WITH_DEFAULT_NS = <<__XML__.chomp
+<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Header>
+      <headeritem xmlns="my:foo">hi</headeritem>
+  </env:Header>
+  <env:Body>
+    <test xmlns:n1="my:bar"
+        xmlns:n2="my:foo"
+        n1:baz="qux"
+        n2:quxx="quxxx"
+        xmlns="my:foo">bi</test>
+  </env:Body>
+</env:Envelope>
 __XML__
 
   def test_custom_ns
@@ -43,20 +63,42 @@ __XML__
     header.add("test", hi)
     body = SOAP::SOAPBody.new()
     bi = SOAP::SOAPElement.new(XSD::QName.new("my:foo", "bodyitem"), 'bi')
+    bi.extraattr[XSD::QName.new('my:bar', 'baz')] = 'qux'
     body.add("test", bi)
     env = SOAP::SOAPEnvelope.new(header, body)
     # normal
     opt = {}
     result = SOAP::Processor.marshal(env, opt)
     assert_equal(NORMAL_XML, result)
-    # ns customize
+    # Envelope ns customize
+    env = SOAP::SOAPEnvelope.new(header, body)
     ns = XSD::NS.new
     ns.assign(SOAP::EnvelopeNamespace, 'ENV')
     ns.assign('my:foo', 'myns')
-    opt = { :default_ns => ns }
+    # tag customize
+    tag = XSD::NS.new
+    tag.assign('my:bar', 'bar')
+    opt = { :default_ns => ns, :default_ns_tag => tag }
     result = SOAP::Processor.marshal(env, opt)
     assert_equal(CUSTOM_NS_XML, result)
   end
+
+  def test_default_namespace
+    # create test env
+    header = SOAP::SOAPHeader.new()
+    hi = SOAP::SOAPElement.new(XSD::QName.new("my:foo", "headeritem"), 'hi')
+    header.add("test", hi)
+    body = SOAP::SOAPBody.new()
+    bi = SOAP::SOAPElement.new(XSD::QName.new("my:foo", "bodyitem"), 'bi')
+    bi.extraattr[XSD::QName.new('my:bar', 'baz')] = 'qux'
+    bi.extraattr[XSD::QName.new('my:foo', 'quxx')] = 'quxxx'
+    body.add("test", bi)
+    env = SOAP::SOAPEnvelope.new(header, body)
+    # normal
+    opt = {:use_default_namespace => true}
+    result = SOAP::Processor.marshal(env, opt)
+    assert_equal(XML_WITH_DEFAULT_NS, result)
+  end
 end
 
 

data/test/soap/test_custommap.rb

@@ -67,10 +67,12 @@ class TestMap < Test::Unit::TestCase
   end
 
   def teardown
-    @server.shutdown
-    @t.kill
-    @t.join
-    @client.reset_stream
+    @server.shutdown if @server
+    if @t
+      @t.kill
+      @t.join
+    end
+    @client.reset_stream if @client
   end
 
   def test_map

data/test/soap/test_empty.rb

@@ -48,10 +48,12 @@ class TestEmpty < Test::Unit::TestCase
   end
 
   def teardown
-    @server.shutdown
-    @t.kill
-    @t.join
-    @client.reset_stream
+    @server.shutdown if @server
+    if @t
+      @t.kill
+      @t.join
+    end
+    @client.reset_stream if @client
   end
 
   EMPTY_XML = %q[<?xml version="1.0" encoding="utf-8" ?>

data/test/soap/test_envelopenamespace.rb

@@ -23,8 +23,8 @@ class TestEnvelopeNamespace < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_client
-    teardown_server
+    teardown_client if @client
+    teardown_server if @server
   end
 
   def setup_server

data/test/soap/test_extraattr.rb

@@ -14,10 +14,9 @@ class TestExtrAttr < Test::Unit::TestCase
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <env:Header Id="extraattr">
       <n1:headeritem xmlns:n1="my:foo"
-          env:mustUnderstand="0"
           Id="extraattr"></n1:headeritem>
   </env:Header>
-  <env:Body Id="extraattr">
+  <env:Body Id="extraattr&lt;&gt;">
     <n2:test xmlns:n2="my:foo"
         Id="extraattr"></n2:test>
   </env:Body>
@@ -30,13 +29,13 @@ class TestExtrAttr < Test::Unit::TestCase
     hi.extraattr["Id"] = "extraattr"
     header.add("test", hi)
     body = SOAP::SOAPBody.new()
-    body.extraattr["Id"] = "extraattr"
+    body.extraattr["Id"] = "extraattr<>"
     bi = SOAP::SOAPElement.new(XSD::QName.new("my:foo", "bodyitem"))
     bi.extraattr["Id"] = "extraattr"
     body.add("test", bi)
     env = SOAP::SOAPEnvelope.new(header, body)
     env.extraattr["Id"] = "extraattr"
-    g = SOAP::SOAPGenerator.new()
+    g = SOAP::Generator.new()
     xml = g.generate(env)
     assert_equal(HEADER_XML, xml)
     #
@@ -44,9 +43,9 @@ class TestExtrAttr < Test::Unit::TestCase
     env = parser.parse(xml)
     header = env.header
     body = env.body
-    assert_equal("extraattr", env.extraattr["Id"])
-    assert_equal("extraattr", header.extraattr["Id"])
-    assert_equal("extraattr", body.extraattr["Id"])
+    assert_equal("extraattr", env.extraattr[XSD::QName.new(nil, "Id")])
+    assert_equal("extraattr", header.extraattr[XSD::QName.new(nil, "Id")])
+    assert_equal("extraattr<>", body.extraattr[XSD::QName.new(nil, "Id")])
     assert_equal("extraattr", header["headeritem"].element.extraattr[XSD::QName.new(nil, "Id")])
   end
 end

data/test/soap/test_generator.rb

@@ -0,0 +1,27 @@
+require 'test/unit'
+require 'soap/processor'
+
+
+module SOAP
+
+
+class TestGenerator < Test::Unit::TestCase
+  # based on #417, reported by Kou.
+  def test_encode
+    str = "\343\201\217<"
+    g = SOAP::Generator.new
+    g.generate(SOAPElement.new('foo'))
+    assert_equal("&lt;", g.encode_string(str)[-4, 4])
+    #
+    begin
+      kc_backup = $KCODE.dup
+      $KCODE = 'EUC-JP'
+      assert_equal("&lt;", g.encode_string(str)[-4, 4])
+    ensure
+      $KCODE = kc_backup
+    end
+  end
+end
+
+
+end

data/test/soap/test_mapping.rb

@@ -68,6 +68,16 @@ __XML__
     assert_equal(SOAP::Mapping::Object, obj.class)
   end
 
+  def test_nestedexception
+    ele = Thread.new {}
+    obj = [ele]
+    begin
+      SOAP::Marshal.dump(obj)
+    rescue ::SOAP::Mapping::MappingError => e
+      assert(e.backtrace.find { |line| /\[NESTED\]/ =~ line })
+    end
+  end
+
   def test_date
     targets = [
       ["2002-12-31",

data/test/soap/test_nestedexception.rb

@@ -0,0 +1,56 @@
+require 'test/unit'
+require 'soap/soap'
+
+
+module SOAP
+
+
+class TestNestedException < Test::Unit::TestCase
+  class MyError < SOAP::Error; end
+
+  def foo
+    begin
+      bar
+    rescue
+      raise MyError.new("foo", $!)
+    end
+  end
+
+  def bar
+    begin
+      baz
+    rescue
+      raise MyError.new("bar", $!)
+    end
+  end
+
+  def baz
+    raise MyError.new("baz", $!)
+  end
+
+  def test_nestedexception
+    begin
+      foo
+    rescue MyError => e
+      trace = e.backtrace.find_all { |line| /test\/unit/ !~ line && /\d\z/ !~ line }
+      trace = trace.map { |line| line.sub(/\A[^:]*/, '') }
+      assert_equal(TOBE, trace)
+    end
+  end
+
+  TOBE = [
+    ":15:in `foo'",
+    ":33:in `test_nestedexception'",
+    ":23:in `bar': bar (SOAP::TestNestedException::MyError) [NESTED]",
+    ":13:in `foo'",
+    ":33:in `test_nestedexception'",
+    ":28:in `baz': baz (SOAP::TestNestedException::MyError) [NESTED]",
+    ":21:in `bar'",
+    ":13:in `foo'",
+    ":33:in `test_nestedexception'",
+  ]
+
+end
+
+
+end

data/test/soap/test_nil.rb

@@ -33,10 +33,12 @@ class TestNil < Test::Unit::TestCase
   end
 
   def teardown
-    @server.shutdown
-    @t.kill
-    @t.join
-    @client.reset_stream
+    @server.shutdown if @server
+    if @t
+      @t.kill
+      @t.join
+    end
+    @client.reset_stream if @client
   end
 
   require 'rexml/document'

data/test/soap/test_no_indent.rb

@@ -33,10 +33,12 @@ class TestNoIndent < Test::Unit::TestCase
   end
 
   def teardown
-    @server.shutdown
-    @t.kill
-    @t.join
-    @client.reset_stream
+    @server.shutdown if @server
+    if @t
+      @t.kill
+      @t.join
+    end
+    @client.reset_stream if @client
   end
 
   INDENT_XML =

data/test/soap/test_response_as_xml.rb

@@ -46,8 +46,8 @@ class TestResponseAsXml < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
-    teardown_client
+    teardown_server if @server
+    teardown_client if @client
   end
 
   def teardown_server

data/test/soap/test_streamhandler.rb

@@ -15,7 +15,7 @@ class TestStreamHandler < Test::Unit::TestCase
 
   def setup
     @logger = Logger.new(STDERR)
-    @logger.level = Logger::Severity::ERROR
+    @logger.level = Logger::Severity::FATAL
     @url = "http://localhost:#{Port}/"
     @proxyurl = "http://localhost:#{ProxyPort}/"
     @server = @proxyserver = @client = nil
@@ -25,9 +25,9 @@ class TestStreamHandler < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_client
+    teardown_client if @client
     teardown_proxyserver if @proxyserver
-    teardown_server
+    teardown_server if @server
   end
 
   def setup_server
@@ -45,6 +45,7 @@ class TestStreamHandler < Test::Unit::TestCase
     htpasswd = File.join(File.dirname(__FILE__), 'htpasswd')
     htpasswd_userdb = WEBrick::HTTPAuth::Htpasswd.new(htpasswd)
     @basic_auth = WEBrick::HTTPAuth::BasicAuth.new(
+      :Logger => @logger,
       :Realm => 'auth',
       :UserDB => htpasswd_userdb
     )
@@ -163,6 +164,8 @@ __EOX__
     @client.endpoint_url = @url + 'basic_auth'
     str = ""
     @client.wiredump_dev = str
+    @client.options['protocol.http.basic_auth']['0'] = [@url, "admin", "admin"]
+    assert_nil(@client.do_server_proc_basic_auth)
     @client.options["protocol.http.basic_auth"] << [@url, "admin", "admin"]
     assert_nil(@client.do_server_proc_basic_auth)
   end