Skip to content

Commit 8f57bf2

Browse files
committed
tests predicates according to the boolean interpretation of their return value, not expecting specifically true or false
Respecting Genuine assert_equal false Edition
1 parent 401393b commit 8f57bf2

File tree

1 file changed

+48
-48
lines changed

1 file changed

+48
-48
lines changed

activesupport/test/caching_test.rb

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -122,24 +122,24 @@ def test_delete_matched_key_start
122122
cache.write("foo", "bar")
123123
cache.write("fu", "baz")
124124
cache.delete_matched(/^fo/)
125-
assert_equal false, cache.exist?("foo")
126-
assert_equal true, cache.exist?("fu")
125+
assert !cache.exist?("foo")
126+
assert cache.exist?("fu")
127127
end
128128

129129
def test_delete_matched_key
130130
cache = ActiveSupport::Cache.lookup_store(:memory_store, :namespace => "foo")
131131
cache.write("foo", "bar")
132132
cache.write("fu", "baz")
133133
cache.delete_matched(/OO/i)
134-
assert_equal false, cache.exist?("foo")
135-
assert_equal true, cache.exist?("fu")
134+
assert !cache.exist?("foo")
135+
assert cache.exist?("fu")
136136
end
137137
end
138138

139139
# Tests the base functionality that should be identical across all cache stores.
140140
module CacheStoreBehavior
141141
def test_should_read_and_write_strings
142-
assert_equal true, @cache.write('foo', 'bar')
142+
assert @cache.write('foo', 'bar')
143143
assert_equal 'bar', @cache.read('foo')
144144
end
145145

@@ -174,22 +174,22 @@ def test_fetch_with_cached_nil
174174
end
175175

176176
def test_should_read_and_write_hash
177-
assert_equal true, @cache.write('foo', {:a => "b"})
177+
assert @cache.write('foo', {:a => "b"})
178178
assert_equal({:a => "b"}, @cache.read('foo'))
179179
end
180180

181181
def test_should_read_and_write_integer
182-
assert_equal true, @cache.write('foo', 1)
182+
assert @cache.write('foo', 1)
183183
assert_equal 1, @cache.read('foo')
184184
end
185185

186186
def test_should_read_and_write_nil
187-
assert_equal true, @cache.write('foo', nil)
187+
assert @cache.write('foo', nil)
188188
assert_equal nil, @cache.read('foo')
189189
end
190190

191191
def test_should_read_and_write_false
192-
assert_equal true, @cache.write('foo', false)
192+
assert @cache.write('foo', false)
193193
assert_equal false, @cache.read('foo')
194194
end
195195

@@ -262,19 +262,19 @@ def test_keys_are_case_sensitive
262262

263263
def test_exist
264264
@cache.write('foo', 'bar')
265-
assert_equal true, @cache.exist?('foo')
266-
assert_equal false, @cache.exist?('bar')
265+
assert @cache.exist?('foo')
266+
assert !@cache.exist?('bar')
267267
end
268268

269269
def test_nil_exist
270270
@cache.write('foo', nil)
271-
assert_equal true, @cache.exist?('foo')
271+
assert @cache.exist?('foo')
272272
end
273273

274274
def test_delete
275275
@cache.write('foo', 'bar')
276276
assert @cache.exist?('foo')
277-
assert_equal true, @cache.delete('foo')
277+
assert @cache.delete('foo')
278278
assert !@cache.exist?('foo')
279279
end
280280

@@ -346,10 +346,10 @@ def test_race_condition_protection_is_safe
346346

347347
def test_crazy_key_characters
348348
crazy_key = "#/:*(<+=> )&$%@?;'\"\'`~-"
349-
assert_equal true, @cache.write(crazy_key, "1", :raw => true)
349+
assert @cache.write(crazy_key, "1", :raw => true)
350350
assert_equal "1", @cache.read(crazy_key)
351351
assert_equal "1", @cache.fetch(crazy_key)
352-
assert_equal true, @cache.delete(crazy_key)
352+
assert @cache.delete(crazy_key)
353353
assert_equal "2", @cache.fetch(crazy_key, :raw => true) { "2" }
354354
assert_equal 3, @cache.increment(crazy_key)
355355
assert_equal 2, @cache.decrement(crazy_key)
@@ -358,12 +358,12 @@ def test_crazy_key_characters
358358
def test_really_long_keys
359359
key = ""
360360
900.times{key << "x"}
361-
assert_equal true, @cache.write(key, "bar")
361+
assert @cache.write(key, "bar")
362362
assert_equal "bar", @cache.read(key)
363363
assert_equal "bar", @cache.fetch(key)
364364
assert_nil @cache.read("#{key}x")
365365
assert_equal({key => "bar"}, @cache.read_multi(key))
366-
assert_equal true, @cache.delete(key)
366+
assert @cache.delete(key)
367367
end
368368
end
369369

@@ -375,10 +375,10 @@ module EncodedKeyCacheBehavior
375375
Encoding.list.each do |encoding|
376376
define_method "test_#{encoding.name.underscore}_encoded_values" do
377377
key = "foo".force_encoding(encoding)
378-
assert_equal true, @cache.write(key, "1", :raw => true)
378+
assert @cache.write(key, "1", :raw => true)
379379
assert_equal "1", @cache.read(key)
380380
assert_equal "1", @cache.fetch(key)
381-
assert_equal true, @cache.delete(key)
381+
assert @cache.delete(key)
382382
assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
383383
assert_equal 3, @cache.increment(key)
384384
assert_equal 2, @cache.decrement(key)
@@ -387,18 +387,18 @@ module EncodedKeyCacheBehavior
387387

388388
def test_common_utf8_values
389389
key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
390-
assert_equal true, @cache.write(key, "1", :raw => true)
390+
assert @cache.write(key, "1", :raw => true)
391391
assert_equal "1", @cache.read(key)
392392
assert_equal "1", @cache.fetch(key)
393-
assert_equal true, @cache.delete(key)
393+
assert @cache.delete(key)
394394
assert_equal "2", @cache.fetch(key, :raw => true) { "2" }
395395
assert_equal 3, @cache.increment(key)
396396
assert_equal 2, @cache.decrement(key)
397397
end
398398

399399
def test_retains_encoding
400400
key = "\xC3\xBCmlaut".force_encoding(Encoding::UTF_8)
401-
assert_equal true, @cache.write(key, "1", :raw => true)
401+
assert @cache.write(key, "1", :raw => true)
402402
assert_equal Encoding::UTF_8, key.encoding
403403
end
404404
end
@@ -411,10 +411,10 @@ def test_delete_matched
411411
@cache.write("foo/bar", "baz")
412412
@cache.write("fu/baz", "bar")
413413
@cache.delete_matched(/oo/)
414-
assert_equal false, @cache.exist?("foo")
415-
assert_equal true, @cache.exist?("fu")
416-
assert_equal false, @cache.exist?("foo/bar")
417-
assert_equal true, @cache.exist?("fu/baz")
414+
assert !@cache.exist?("foo")
415+
assert @cache.exist?("fu")
416+
assert !@cache.exist?("foo/bar")
417+
assert @cache.exist?("fu/baz")
418418
end
419419
end
420420

@@ -443,7 +443,7 @@ def test_local_writes_are_persistent_on_the_remote_cache
443443
retval = @cache.with_local_cache do
444444
@cache.write('foo', 'bar')
445445
end
446-
assert_equal true, retval
446+
assert retval
447447
assert_equal 'bar', @cache.read('foo')
448448
end
449449

@@ -595,11 +595,11 @@ def test_prune_size
595595
@cache.read(2) && sleep(0.001)
596596
@cache.read(4)
597597
@cache.prune(@record_size * 3)
598-
assert_equal true, @cache.exist?(5)
599-
assert_equal true, @cache.exist?(4)
600-
assert_equal false, @cache.exist?(3)
601-
assert_equal true, @cache.exist?(2)
602-
assert_equal false, @cache.exist?(1)
598+
assert @cache.exist?(5)
599+
assert @cache.exist?(4)
600+
assert !@cache.exist?(3)
601+
assert @cache.exist?(2)
602+
assert !@cache.exist?(1)
603603
end
604604

605605
def test_prune_size_on_write
@@ -616,17 +616,17 @@ def test_prune_size_on_write
616616
@cache.read(2) && sleep(0.001)
617617
@cache.read(4) && sleep(0.001)
618618
@cache.write(11, "llllllllll")
619-
assert_equal true, @cache.exist?(11)
620-
assert_equal true, @cache.exist?(10)
621-
assert_equal true, @cache.exist?(9)
622-
assert_equal true, @cache.exist?(8)
623-
assert_equal true, @cache.exist?(7)
624-
assert_equal false, @cache.exist?(6)
625-
assert_equal false, @cache.exist?(5)
626-
assert_equal true, @cache.exist?(4)
627-
assert_equal false, @cache.exist?(3)
628-
assert_equal true, @cache.exist?(2)
629-
assert_equal false, @cache.exist?(1)
619+
assert @cache.exist?(11)
620+
assert @cache.exist?(10)
621+
assert @cache.exist?(9)
622+
assert @cache.exist?(8)
623+
assert @cache.exist?(7)
624+
assert !@cache.exist?(6)
625+
assert !@cache.exist?(5)
626+
assert @cache.exist?(4)
627+
assert !@cache.exist?(3)
628+
assert @cache.exist?(2)
629+
assert !@cache.exist?(1)
630630
end
631631

632632
def test_pruning_is_capped_at_a_max_time
@@ -640,11 +640,11 @@ def @cache.delete_entry (*args)
640640
@cache.write(4, "dddddddddd") && sleep(0.001)
641641
@cache.write(5, "eeeeeeeeee") && sleep(0.001)
642642
@cache.prune(30, 0.001)
643-
assert_equal true, @cache.exist?(5)
644-
assert_equal true, @cache.exist?(4)
645-
assert_equal true, @cache.exist?(3)
646-
assert_equal true, @cache.exist?(2)
647-
assert_equal false, @cache.exist?(1)
643+
assert @cache.exist?(5)
644+
assert @cache.exist?(4)
645+
assert @cache.exist?(3)
646+
assert @cache.exist?(2)
647+
assert !@cache.exist?(1)
648648
end
649649
end
650650

0 commit comments

Comments
 (0)