tests: remove assert_nothing_raised

Minitest doesn't support assert_nothing_raised. Remove our uses of
assert_nothing_raised by either simply removing the call, or adding
other basic asserts.

Author: ktdreyer

test/test_array.rb

@@ -4,17 +4,15 @@
 class TestArray < Minitest::Test
   def test_concurrency
     ary = ThreadSafe::Array.new
-    assert_nothing_raised do
-      (1..100).map do |i|
-        Thread.new do
-          1000.times do
-            ary << i
-            ary.each {|x| x * 2}
-            ary.shift
-            ary.last
-          end
+    (1..100).map do |i|
+      Thread.new do
+        1000.times do
+          ary << i
+          ary.each {|x| x * 2}
+          ary.shift
+          ary.last
         end
-      end.map(&:join)
-    end
+      end
+    end.map(&:join)
   end
 end

test/test_cache.rb

@@ -11,18 +11,16 @@ def setup
 
   def test_concurrency
     cache = @cache
-    assert_nothing_raised do
-      (1..100).map do |i|
-        Thread.new do
-          1000.times do |j|
-            key = i*1000+j
-            cache[key] = i
-            cache[key]
-            cache.delete(key)
-          end
+    (1..100).map do |i|
+      Thread.new do
+        1000.times do |j|
+          key = i*1000+j
+          cache[key] = i
+          cache[key]
+          cache.delete(key)
         end
-      end.map(&:join)
-    end
+      end
+    end.map(&:join)
   end
 
   def test_retrieval
@@ -553,11 +551,9 @@ def test_each_pair_allows_modification
     @cache[:b] = 1
     @cache[:c] = 1
 
-    assert_nothing_raised do
-      assert_size_change 1 do
-        @cache.each_pair do |k, v|
-          @cache[:z] = 1
-        end
+    assert_size_change 1 do
+      @cache.each_pair do |k, v|
+        @cache[:z] = 1
       end
     end
   end
@@ -707,10 +703,9 @@ def test_is_unfreezable
   end
 
   def test_marshal_dump_load
-    assert_nothing_raised do
-      new_cache = Marshal.load(Marshal.dump(@cache))
-      assert_equal 0, new_cache.size
-    end
+    new_cache = Marshal.load(Marshal.dump(@cache))
+    assert_instance_of ThreadSafe::Cache, new_cache
+    assert_equal 0, new_cache.size
     @cache[:a] = 1
     new_cache = Marshal.load(Marshal.dump(@cache))
     assert_equal 1, @cache[:a]
@@ -739,7 +734,8 @@ def assert_valid_option(option_name, value)
   end
 
   def assert_valid_options(options)
-    assert_nothing_raised { ThreadSafe::Cache.new(options) }
+    c = ThreadSafe::Cache.new(options)
+    assert_instance_of ThreadSafe::Cache, c
   end
 
   def assert_invalid_option(option_name, value)

test/test_cache_loops.rb

@@ -309,15 +309,13 @@ def add_remove_to_zero_via_merge_pair(opts = {})
   def do_thread_loop(name, code, options = {}, &block)
     options = DEFAULTS.merge(options)
     meth    = define_loop name, code, options[:prelude]
-    assert_nothing_raised do
-      keys = to_keys_array(options[:key_count])
-      run_thread_loop(meth, keys, options, &block)
-
-      if options[:key_count] > 1
-        options[:key_count] = (options[:key_count] / 40).to_i
-        keys = to_hash_collision_keys_array(options[:key_count])
-        run_thread_loop(meth, keys, options.merge(:loop_count => (options[:loop_count] * 5)), &block)
-      end
+    keys = to_keys_array(options[:key_count])
+    run_thread_loop(meth, keys, options, &block)
+
+    if options[:key_count] > 1
+      options[:key_count] = (options[:key_count] / 40).to_i
+      keys = to_hash_collision_keys_array(options[:key_count])
+      run_thread_loop(meth, keys, options.merge(:loop_count => (options[:loop_count] * 5)), &block)
     end
   end
 

test/test_hash.rb

@@ -4,16 +4,14 @@
 class TestHash < Minitest::Test
   def test_concurrency
     hsh = ThreadSafe::Hash.new
-    assert_nothing_raised do
-      (1..100).map do |i|
-        Thread.new do
-          1000.times do |j|
-            hsh[i*1000+j] = i
-            hsh[i*1000+j]
-            hsh.delete(i*1000+j)
-          end
+    (1..100).map do |i|
+      Thread.new do
+        1000.times do |j|
+          hsh[i*1000+j] = i
+          hsh[i*1000+j]
+          hsh.delete(i*1000+j)
         end
-      end.map(&:join)
-    end
+      end
+    end.map(&:join)
   end
 end

test/test_helper.rb

@@ -8,16 +8,6 @@
   Minitest::Test = MiniTest::Unit::TestCase
 end
 
-# Minitest does not support assert_nothing_raised.
-# Eventually we should remove our use of this assert_nothing_raised function
-# for more specific asserts. In the mean time, add a backwards-compatible
-# implementation of assert_nothing_raised.
-class MiniTest::Test
-  def assert_nothing_raised(&block)
-    block.call
-  end
-end
-
 if defined?(JRUBY_VERSION) && ENV['TEST_NO_UNSAFE']
   # to be used like this: rake test TEST_NO_UNSAFE=true
   load 'test/package.jar'