Changeset 2248

Timestamp:

12/01/07 20:46:12 (13 months ago)

Author:

coji

Message:

lang/ruby/ssb: tuned up test codes, fixed "post localhost" test by adding content-type

Location:

lang/ruby/ssb/trunk

Files:

• libs/ssb/request.rb (modified) (1 diff)
• test/mock_server.rb (modified) (2 diffs)
• test/request_test.rb (modified) (4 diffs)
• test/ssb_test.rb (modified) (4 diffs)

lang/ruby/ssb/trunk/libs/ssb/request.rb

@@ -51 +51 @@
         case method
         when 'GET'
-          response = http.get(uri.request_uri, request_header.update({'Host' => "#{@uri.host}:#{@uri.port}",
+          response = http.get(@uri.request_uri, request_header.update({'Host' => "#{@uri.host}:#{@uri.port}",
                                                       'Cookie' => 'server-side-browser'}))
         when 'POST'
-          response = http.post(uri.request_uri,
+          response = http.post(@uri.request_uri,
                                @post_params,
                                request_header.update({'Host' => "#{@uri.host}:#{@uri.port}",

lang/ruby/ssb/trunk/test/mock_server.rb

@@ -25 +25 @@
 class MockServer
   def initialize
-    @webserv = WEBrick::HTTPServer.new(config)
+    @webserv = WEBrick::HTTPServer.new(MockServer.config)
     @server_thread = Thread.new do
       Thread.pass
@@ -46 +46 @@
   end
 
-  def uri
-    URI.escape("http://#{config[:BindAddress]}:#{config[:Port]}/")
+  def self.uri
+    URI.escape("http://#{self.config[:BindAddress]}:#{self.config[:Port]}/")
   end
 
-  def config
+  def self.config
     unless @conf
       @conf = {

lang/ruby/ssb/trunk/test/request_test.rb

@@ -7 +7 @@
   def request_params
     {
-      'q'.taint  => @mock_server.uri.dup.taint,
+      'q'.taint  => MockServer.uri.dup.taint,
       'p1'.taint => 'foo'.taint,
       'p2'.taint => 'bar'.taint,
@@ -27 +27 @@
 
   def setup
-    @mock_server = MockServer.new
     @request = SSB::Request.new('GET', request_params, cookie)
-  end
-
-  def teardown
-    @mock_server.shutdown
   end
 
@@ -53 +48 @@
   end
 
-  test 'request_uri_should_escaped' do
-    assert_equal(@request.uri.to_s, "#{@mock_server.uri}?p1=foo&p2=bar&p3=bazz%26hoge")
+  test 'request_uri_should_encoded' do
+    assert_equal(@request.uri.to_s, "#{MockServer.uri}?p1=foo&p2=bar&p3=bazz%26hoge")
   end
 
@@ -99 +94 @@
 
   test 'test_request_should_success' do
+    mock_server = MockServer.new
     assert(@request.execute)
+    mock_server.shutdown
   end
 
   test 'test_request_get' do
+    mock_server = MockServer.new
     request = SSB::Request.new('GET'.taint, request_params, cookie)
     response = request.execute
     assert_instance_of(Net::HTTPOK, response)
     assert(response.body =~ Regexp.new('It works by GET'))
+    mock_server.shutdown
   end
 
   test 'test_request_post' do
+    mock_server = MockServer.new
     request = SSB::Request.new('POST'.taint, request_params, cookie)
     response = request.execute
     assert_instance_of(Net::HTTPOK, response)
     assert(response.body =~ Regexp.new('It works by POST'))
+    mock_server.shutdown
   end
 end

lang/ruby/ssb/trunk/test/ssb_test.rb

@@ -15 +15 @@
   # launch ssb process via pipe
   def kick_ssb(method, query_string, postparams = nil)
-#    return ''
     # CGI Parameters
     ENV['SERVER_NAME'] = 'localhost'
@@ -25 +24 @@
     else
       ENV['CONTENT_LENGTH'] = postparams.size.to_s
+      ENV['CONTENT_TYPE'] = 'application/x-www-form-urlencoded'
     end
     open_type = {
@@ -49 +49 @@
 
   test 'ssb get local' do
-    ret = kick_ssb('GET', "q=#{@mock_server.uri}&uid=NULLGWDOCOMO")
+    ret = kick_ssb('GET', "q=#{MockServer.uri}&uid=NULLGWDOCOMO")
     assert_match(/It works by GET/, ret)
   end
@@ -58 +58 @@
     exp = Regexp.union(
       /getaddrinfo: Name or service not known/,
-      /getaddrinfo: nodename nor servname provided/) 
+      /getaddrinfo: nodename nor servname provided/)
     assert_match(exp, ret)
   end
 
   test 'ssb post local' do
-    ret = kick_ssb('POST', '', "q=#{@mock_server.uri}&param=test&uid=NULLGWDOCOMO")
+    ret = kick_ssb('POST', '', "q=#{MockServer.uri}?param=test&uid=NULLGWDOCOMO")
     assert_match(/It works by POST/, ret)
   end
 
-  test 'ssb_post_invalidhost' do
+  test 'ssb post invalidhost' do
     # noname is invalid hostname
     ret = kick_ssb('POST', '', 'q=noname&param=test&uid=NULLGWDOCOMO')