From 6cf568f4b56dcafc5c0fe84df2c0d2491fb0c62b Mon Sep 17 00:00:00 2001 From: hsbt Date: Mon, 14 Dec 2015 08:04:28 +0000 Subject: * bootstraptest/runner.rb: use safe navigation operator. [fix GH-1142] Patch by @mlarraz * test/openssl/test_pair.rb: ditto. * test/ruby/test_econv.rb: ditto. * test/ruby/test_settracefunc.rb: ditto. * test/thread/test_queue.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_econv.rb | 4 ++-- test/ruby/test_settracefunc.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/test_econv.rb b/test/ruby/test_econv.rb index 073355f319..5690ec75f2 100644 --- a/test/ruby/test_econv.rb +++ b/test/ruby/test_econv.rb @@ -18,8 +18,8 @@ class TestEncodingConverter < Test::Unit::TestCase def assert_errinfo(e_res, e_enc1, e_enc2, e_error_bytes, e_readagain_bytes, ec) assert_equal([e_res, e_enc1, e_enc2, - e_error_bytes && e_error_bytes.b, - e_readagain_bytes && e_readagain_bytes.b], + e_error_bytes&.b, + e_readagain_bytes&.b], ec.primitive_errinfo) end diff --git a/test/ruby/test_settracefunc.rb b/test/ruby/test_settracefunc.rb index ef5a0c0620..e5048adba1 100644 --- a/test/ruby/test_settracefunc.rb +++ b/test/ruby/test_settracefunc.rb @@ -464,7 +464,7 @@ class TestSetTraceFunc < Test::Unit::TestCase EOF self.class.class_eval{remove_const(:XYZZY)} ensure - trace.disable if trace && trace.enabled? + trace.disable if trace&.enabled? end answer_events = [ -- cgit v1.2.3