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 /test/soap/marshal | |
parent | 746a4fb43fcc14dcdac95a1c2c26bb3fba55b345 (diff) |
* 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
Diffstat (limited to 'test/soap/marshal')
-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 |
3 files changed, 27 insertions, 9 deletions
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 |