From 3098798044ada5a81862aa4668aaf7548f9b1c99 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Wed, 11 Dec 2019 16:41:37 +0900 Subject: Test `Thread#to_s` when used from to_s_spec.rb --- spec/ruby/core/thread/fixtures/classes.rb | 3 ++- spec/ruby/core/thread/shared/to_s.rb | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) (limited to 'spec') diff --git a/spec/ruby/core/thread/fixtures/classes.rb b/spec/ruby/core/thread/fixtures/classes.rb index c1f15935ee..23a090feb0 100644 --- a/spec/ruby/core/thread/fixtures/classes.rb +++ b/spec/ruby/core/thread/fixtures/classes.rb @@ -7,11 +7,12 @@ module ThreadSpecs end class Status - attr_reader :thread, :inspect, :status + attr_reader :thread, :inspect, :status, :to_s def initialize(thread) @thread = thread @alive = thread.alive? @inspect = thread.inspect + @to_s = thread.to_s @status = thread.status @stop = thread.stop? end diff --git a/spec/ruby/core/thread/shared/to_s.rb b/spec/ruby/core/thread/shared/to_s.rb index 0c4e3c0b96..e47426cf3f 100644 --- a/spec/ruby/core/thread/shared/to_s.rb +++ b/spec/ruby/core/thread/shared/to_s.rb @@ -12,42 +12,42 @@ describe :thread_to_s, shared: true do end it "can check it's own status" do - ThreadSpecs.status_of_current_thread.inspect.should include('run') + ThreadSpecs.status_of_current_thread.send(@method).should include('run') end it "describes a running thread" do - ThreadSpecs.status_of_running_thread.inspect.should include('run') + ThreadSpecs.status_of_running_thread.send(@method).should include('run') end it "describes a sleeping thread" do - ThreadSpecs.status_of_sleeping_thread.inspect.should include('sleep') + ThreadSpecs.status_of_sleeping_thread.send(@method).should include('sleep') end it "describes a blocked thread" do - ThreadSpecs.status_of_blocked_thread.inspect.should include('sleep') + ThreadSpecs.status_of_blocked_thread.send(@method).should include('sleep') end it "describes a completed thread" do - ThreadSpecs.status_of_completed_thread.inspect.should include('dead') + ThreadSpecs.status_of_completed_thread.send(@method).should include('dead') end it "describes a killed thread" do - ThreadSpecs.status_of_killed_thread.inspect.should include('dead') + ThreadSpecs.status_of_killed_thread.send(@method).should include('dead') end it "describes a thread with an uncaught exception" do - ThreadSpecs.status_of_thread_with_uncaught_exception.inspect.should include('dead') + ThreadSpecs.status_of_thread_with_uncaught_exception.send(@method).should include('dead') end it "describes a dying sleeping thread" do - ThreadSpecs.status_of_dying_sleeping_thread.inspect.should include('sleep') + ThreadSpecs.status_of_dying_sleeping_thread.send(@method).should include('sleep') end it "reports aborting on a killed thread" do - ThreadSpecs.status_of_dying_running_thread.inspect.should include('aborting') + ThreadSpecs.status_of_dying_running_thread.send(@method).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') + ThreadSpecs.status_of_dying_thread_after_sleep.send(@method).should include('aborting') end end -- cgit v1.2.3