summaryrefslogtreecommitdiff
path: root/test/rinda
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-24 17:44:39 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-24 17:44:39 +0000
commit00b4a3f9c4aaf5aa038a9530ec515e1718ae1c42 (patch)
treeb57bc2afea00aa87978f691526dd7adc1b8a067d /test/rinda
parent48fdf59dcfbb6964d992b6f31d0eb6f023776145 (diff)
* test: assert_raises has been deprecated since a long time ago.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19536 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rinda')
-rw-r--r--test/rinda/test_rinda.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb
index 14d3c31..84367ab 100644
--- a/test/rinda/test_rinda.rb
+++ b/test/rinda/test_rinda.rb
@@ -149,7 +149,7 @@ module TupleSpaceTestModule
assert(!tmpl.match({"message"=>"Hi", "name"=>"Foo", "age"=>1}))
assert(!tmpl.match({"message"=>"Hello", "no_name"=>"Foo"}))
- assert_raises(Rinda::InvalidHashTupleKey) do
+ assert_raise(Rinda::InvalidHashTupleKey) do
tmpl = Rinda::Template.new({:message=>String, "name"=>String})
end
tmpl = Rinda::Template.new({"name"=>String})
@@ -182,7 +182,7 @@ module TupleSpaceTestModule
assert(!tmpl.match({"message"=>"Hi", "name"=>"Foo", "age"=>1}))
assert(!tmpl.match({"message"=>"Hello", "no_name"=>"Foo"}))
- assert_raises(Rinda::InvalidHashTupleKey) do
+ assert_raise(Rinda::InvalidHashTupleKey) do
@ts.write({:message=>String, "name"=>String})
end
@@ -193,7 +193,7 @@ module TupleSpaceTestModule
assert_equal({'1'=>1, '2'=>2, '3'=>3}, @ts.take({'1'=>1, '2'=>2, '3'=>3}))
entry = @ts.write(['1'=>1, '2'=>2, '3'=>3])
- assert_raises(Rinda::RequestExpiredError) do
+ assert_raise(Rinda::RequestExpiredError) do
assert_equal({'1'=>1, '2'=>2, '3'=>3}, @ts.read({'1'=>1}, 0))
end
entry.cancel
@@ -230,11 +230,11 @@ module TupleSpaceTestModule
end
def test_inp_rdp
- assert_raises(Rinda::RequestExpiredError) do
+ assert_raise(Rinda::RequestExpiredError) do
@ts.take([:empty], 0)
end
- assert_raises(Rinda::RequestExpiredError) do
+ assert_raise(Rinda::RequestExpiredError) do
@ts.read([:empty], 0)
end
end
@@ -242,13 +242,13 @@ module TupleSpaceTestModule
def test_ruby_talk_264062
th = Thread.new { @ts.take([:empty], 1) }
sleep(10)
- assert_raises(Rinda::RequestExpiredError) do
+ assert_raise(Rinda::RequestExpiredError) do
thread_join(th)
end
th = Thread.new { @ts.read([:empty], 1) }
sleep(10)
- assert_raises(Rinda::RequestExpiredError) do
+ assert_raise(Rinda::RequestExpiredError) do
thread_join(th)
end
end
@@ -429,7 +429,7 @@ module TupleSpaceTestModule
sleep(2)
- assert_raises(Rinda::RequestCanceledError) do
+ assert_raise(Rinda::RequestCanceledError) do
assert_nil(thread_join(taker))
end
@@ -458,7 +458,7 @@ module TupleSpaceTestModule
sleep(2)
- assert_raises(Rinda::RequestCanceledError) do
+ assert_raise(Rinda::RequestCanceledError) do
assert_nil(thread_join(reader))
end