byebug 1.8.2 → 2.0.0

data/test/show_test.rb

@@ -1,18 +1,8 @@
 require_relative 'test_helper'
 
 class TestShow < TestDsl::TestCase
-
-  describe 'annotate' do
-    it 'must show annotate setting' do
-      enter 'show annotate'
-      debug_file 'show'
-      Byebug.annotate.must_equal 0
-      check_output_includes 'Annotation level is 0'
-    end
-  end
-
   describe 'args' do
-    temporary_change_hash Byebug::Command.settings, :argv, %w{foo bar}
+    temporary_change_hash Byebug.settings, :argv, %w{foo bar}
 
     describe 'default behaviour' do
       it 'must show args' do
@@ -109,11 +99,11 @@ class TestShow < TestDsl::TestCase
     end
   end
 
-  describe 'linetrace+' do
+  describe 'linetrace_plus' do
     it 'must show default value' do
-      enter 'show linetrace+'
+      enter 'show linetrace_plus'
       debug_file 'show'
-      check_output_includes 'line tracing style is every line.'
+      check_output_includes 'line tracing style is different consecutive lines.'
     end
   end
 
@@ -125,9 +115,9 @@ class TestShow < TestDsl::TestCase
     end
   end
 
-  describe 'trace' do
-    it 'must show trace' do
-      enter 'show trace'
+  describe 'stack_trace_on_error' do
+    it 'must show stack_trace_on_error' do
+      enter 'show stack_trace_on_error'
       debug_file 'show'
       check_output_includes 'Displaying stack trace is off.'
     end
@@ -137,7 +127,7 @@ class TestShow < TestDsl::TestCase
     it 'must show version' do
       enter 'show version'
       debug_file 'show'
-      check_output_includes "byebug #{Byebug::VERSION}"
+      check_output_includes "Byebug #{Byebug::VERSION}"
     end
   end
 
@@ -274,13 +264,4 @@ class TestShow < TestDsl::TestCase
       check_output_includes /List of "show" subcommands:/
     end
   end
-
-  describe 'Post Mortem' do
-    it 'must work in post-mortem mode' do
-      enter 'cont', 'show autolist'
-      debug_file 'post_mortem'
-      check_output_includes 'autolist is on.'
-    end
-  end
-
 end

data/test/source_test.rb

@@ -28,7 +28,7 @@ class TestSource < TestDsl::TestCase
   it 'must show an error if file is not found' do
     enter 'source blabla'
     debug_file 'source'
-    check_output_includes /File ".*blabla" not found/, interface.error_queue
+    check_error_includes /File ".*blabla" not found/
   end
 
   describe 'Help' do
@@ -39,11 +39,4 @@ class TestSource < TestDsl::TestCase
         "source FILE\texecutes a file containing byebug commands"
     end
   end
-
-  describe 'Post Mortem' do
-    it 'must work in post-mortem mode' do
-      enter 'cont', "so #{filename}"
-      debug_file('post_mortem') { Byebug.breakpoints[0].pos.must_equal 3 }
-    end
-  end
 end

data/test/stepping_test.rb

@@ -4,137 +4,106 @@ class TestStepping < TestDsl::TestCase
 
   describe 'Next Command' do
 
-    describe 'Usual mode' do
+    describe 'method call behaviour' do
+      before { enter 'break 10', 'cont' }
 
-      describe 'method call behaviour' do
-        before { enter 'break 10', 'cont' }
+      it 'must leave on the same line by default' do
+        enter 'next'
+        debug_file('stepping') { $state.line.must_equal 10 }
+      end
 
-        it 'must leave on the same line by default' do
-          enter 'next'
-          debug_file('stepping') { $state.line.must_equal 10 }
-        end
+      it 'must go to the next line if forced by "plus" sign' do
+        enter 'next+'
+        debug_file('stepping') { $state.line.must_equal 11 }
+      end
 
-        it 'must go to the next line if forced by "plus" sign' do
-          enter 'next+'
+      it 'must leave on the same line if forced by "minus" sign' do
+        enter 'next-'
+        debug_file('stepping') { $state.line.must_equal 10 }
+      end
+
+      describe 'when forcestep is set' do
+        temporary_change_hash Byebug.settings, :forcestep, true
+
+        it 'must go to the next line' do
+          enter 'next'
           debug_file('stepping') { $state.line.must_equal 11 }
         end
 
-        it 'must leave on the same line if forced by "minus" sign' do
-          enter 'next-'
-          debug_file('stepping') { $state.line.must_equal 10 }
+        it 'must go to the next line (by shortcut)' do
+          enter 'n'
+          debug_file('stepping') { $state.line.must_equal 11 }
         end
 
-        describe 'when force_stepping is set' do
-          temporary_change_hash Byebug::Command.settings, :force_stepping, true
-
-          it 'must go to the next line' do
-            enter 'next'
-            debug_file('stepping') { $state.line.must_equal 11 }
-          end
-
-          it 'must go to the next line (by shortcut)' do
-            enter 'n'
-            debug_file('stepping') { $state.line.must_equal 11 }
-          end
-
-          it 'must go the specified number of lines forward by default' do
-            enter 'next 2'
-            debug_file('stepping') { $state.line.must_equal 21 }
-          end
-
-          it 'must ignore it if "minus" is specified' do
-            enter 'next-'
-            debug_file('stepping') { $state.line.must_equal 10 }
-          end
+        it 'must go the specified number of lines forward by default' do
+          enter 'next 2'
+          debug_file('stepping') { $state.line.must_equal 21 }
         end
-      end
 
-      describe 'block behaviour' do
-        before { enter 'break 21', 'cont' }
-
-        it 'must step over blocks' do
-          enter 'next'
-          debug_file('stepping') { $state.line.must_equal 25 }
+        it 'must ignore it if "minus" is specified' do
+          enter 'next-'
+          debug_file('stepping') { $state.line.must_equal 10 }
         end
       end
-
     end
 
-    describe 'Post Mortem' do
-      temporary_change_hash Byebug::Command.settings, :autoeval, false
+    describe 'block behaviour' do
+      before { enter 'break 21', 'cont' }
 
-      it 'must not work in post-mortem mode' do
-        enter 'cont', 'next'
-        debug_file 'post_mortem'
-        check_output_includes \
-          'Unknown command: "next".  Try "help".', interface.error_queue
+      it 'must step over blocks' do
+        enter 'next'
+        debug_file('stepping') { $state.line.must_equal 25 }
       end
     end
-
   end
 
   describe 'Step Command' do
 
-    describe 'Usual mode' do
-
-      describe 'method call behaviour' do
-        before { enter 'break 10', 'cont' }
-
-        it 'must leave on the same line if forced by a setting' do
-          enter 'step'
-          debug_file('stepping') { $state.line.must_equal 10 }
-        end
+    describe 'method call behaviour' do
+      before { enter 'break 10', 'cont' }
 
-        it 'must go to the step line if forced to do that by "plus" sign' do
-          enter 'step+'
-          debug_file('stepping') { $state.line.must_equal 11 }
-        end
-
-        it 'must leave on the same line if forced to do that by "minus" sign' do
-          enter 'step-'
-          debug_file('stepping') { $state.line.must_equal 10 }
-        end
+      it 'must leave on the same line if forced by a setting' do
+        enter 'step'
+        debug_file('stepping') { $state.line.must_equal 10 }
+      end
 
-        describe 'when force_stepping is set' do
-          temporary_change_hash Byebug::Command.settings, :force_stepping, true
+      it 'must go to the step line if forced to do that by "plus" sign' do
+        enter 'step+'
+        debug_file('stepping') { $state.line.must_equal 11 }
+      end
 
-          it 'must go to the step line if forced by a setting' do
-            enter 'step'
-            debug_file('stepping') { $state.line.must_equal 11 }
-          end
+      it 'must leave on the same line if forced to do that by "minus" sign' do
+        enter 'step-'
+        debug_file('stepping') { $state.line.must_equal 10 }
+      end
 
-          it 'must go to the next line if forced by a setting (by shortcut)' do
-            enter 's'
-            debug_file('stepping') { $state.line.must_equal 11 }
-          end
+      describe 'when forcestep is set' do
+        temporary_change_hash Byebug.settings, :forcestep, true
 
-          it 'must go the specified number of lines forward by default' do
-            enter 'step 2'
-            debug_file('stepping') { $state.line.must_equal 15 }
-          end
+        it 'must go to the step line if forced by a setting' do
+          enter 'step'
+          debug_file('stepping') { $state.line.must_equal 11 }
         end
-      end
 
-      describe 'block behaviour' do
-        before { enter 'break 21', 'cont' }
+        it 'must go to the next line if forced by a setting (by shortcut)' do
+          enter 's'
+          debug_file('stepping') { $state.line.must_equal 11 }
+        end
 
-        it 'must step into blocks' do
-          enter 'step'
-          debug_file('stepping') { $state.line.must_equal 22 }
+        it 'must go the specified number of lines forward by default' do
+          enter 'step 2'
+          debug_file('stepping') { $state.line.must_equal 15 }
         end
       end
     end
 
-    describe 'Post Mortem' do
-      temporary_change_hash Byebug::Command.settings, :autoeval, false
+    describe 'block behaviour' do
+      before { enter 'break 21', 'cont' }
 
-      it 'must not work in post-mortem mode' do
-        enter 'cont', 'step'
-        debug_file 'post_mortem'
-        check_output_includes \
-          'Unknown command: "step".  Try "help".', interface.error_queue
+      it 'must step into blocks' do
+        enter 'step'
+        debug_file('stepping') { $state.line.must_equal 22 }
       end
     end
   end
-
 end

data/test/support/test_dsl.rb

@@ -4,8 +4,8 @@ module TestDsl
     include TestDsl
 
     def setup
-      Byebug.interface = TestInterface.new
-      Byebug.handler.display.clear
+      Byebug.handler = Byebug::CommandProcessor.new(TestInterface.new)
+      Byebug.tracing = false
     end
 
     def self.temporary_change_hash hash, key, value
@@ -42,14 +42,14 @@ module TestDsl
     end
   end
 
-  ##
+  #
   # Expand fullpath of a given example file
   #
   def fullpath(filename)
     (Pathname.new(__FILE__) + "../../examples/#{filename}.rb").cleanpath.to_s
   end
 
-  ##
+  #
   # Adds commands to the input queue, so they will be later retrieved by
   # Processor, i.e., it emulates user's input.
   #
@@ -68,7 +68,7 @@ module TestDsl
     interface.input_queue.concat(messages)
   end
 
-  ##
+  #
   # Runs byebug with the provided basename for a file.
   #
   # The file should be placed in the test/examples dir. You also can specify a
@@ -85,20 +85,11 @@ module TestDsl
   def debug_file(filename, &block)
     is_test_block_called = false
     debug_completed = false
-    exception = nil
     Byebug.stubs(:run_init_script)
     if block
       interface.test_block= lambda do
         is_test_block_called = true
-        # We need to store exception and reraise it after completing debugging,
-        # because Byebug will swallow any exceptions, so e.g. our failed
-        # assertions will be ignored
-        begin
-          block.call
-        rescue Exception => e
-          exception = e
-          raise e
-        end
+        block.call
       end
     end
     Byebug.start do
@@ -107,10 +98,9 @@ module TestDsl
     end
     flunk "Debug block was not completed" unless debug_completed
     flunk "Test block was provided, but not called" if block && !is_test_block_called
-    raise exception if exception
   end
 
-  ##
+  #
   # Checks the output of byebug.
   #
   # By default it checks output queue of the current interface, but you can
@@ -163,4 +153,9 @@ module TestDsl
     new_content = old_content.split("\n").tap { |c| c[line - 1] = new_line_content }.join("\n")
     File.open(file, 'w') { |f| f.write(new_content) }
   end
+
+  def must_restart
+    Byebug::RestartCommand.any_instance.unstub(:exec)
+    Byebug::RestartCommand.any_instance.expects(:exec)
+  end
 end

data/test/test_helper.rb

@@ -5,4 +5,4 @@ require 'byebug'
 
 Dir.glob(File.expand_path("../support/*.rb", __FILE__)).each { |f| require f }
 
-Byebug::Command.settings[:testing] = true
+Byebug.settings[:testing] = true

data/test/thread_test.rb

@@ -0,0 +1,106 @@
+require_relative 'test_helper'
+
+class TestThread < TestDsl::TestCase
+  let(:release) { 'eval Thread.main[:should_break] = true' }
+
+  describe 'list' do
+    it 'must show current thread by "plus" sign' do
+      thnum = nil
+      enter 'break 8', 'cont', 'thread list', release
+      debug_file('thread') { thnum = Byebug.contexts.first.thnum }
+      check_output_includes /\+ #{thnum} #<Thread:\S+ run>\t#{fullpath('thread')}:8/
+    end
+
+    it 'must work with shortcut' do
+      thnum = nil
+      enter 'break 8', 'cont', 'th list', release
+      debug_file('thread') { thnum = Byebug.contexts.first.thnum }
+      check_output_includes /\+ #{thnum} #<Thread:\S+ run>\t#{fullpath('thread')}:8/
+    end
+
+    it 'must show 3 available threads' do
+      enter 'break 21', 'cont', 'thread list', release
+      debug_file 'thread'
+      check_output_includes /(\+)?\d+ #<Thread:\S+ (sleep|run)>/,
+                            /(\+)?\d+ #<Thread:\S+ (sleep|run)>/,
+                            /(\+)?\d+ #<Thread:\S+ (sleep|run)>/
+    end
+  end
+
+  describe 'stop' do
+    it 'must mark thread as suspended' do
+      thnum = nil
+      enter 'c 21', ->{ "thread stop #{Byebug.contexts.last.thnum}" }, release
+      debug_file('thread') { thnum = Byebug.contexts.last.thnum }
+      check_output_includes /\$ #{thnum} #<Thread:/
+    end
+
+    it 'must actually suspend thread execution' do
+      enter 'c 21', 'trace on',
+            ->{ "thread stop #{Byebug.contexts.last.thnum}" }, release
+      debug_file('thread')
+      check_output_doesnt_include /Tracing: #{fullpath('thread')}:16/,
+                                  /Tracing: #{fullpath('thread')}:17/
+    end
+
+    it 'must show error message if thread number is not specified' do
+      enter 'break 8', 'cont', 'thread stop', release
+      debug_file 'thread'
+      check_error_includes '"thread stop" needs a thread number'
+    end
+
+    it 'must show error message when trying to stop current thread' do
+      enter 'cont 8', ->{"thread stop #{Byebug.contexts.first.thnum}"}, release
+      debug_file 'thread'
+      check_error_includes "It's the current thread"
+    end
+  end
+
+  describe 'resume' do
+    it 'must mark remove thread from the suspended state' do
+      thnum = nil
+      enter 'cont 21',
+            -> { thnum = Byebug.contexts.last.thnum ; "thread stop #{thnum}" },
+            -> { "thread resume #{thnum}" }, release
+      debug_file('thread') { Byebug.contexts.last.suspended?.must_equal false }
+      check_output_includes /\$ #{thnum} #<Thread:/, /#{thnum} #<Thread:/
+    end
+
+    it 'must show error message if thread number is not specified' do
+      enter 'break 8', 'cont', 'thread resume', release
+      debug_file 'thread'
+      check_error_includes '"thread resume" needs a thread number'
+    end
+
+    it 'must show error message when trying to resume current thread' do
+      enter 'c 8', ->{ "thread resume #{Byebug.contexts.first.thnum}" }, release
+      debug_file 'thread'
+      check_error_includes "It's the current thread"
+    end
+
+    it 'must show error message if it is not stopped' do
+      enter 'c 21', ->{ "thread resume #{Byebug.contexts.last.thnum}" }, release
+      debug_file 'thread'
+      check_error_includes 'Already running'
+    end
+  end
+
+  describe 'switch' do
+    it 'must switch to another thread' do
+      enter 'c 21', ->{ "thread switch #{Byebug.contexts.last.thnum}" }, release
+      debug_file('thread') { $state.line.must_equal 16 }
+    end
+
+    it 'must show error message if thread number is not specified' do
+      enter 'break 8', 'cont', 'thread switch', release
+      debug_file 'thread'
+      check_error_includes '"thread switch" needs a thread number'
+    end
+
+    it 'must show error message when trying to switch current thread' do
+      enter 'c 8', ->{ "thread switch #{Byebug.contexts.first.thnum}" }, release
+      debug_file 'thread'
+      check_error_includes "It's the current thread"
+    end
+  end
+end