diff options
author | Jean byroot Boussier <jean.boussier+github@shopify.com> | 2019-12-10 11:49:39 +0100 |
---|---|---|
committer | Koichi Sasada <ko1@atdot.net> | 2019-12-11 11:59:14 +0900 |
commit | 8a80bfcfd4d510a20a62e21d8d2f4119cb823d4f (patch) | |
tree | 80f9700e32b2a0cf89ba3b9bbcfe942252b5be87 /spec | |
parent | 6a7af800dbd45946caaadfc4a1212fc523afe58b (diff) | |
download | ruby-8a80bfcfd4d510a20a62e21d8d2f4119cb823d4f.tar.gz |
Make Thread#to_s consistent with Method and Proc to_s
Diffstat (limited to 'spec')
-rw-r--r-- | spec/ruby/core/thread/inspect_spec.rb | 42 | ||||
-rw-r--r-- | spec/ruby/core/thread/shared/to_s.rb | 53 | ||||
-rw-r--r-- | spec/ruby/core/thread/to_s_spec.rb | 6 |
3 files changed, 61 insertions, 40 deletions
diff --git a/spec/ruby/core/thread/inspect_spec.rb b/spec/ruby/core/thread/inspect_spec.rb index 4c635b7aaa..bd6e0c31fc 100644 --- a/spec/ruby/core/thread/inspect_spec.rb +++ b/spec/ruby/core/thread/inspect_spec.rb @@ -1,44 +1,6 @@ require_relative '../../spec_helper' -require_relative 'fixtures/classes' +require_relative 'shared/to_s' describe "Thread#inspect" do - it "can check it's own status" do - ThreadSpecs.status_of_current_thread.inspect.should include('run') - end - - it "describes a running thread" do - ThreadSpecs.status_of_running_thread.inspect.should include('run') - end - - it "describes a sleeping thread" do - ThreadSpecs.status_of_sleeping_thread.inspect.should include('sleep') - end - - it "describes a blocked thread" do - ThreadSpecs.status_of_blocked_thread.inspect.should include('sleep') - end - - it "describes a completed thread" do - ThreadSpecs.status_of_completed_thread.inspect.should include('dead') - end - - it "describes a killed thread" do - ThreadSpecs.status_of_killed_thread.inspect.should include('dead') - end - - it "describes a thread with an uncaught exception" do - ThreadSpecs.status_of_thread_with_uncaught_exception.inspect.should include('dead') - end - - it "describes a dying sleeping thread" do - ThreadSpecs.status_of_dying_sleeping_thread.inspect.should include('sleep') - end - - it "reports aborting on a killed thread" do - ThreadSpecs.status_of_dying_running_thread.inspect.should include('aborting') - end - - it "reports aborting on a killed thread after sleep" do - ThreadSpecs.status_of_dying_thread_after_sleep.inspect.should include('aborting') - end + it_behaves_like :thread_to_s, :inspect end diff --git a/spec/ruby/core/thread/shared/to_s.rb b/spec/ruby/core/thread/shared/to_s.rb new file mode 100644 index 0000000000..0c4e3c0b96 --- /dev/null +++ b/spec/ruby/core/thread/shared/to_s.rb @@ -0,0 +1,53 @@ +require_relative '../fixtures/classes' + +describe :thread_to_s, shared: true do + sep = ruby_version_is("2.7") ? " " : "@" + + it "returns a description including file and line number" do + Thread.new { "hello" }.send(@method).should =~ /^#<Thread:([^ ]*?)#{sep}#{Regexp.escape __FILE__}:#{__LINE__ } \w+>$/ + end + + it "has a binary encoding" do + Thread.new { "hello" }.send(@method).encoding.should == Encoding::BINARY + end + + it "can check it's own status" do + ThreadSpecs.status_of_current_thread.inspect.should include('run') + end + + it "describes a running thread" do + ThreadSpecs.status_of_running_thread.inspect.should include('run') + end + + it "describes a sleeping thread" do + ThreadSpecs.status_of_sleeping_thread.inspect.should include('sleep') + end + + it "describes a blocked thread" do + ThreadSpecs.status_of_blocked_thread.inspect.should include('sleep') + end + + it "describes a completed thread" do + ThreadSpecs.status_of_completed_thread.inspect.should include('dead') + end + + it "describes a killed thread" do + ThreadSpecs.status_of_killed_thread.inspect.should include('dead') + end + + it "describes a thread with an uncaught exception" do + ThreadSpecs.status_of_thread_with_uncaught_exception.inspect.should include('dead') + end + + it "describes a dying sleeping thread" do + ThreadSpecs.status_of_dying_sleeping_thread.inspect.should include('sleep') + end + + it "reports aborting on a killed thread" do + ThreadSpecs.status_of_dying_running_thread.inspect.should include('aborting') + end + + it "reports aborting on a killed thread after sleep" do + ThreadSpecs.status_of_dying_thread_after_sleep.inspect.should include('aborting') + end +end diff --git a/spec/ruby/core/thread/to_s_spec.rb b/spec/ruby/core/thread/to_s_spec.rb new file mode 100644 index 0000000000..cb182a017f --- /dev/null +++ b/spec/ruby/core/thread/to_s_spec.rb @@ -0,0 +1,6 @@ +require_relative '../../spec_helper' +require_relative 'shared/to_s' + +describe "Thread#to_s" do + it_behaves_like :thread_to_s, :to_s +end |