summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-22 15:43:10 +0000
committernahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-10-22 15:43:10 +0000
commit02969588b05b7ca64f3930fdfa05b46aa25d025e (patch)
tree777912106052c60d3be45d5d416d75973e1c1238
parent8af50cc8384926e2a44c431cec9151a4ce2be7e9 (diff)
downloadruby-02969588b05b7ca64f3930fdfa05b46aa25d025e.tar.gz
ruby-02969588b05b7ca64f3930fdfa05b46aa25d025e.tar.xz
ruby-02969588b05b7ca64f3930fdfa05b46aa25d025e.zip
* test/soap/calc/*, test/soap/helloworld/*: set logging threshold to ERROR.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/soap/calc/test_calc.rb6
-rw-r--r--test/soap/calc/test_calc2.rb6
-rw-r--r--test/soap/calc/test_calc_cgi.rb7
-rw-r--r--test/soap/helloworld/test_helloworld.rb6
5 files changed, 21 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 5fd5a7604..c3c6bb74a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 23 00:41:45 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>
+
+ * test/soap/calc/*, test/soap/helloworld/*: set logging threshold
+ to ERROR.
+
Wed Oct 22 12:53:31 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
diff --git a/test/soap/calc/test_calc.rb b/test/soap/calc/test_calc.rb
index 4e50617f0..d73ade4ac 100644
--- a/test/soap/calc/test_calc.rb
+++ b/test/soap/calc/test_calc.rb
@@ -16,7 +16,7 @@ class TestCalc < Test::Unit::TestCase
def setup
@server = CalcServer.new(self.class.name, nil, '0.0.0.0', Port)
- @server.level = Logger::Severity::FATAL
+ @server.level = Logger::Severity::ERROR
@t = Thread.new {
@server.start
}
@@ -27,7 +27,8 @@ class TestCalc < Test::Unit::TestCase
raise
end
end
- @calc = SOAP::RPC::Driver.new("http://localhost:#{Port}/", 'http://tempuri.org/calcService')
+ @endpoint = "http://localhost:#{Port}/"
+ @calc = SOAP::RPC::Driver.new(@endpoint, 'http://tempuri.org/calcService')
@calc.add_method('add', 'lhs', 'rhs')
@calc.add_method('sub', 'lhs', 'rhs')
@calc.add_method('multi', 'lhs', 'rhs')
@@ -38,6 +39,7 @@ class TestCalc < Test::Unit::TestCase
@server.server.shutdown
@t.kill
@t.join
+ @calc.reset_stream
end
def test_calc
diff --git a/test/soap/calc/test_calc2.rb b/test/soap/calc/test_calc2.rb
index 4675d0316..1f18a5f22 100644
--- a/test/soap/calc/test_calc2.rb
+++ b/test/soap/calc/test_calc2.rb
@@ -16,7 +16,7 @@ class TestCalc2 < Test::Unit::TestCase
def setup
@server = CalcServer2.new('CalcServer', 'http://tempuri.org/calcService', '0.0.0.0', Port)
- @server.level = Logger::Severity::FATAL
+ @server.level = Logger::Severity::ERROR
@t = Thread.new {
Thread.current.abort_on_exception = true
@server.start
@@ -28,7 +28,8 @@ class TestCalc2 < Test::Unit::TestCase
raise
end
end
- @var = SOAP::RPC::Driver.new("http://localhost:#{Port}/", 'http://tempuri.org/calcService')
+ @endpoint = "http://localhost:#{Port}/"
+ @var = SOAP::RPC::Driver.new(@endpoint, 'http://tempuri.org/calcService')
@var.add_method('set', 'newValue')
@var.add_method('get')
@var.add_method_as('+', 'add', 'rhs')
@@ -41,6 +42,7 @@ class TestCalc2 < Test::Unit::TestCase
@server.server.shutdown
@t.kill
@t.join
+ @var.reset_stream
end
def test_calc2
diff --git a/test/soap/calc/test_calc_cgi.rb b/test/soap/calc/test_calc_cgi.rb
index 30cafae44..09ecfb03e 100644
--- a/test/soap/calc/test_calc_cgi.rb
+++ b/test/soap/calc/test_calc_cgi.rb
@@ -20,8 +20,7 @@ class TestCalcCGI < Test::Unit::TestCase
def setup
logger = Logger.new(STDERR)
- logger.level = Logger::Severity::FATAL
- logger.level = Logger::Severity::DEBUG if $DEBUG
+ logger.level = Logger::Severity::ERROR
@server = WEBrick::HTTPServer.new(
:BindAddress => "0.0.0.0",
:Logger => logger,
@@ -42,7 +41,8 @@ class TestCalcCGI < Test::Unit::TestCase
raise
end
end
- @calc = SOAP::RPC::Driver.new("http://localhost:#{Port}/server.cgi", 'http://tempuri.org/calcService')
+ @endpoint = "http://localhost:#{Port}/server.cgi"
+ @calc = SOAP::RPC::Driver.new(@endpoint, 'http://tempuri.org/calcService')
@calc.add_method('add', 'lhs', 'rhs')
@calc.add_method('sub', 'lhs', 'rhs')
@calc.add_method('multi', 'lhs', 'rhs')
@@ -53,6 +53,7 @@ class TestCalcCGI < Test::Unit::TestCase
@server.shutdown
@t.kill
@t.join
+ @calc.reset_stream
end
def test_calc
diff --git a/test/soap/helloworld/test_helloworld.rb b/test/soap/helloworld/test_helloworld.rb
index bc1937bea..1e9c4a396 100644
--- a/test/soap/helloworld/test_helloworld.rb
+++ b/test/soap/helloworld/test_helloworld.rb
@@ -16,7 +16,7 @@ class TestHelloWorld < Test::Unit::TestCase
def setup
@server = HelloWorldServer.new('hws', 'urn:hws', '0.0.0.0', Port)
- @server.level = Logger::Severity::UNKNOWN
+ @server.level = Logger::Severity::ERROR
@t = Thread.new {
Thread.current.abort_on_exception = true
@server.start
@@ -28,7 +28,8 @@ class TestHelloWorld < Test::Unit::TestCase
raise
end
end
- @client = SOAP::RPC::Driver.new("http://localhost:#{Port}/", 'urn:hws')
+ @endpoint = "http://localhost:#{Port}/"
+ @client = SOAP::RPC::Driver.new(@endpoint, 'urn:hws')
@client.add_method("hello_world", "from")
end
@@ -36,6 +37,7 @@ class TestHelloWorld < Test::Unit::TestCase
@server.server.shutdown
@t.kill
@t.join
+ @client.reset_stream
end
def test_hello_world