Skip to content

Commit 3d9938e

Browse files
committed
test/openssl/test_ossl.rb: fix style issues
Use OpenSSL::TestCase instead of OpenSSL::SSLTestCase. Prefer assert_true and assert_false over the bare assert and refute. OpenSSL.fixed_length_secure_compare and OpenSSL.secure_compare will only return true or false, and it should be checked.
1 parent 382eca2 commit 3d9938e

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

test/openssl/test_ossl.rb

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,42 @@
33

44
if defined?(OpenSSL)
55

6-
class OpenSSL::OSSL < OpenSSL::SSLTestCase
6+
class OpenSSL::TestOSSL < OpenSSL::TestCase
77
def test_fixed_length_secure_compare
88
assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "a") }
99
assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "aa") }
1010

11-
assert OpenSSL.fixed_length_secure_compare("aaa", "aaa")
12-
assert OpenSSL.fixed_length_secure_compare(
11+
assert_true(OpenSSL.fixed_length_secure_compare("aaa", "aaa"))
12+
assert_true(OpenSSL.fixed_length_secure_compare(
1313
OpenSSL::Digest.digest('SHA256', "aaa"), OpenSSL::Digest::SHA256.digest("aaa")
14-
)
14+
))
1515

1616
assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "aaaa") }
17-
refute OpenSSL.fixed_length_secure_compare("aaa", "baa")
18-
refute OpenSSL.fixed_length_secure_compare("aaa", "aba")
19-
refute OpenSSL.fixed_length_secure_compare("aaa", "aab")
17+
assert_false(OpenSSL.fixed_length_secure_compare("aaa", "baa"))
18+
assert_false(OpenSSL.fixed_length_secure_compare("aaa", "aba"))
19+
assert_false(OpenSSL.fixed_length_secure_compare("aaa", "aab"))
2020
assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "aaab") }
2121
assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "b") }
2222
assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "bb") }
23-
refute OpenSSL.fixed_length_secure_compare("aaa", "bbb")
23+
assert_false(OpenSSL.fixed_length_secure_compare("aaa", "bbb"))
2424
assert_raise(ArgumentError) { OpenSSL.fixed_length_secure_compare("aaa", "bbbb") }
2525
end
2626

2727
def test_secure_compare
28-
refute OpenSSL.secure_compare("aaa", "a")
29-
refute OpenSSL.secure_compare("aaa", "aa")
28+
assert_false(OpenSSL.secure_compare("aaa", "a"))
29+
assert_false(OpenSSL.secure_compare("aaa", "aa"))
3030

31-
assert OpenSSL.secure_compare("aaa", "aaa")
31+
assert_true(OpenSSL.secure_compare("aaa", "aaa"))
3232

33-
refute OpenSSL.secure_compare("aaa", "aaaa")
34-
refute OpenSSL.secure_compare("aaa", "baa")
35-
refute OpenSSL.secure_compare("aaa", "aba")
36-
refute OpenSSL.secure_compare("aaa", "aab")
37-
refute OpenSSL.secure_compare("aaa", "aaab")
38-
refute OpenSSL.secure_compare("aaa", "b")
39-
refute OpenSSL.secure_compare("aaa", "bb")
40-
refute OpenSSL.secure_compare("aaa", "bbb")
41-
refute OpenSSL.secure_compare("aaa", "bbbb")
33+
assert_false(OpenSSL.secure_compare("aaa", "aaaa"))
34+
assert_false(OpenSSL.secure_compare("aaa", "baa"))
35+
assert_false(OpenSSL.secure_compare("aaa", "aba"))
36+
assert_false(OpenSSL.secure_compare("aaa", "aab"))
37+
assert_false(OpenSSL.secure_compare("aaa", "aaab"))
38+
assert_false(OpenSSL.secure_compare("aaa", "b"))
39+
assert_false(OpenSSL.secure_compare("aaa", "bb"))
40+
assert_false(OpenSSL.secure_compare("aaa", "bbb"))
41+
assert_false(OpenSSL.secure_compare("aaa", "bbbb"))
4242
end
4343

4444
def test_memcmp_timing

0 commit comments

Comments
 (0)