Skip to content

Commit d16e6a6

Browse files
authored
Merge pull request #12 from herwinw/array_each
Use Array#each instead of while and Array#shift
2 parents ae3661a + 5b0c3d3 commit d16e6a6

9 files changed

Lines changed: 17 additions & 61 deletions

test/test_client.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: false
2-
require 'test_helper'
2+
require 'test/unit'
33
require 'xmlrpc/client'
44
require 'net/http'
55
begin

test/test_cookie.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: false
2-
require 'test_helper'
2+
require 'test/unit'
33
require 'time'
44
require 'webrick'
55
require_relative 'webrick_testing'

test/test_datetime.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: false
2-
require 'test_helper'
2+
require 'test/unit'
33
require "xmlrpc/datetime"
44

55
module TestXMLRPC

test/test_features.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: false
2-
require 'test_helper'
2+
require 'test/unit'
33
require "xmlrpc/create"
44
require "xmlrpc/parser"
55
require "xmlrpc/config"

test/test_helper.rb

Lines changed: 0 additions & 41 deletions
This file was deleted.

test/test_marshal.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: false
2-
require 'test_helper'
2+
require 'test/unit'
33
require "xmlrpc/marshal"
44

55
module TestXMLRPC

test/test_parser.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: false
2-
require 'test_helper'
2+
require 'test/unit'
33
require 'xmlrpc/datetime'
44
require "xmlrpc/parser"
55
require 'yaml'

test/test_xmlrpc.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require 'test_helper'
1+
require 'test/unit'
22
require 'xmlrpc'
33

44
class XmlrpcTest < Test::Unit::TestCase

test/webrick_testing.rb

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,16 @@ def with_server(config, servlet)
5959
servlet = servlet.call(w) if servlet.respond_to? :call
6060
w.mount('/RPC2', servlet)
6161
}
62-
client_thread = Thread.new {
63-
begin
64-
yield addr
65-
ensure
66-
@__server.shutdown
67-
end
68-
}
69-
server_thread = Thread.new {
70-
@__server_thread.join
71-
@__server = nil
72-
assert_equal([], log)
73-
}
74-
assert_join_threads([client_thread, server_thread])
62+
63+
begin
64+
yield addr
65+
ensure
66+
@__server.shutdown
67+
end
68+
69+
@__server_thread.join
70+
@__server = nil
71+
assert_equal([], log)
7572
end
7673
end
7774
end

0 commit comments

Comments
 (0)