diff options
author | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-26 18:34:41 +0000 |
---|---|---|
committer | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-09-26 18:34:41 +0000 |
commit | 2e0b087b02de40dd7398533522d2cfcf209771df (patch) | |
tree | d730760d25ea3b60f787f8a3c734d45036485e63 | |
parent | 746a4fb43fcc14dcdac95a1c2c26bb3fba55b345 (diff) | |
download | ruby-2e0b087b02de40dd7398533522d2cfcf209771df.tar.gz |
* test/soap/*, test/wsdl/*, test/xsd/*: move TestCase classes into each module
namespace. TestMarshal in test/soap/marshal/test_marshal.rb crashed with
test/ruby/test_marshal.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | test/soap/calc/test_calc.rb | 9 | ||||
-rw-r--r-- | test/soap/calc/test_calc2.rb | 9 | ||||
-rw-r--r-- | test/soap/calc/test_calc_cgi.rb | 9 | ||||
-rw-r--r-- | test/soap/helloworld/test_helloworld.rb | 9 | ||||
-rw-r--r-- | test/soap/marshal/test_digraph.rb | 9 | ||||
-rw-r--r-- | test/soap/marshal/test_marshal.rb | 18 | ||||
-rw-r--r-- | test/soap/marshal/test_struct.rb | 9 | ||||
-rw-r--r-- | test/soap/test_basetype.rb | 7 | ||||
-rw-r--r-- | test/soap/test_soapelement.rb | 7 | ||||
-rw-r--r-- | test/wsdl/test_emptycomplextype.rb | 7 | ||||
-rw-r--r-- | test/xsd/test_xmlschemaparser.rb | 7 | ||||
-rw-r--r-- | test/xsd/test_xsd.rb | 7 |
13 files changed, 105 insertions, 9 deletions
@@ -1,3 +1,10 @@ +Mon Sep 27 03:32:37 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org> + + * test/soap/*, test/wsdl/*, test/xsd/*: move TestCase classes into + each module namespace. TestMarshal in + test/soap/marshal/test_marshal.rb crashed with + test/ruby/test_marshal.rb. + Sat Sep 27 01:30:59 2003 NAKAMURA Usaku <usa@ruby-lang.org> * ext/socket/socket.c (ruby_connect): on win32, type of the 4th diff --git a/test/soap/calc/test_calc.rb b/test/soap/calc/test_calc.rb index 191295bac0..e14dbf5daa 100644 --- a/test/soap/calc/test_calc.rb +++ b/test/soap/calc/test_calc.rb @@ -6,6 +6,11 @@ $:.push(dir) require 'server.rb' $:.delete(dir) + +module SOAP +module Calc + + class TestCalc < Test::Unit::TestCase def setup @server = CalcServer.new(self.class.name, nil, '0.0.0.0', 7000) @@ -39,3 +44,7 @@ class TestCalc < Test::Unit::TestCase end end end + + +end +end diff --git a/test/soap/calc/test_calc2.rb b/test/soap/calc/test_calc2.rb index 05a43b60ec..0e84ca390b 100644 --- a/test/soap/calc/test_calc2.rb +++ b/test/soap/calc/test_calc2.rb @@ -6,6 +6,11 @@ $:.push(dir) require 'server2.rb' $:.delete(dir) + +module SOAP +module Calc + + class TestCalc2 < Test::Unit::TestCase def setup @server = CalcServer2.new('CalcServer', 'http://tempuri.org/calcService', '0.0.0.0', 7000) @@ -41,3 +46,7 @@ class TestCalc2 < Test::Unit::TestCase end end end + + +end +end diff --git a/test/soap/calc/test_calc_cgi.rb b/test/soap/calc/test_calc_cgi.rb index 682356e525..6c89d46c12 100644 --- a/test/soap/calc/test_calc_cgi.rb +++ b/test/soap/calc/test_calc_cgi.rb @@ -2,6 +2,11 @@ require 'test/unit' require 'soap/rpc/driver' require 'webrick' + +module SOAP +module Calc + + class TestCalcCGI < Test::Unit::TestCase def setup @server = WEBrick::HTTPServer.new( @@ -40,3 +45,7 @@ class TestCalcCGI < Test::Unit::TestCase end end end + + +end +end diff --git a/test/soap/helloworld/test_helloworld.rb b/test/soap/helloworld/test_helloworld.rb index ccf77f9c1c..0aa552e4a8 100644 --- a/test/soap/helloworld/test_helloworld.rb +++ b/test/soap/helloworld/test_helloworld.rb @@ -6,6 +6,11 @@ $:.push(dir) require 'hw_s.rb' $:.delete(dir) + +module SOAP +module HelloWorld + + class TestHelloWorld < Test::Unit::TestCase def setup @server = HelloWorldServer.new('hws', 'urn:hws', '0.0.0.0', 2000) @@ -29,3 +34,7 @@ class TestHelloWorld < Test::Unit::TestCase assert_equal("Hello World, from <&>", @client.hello_world("<&>")) end end + + +end +end diff --git a/test/soap/marshal/test_digraph.rb b/test/soap/marshal/test_digraph.rb index 93f555ffc1..2e79589dc4 100644 --- a/test/soap/marshal/test_digraph.rb +++ b/test/soap/marshal/test_digraph.rb @@ -1,6 +1,11 @@ require 'test/unit' require 'soap/marshal' + +module SOAP +module Marshal + + class Node; include SOAP::Marshallable attr_reader :first, :second, :str @@ -43,3 +48,7 @@ class TestDigraph < Test::Unit::TestCase end end end + + +end +end diff --git a/test/soap/marshal/test_marshal.rb b/test/soap/marshal/test_marshal.rb index 8a1b82946f..87e364e2aa 100644 --- a/test/soap/marshal/test_marshal.rb +++ b/test/soap/marshal/test_marshal.rb @@ -1,22 +1,18 @@ require 'test/unit' +require 'soap/marshal' -dir = File.dirname(__FILE__) -$:.push(dir) -require 'cmarshal' -$:.delete(dir) -CMarshal.soap4r +module SOAP +module Marshal module MarshalTestLib def encode(o) - #self.class::MarshalClass.dump(o) - CMarshal.dump(o) + SOAPMarshal.dump(o) end def decode(s) - #self.class::MarshalClass.load(s) - CMarshal.load(s) + SOAPMarshal.load(s) end def marshaltest(o1) @@ -299,3 +295,7 @@ end class TestMarshal < Test::Unit::TestCase include MarshalTestLib end + + +end +end diff --git a/test/soap/marshal/test_struct.rb b/test/soap/marshal/test_struct.rb index 6596fb7a33..d3c0a4e5e8 100644 --- a/test/soap/marshal/test_struct.rb +++ b/test/soap/marshal/test_struct.rb @@ -1,6 +1,11 @@ require 'test/unit' require 'soap/marshal' + +module SOAP +module Marshal + + Foo1 = Struct.new("Foo1", :m) Foo2 = Struct.new(:m) class Foo3 @@ -36,3 +41,7 @@ class TestStruct < Test::Unit::TestCase SOAP::Marshal.unmarshal(SOAP::Marshal.marshal(obj)) end end + + +end +end diff --git a/test/soap/test_basetype.rb b/test/soap/test_basetype.rb index 80903633b1..16f211c717 100644 --- a/test/soap/test_basetype.rb +++ b/test/soap/test_basetype.rb @@ -1,6 +1,10 @@ require 'test/unit' require 'soap/baseData' + +module SOAP + + class TestSOAP < Test::Unit::TestCase def setup # Nothing to do. @@ -949,3 +953,6 @@ class TestSOAP < Test::Unit::TestCase end end end + + +end diff --git a/test/soap/test_soapelement.rb b/test/soap/test_soapelement.rb index df402c1199..99c1f29b98 100644 --- a/test/soap/test_soapelement.rb +++ b/test/soap/test_soapelement.rb @@ -1,6 +1,10 @@ require 'test/unit' require 'soap/baseData' + +module SOAP + + class TestSOAPElement < Test::Unit::TestCase include SOAP @@ -112,3 +116,6 @@ class TestSOAPElement < Test::Unit::TestCase assert_equal(nil, SOAPElement.from_obj(source).to_obj) end end + + +end diff --git a/test/wsdl/test_emptycomplextype.rb b/test/wsdl/test_emptycomplextype.rb index f44c72f840..fffc8c85ec 100644 --- a/test/wsdl/test_emptycomplextype.rb +++ b/test/wsdl/test_emptycomplextype.rb @@ -1,6 +1,10 @@ require 'test/unit' require 'wsdl/parser' + +module WSDL + + class TestWSDL < Test::Unit::TestCase def self.setup(filename) @@filename = filename @@ -12,3 +16,6 @@ class TestWSDL < Test::Unit::TestCase end TestWSDL.setup(File.join(File.dirname(__FILE__), 'emptycomplextype.wsdl')) + + +end diff --git a/test/xsd/test_xmlschemaparser.rb b/test/xsd/test_xmlschemaparser.rb index 6e3839a0d2..b362120540 100644 --- a/test/xsd/test_xmlschemaparser.rb +++ b/test/xsd/test_xmlschemaparser.rb @@ -1,6 +1,10 @@ require 'test/unit' require 'wsdl/xmlSchema/parser' + +module XSD + + class TestXMLSchemaParser < Test::Unit::TestCase def self.setup(filename) @@filename = filename @@ -12,3 +16,6 @@ class TestXMLSchemaParser < Test::Unit::TestCase end TestXMLSchemaParser.setup(File.join(File.dirname(__FILE__), 'xmlschema.xml')) + + +end diff --git a/test/xsd/test_xsd.rb b/test/xsd/test_xsd.rb index 7fb5052f43..bbcbc9c778 100644 --- a/test/xsd/test_xsd.rb +++ b/test/xsd/test_xsd.rb @@ -1,6 +1,10 @@ require 'test/unit' require 'xsd/datatypes' + +module XSD + + class TestXSD < Test::Unit::TestCase def setup # Nothing to do. @@ -974,3 +978,6 @@ class TestXSD2 < Test::Unit::TestCase end end end + + +end |