summaryrefslogtreecommitdiff
path: root/test/soap
diff options
context:
space:
mode:
authornahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-09-26 18:34:41 +0000
committernahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-09-26 18:34:41 +0000
commit2e0b087b02de40dd7398533522d2cfcf209771df (patch)
treed730760d25ea3b60f787f8a3c734d45036485e63 /test/soap
parent746a4fb43fcc14dcdac95a1c2c26bb3fba55b345 (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')
-rw-r--r--test/soap/calc/test_calc.rb9
-rw-r--r--test/soap/calc/test_calc2.rb9
-rw-r--r--test/soap/calc/test_calc_cgi.rb9
-rw-r--r--test/soap/helloworld/test_helloworld.rb9
-rw-r--r--test/soap/marshal/test_digraph.rb9
-rw-r--r--test/soap/marshal/test_marshal.rb18
-rw-r--r--test/soap/marshal/test_struct.rb9
-rw-r--r--test/soap/test_basetype.rb7
-rw-r--r--test/soap/test_soapelement.rb7
9 files changed, 77 insertions, 9 deletions
diff --git a/test/soap/calc/test_calc.rb b/test/soap/calc/test_calc.rb
index 191295b..e14dbf5 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 05a43b6..0e84ca3 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 682356e..6c89d46 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 ccf77f9..0aa552e 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 93f555f..2e79589 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 8a1b829..87e364e 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 6596fb7..d3c0a4e 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 8090363..16f211c 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 df402c1..99c1f29 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