debugger 1.4.0 → 1.5.0

data/test/conditions_test.rb

@@ -15,6 +15,12 @@ describe "Conditions" do
       it "must assign that expression to breakpoint" do
         debug_file('conditions') { breakpoint.expr.must_equal "b == 5" }
       end
+
+      it "must show a successful message" do
+        id = nil
+        debug_file('conditions') { id = breakpoint.id }
+        check_output_includes "Condition 'b == 5' is set for the breakpoint #{id}"
+      end
     end
 
     it "must not stop at the breakpoint if condition is false" do
@@ -49,20 +55,26 @@ describe "Conditions" do
     it "must not stop on the breakpoint" do
       debug_file('conditions') { state.line.must_equal 3 }
     end
+
+    it "must show a successful message" do
+      id = nil
+      debug_file('conditions') { id = breakpoint.id }
+      check_output_includes "Condition is cleared for the breakpoint #{id}"
+    end
   end
 
 
   describe "errors" do
-    it "must show error if there are no breakpoints" do
-      enter 'cond 1 true'
-      debug_file('conditions')
-      check_output_includes "No breakpoints have been set."
-    end
-
     it "must not set breakpoint condition if breakpoint id is incorrect" do
       enter 'break 3', 'cond 8 b == 3', 'cont'
       debug_file('conditions') { state.line.must_equal 3 }
     end
+
+    it "must show error if there are no breakpoints" do
+      enter 'cond 1 true'
+      debug_file('conditions')
+      check_output_includes "No breakpoints have been set"
+    end
   end
 
 

data/test/continue_test.rb

@@ -21,7 +21,7 @@ describe "Continue Command" do
   it "must show error if there is no specified line" do
     enter 'cont 123'
     debug_file('continue')
-    check_output_includes "Line 123 is not a stopping point in file \"#{fullpath('continue')}\".", interface.error_queue
+    check_output_includes "Line 123 is not a stopping point in file '#{fullpath('continue')}'", interface.error_queue
   end
 
   it "must ignore the line if the context is dead"

data/test/display_test.rb

@@ -6,13 +6,13 @@ describe "Display Command" do
   it "must show expressions" do
     enter 'display d + 1', 'break 3', 'cont'
     debug_file('display')
-    check_output_includes "1: ", "d + 1 = 5"
+    check_output_includes "1: d + 1 = 5"
   end
 
   it "must work with shortcut" do
     enter 'disp d + 1', 'break 3', 'cont'
     debug_file('display')
-    check_output_includes "1: ", "d + 1 = 5"
+    check_output_includes "1: d + 1 = 5"
   end
 
   it "must save displayed expressions" do
@@ -25,7 +25,7 @@ describe "Display Command" do
       Debugger.handler.display.concat([[true, "abc"], [true, "d"]]); 'display'
     end
     debug_file('display')
-    check_output_includes "1: ", "abc = ", "2: ", "d = 4"
+    check_output_includes "1: abc = \n2: d = 4"
   end
 
   describe "undisplay" do
@@ -51,7 +51,7 @@ describe "Display Command" do
 
         it "must not show any output" do
           debug_file('display')
-          check_output_doesnt_include "1: ", "abc = ", "2: ", "d = 4"
+          check_output_doesnt_include "1: abc = \n2: d = 4"
         end
       end
 
@@ -64,7 +64,7 @@ describe "Display Command" do
 
         it "must not show any output" do
           debug_file('display')
-          check_output_includes "1: ", "abc = ", "2: ", "d = 4"
+          check_output_includes "1: abc = \n2: d = 4"
         end
       end
     end
@@ -83,12 +83,12 @@ describe "Display Command" do
 
       it "must display only the active position" do
         debug_file('display')
-        check_output_includes "2: ", "d = 4"
+        check_output_includes "2: d = 4"
       end
 
       it "must not display the disabled position" do
         debug_file('display')
-        check_output_doesnt_include "1: ", "abc"
+        check_output_doesnt_include "1: abc"
       end
     end
   end
@@ -102,13 +102,13 @@ describe "Display Command" do
     it "must show an error if no displays are set" do
       enter 'disable display 1'
       debug_file('display')
-      check_output_includes "No display expressions have been set.", interface.error_queue
+      check_output_includes "No display expressions have been set", interface.error_queue
     end
 
     it "must show an error if there is no such display position" do
       enter 'display d', 'disable display 4'
       debug_file('display')
-      check_output_includes "Disable display argument '4' needs to at most 1."
+      check_output_includes "Disable display argument '4' needs to at most 1"
     end
   end
 
@@ -125,7 +125,7 @@ describe "Display Command" do
     it "must show display expression in annotation" do
       enter 'display 2 + 2', 'set annotate 3', 'next', 'next'
       debug_file 'display'
-      check_output_includes "\x1A\x1Adisplay", "1:", "2 + 2 = 4"
+      check_output_includes "\x1A\x1Adisplay", "1: 2 + 2 = 4"
     end
   end
 
@@ -134,7 +134,7 @@ describe "Display Command" do
     it "must be able to set display expressions in post-mortem mode" do
       enter 'cont', 'display 2 + 2', 'cont'
       debug_file("post_mortem")
-      check_output_includes "1:", "2 + 2 = 4"
+      check_output_includes "1: 2 + 2 = 4"
     end
   end
 

data/test/edit_test.rb

@@ -30,7 +30,7 @@ describe "Edit Command" do
   it "must show an error if there is no such line" do
     enter "edit #{fullpath('edit3')}:6"
     debug_file 'edit'
-    check_output_includes "File \"#{fullpath('edit3')}\" is not readable.", interface.error_queue
+    check_output_includes "File '#{fullpath('edit3')}' is not readable", interface.error_queue
   end
 
   it "must show an error if there is incorrect syntax" do
@@ -39,7 +39,6 @@ describe "Edit Command" do
     check_output_includes "Invalid file/line number specification: blabla", interface.error_queue
   end
 
-
   describe "Post Mortem" do
     # TODO: This test fails with "Segmentation fault". Probably need to fix it somehow, or forbid this
     # command in the post mortem mode

data/test/eval_test.rb

@@ -31,25 +31,24 @@ describe "Eval Command" do
     end
   end
 
-  describe "stack trace on error" do
+  describe "evaluate with error" do
     temporary_change_hash_value(Debugger::Command.settings, :stack_trace_on_error, false)
 
     it "must show a stack trace if showing trace on error is enabled" do
       enter 'set notrace', 'eval 2 / 0'
       debug_file 'eval'
-      check_output_includes "ZeroDivisionError Exception: divided by 0"
-      check_output_doesnt_include /\S+:\d+:in `eval':divided by 0/
+      check_output_includes "ZeroDivisionError Exception: divided by 0", interface.error_queue
+      check_output_doesnt_include /\S+:\d+:in `eval':divided by 0/, interface.error_queue
     end
 
     it "must show a stack trace if showing trace on error is enabled" do
       enter 'set trace', 'eval 2 / 0'
       debug_file 'eval'
-      check_output_includes /\S+:\d+:in `eval':divided by 0/
-      check_output_doesnt_include "ZeroDivisionError Exception: divided by 0"
+      check_output_includes /\S+:\d+:in `eval':divided by 0/, interface.error_queue
+      check_output_doesnt_include "ZeroDivisionError Exception: divided by 0", interface.error_queue
     end
   end
 
-
   it "must pretty print the expression result" do
     enter 'pp {a: "3" * 40, b: "4" * 30}'
     debug_file 'eval'

data/test/finish_test.rb

@@ -28,7 +28,7 @@ describe "Finish Command" do
 
     it "must show an error" do
       debug_file('finish')
-      check_output_includes "Finish argument 'foo' needs to be a number."
+      check_output_includes "Finish argument 'foo' needs to be a number"
     end
 
     it "must be on the same line" do

data/test/frame_test.rb

@@ -36,7 +36,7 @@ describe "Frame Command" do
   it "must print current stack frame when without arguments" do
     enter 'break 25', 'cont', 'up', 'frame'
     debug_file('frame')
-    check_output_includes "#0 ", "A.d(e#String)"
+    check_output_includes "#0 A.d(e#String)\n   at line #{fullpath('frame')}:25"
   end
 
   it "must set frame to the first one" do
@@ -46,19 +46,19 @@ describe "Frame Command" do
 
   it "must set frame to the last one" do
     enter 'break 25', 'cont', 'frame -1'
-    debug_file('frame') { state.line.must_equal 73 }
+    debug_file('frame') { state.line.must_equal 29 }
   end
 
   it "must not set frame if the frame number is too low" do
     enter 'break 25', 'cont', 'down'
     debug_file('frame') { state.line.must_equal 25 }
-    check_output_includes "Adjusting would put us beyond the newest (innermost) frame.", interface.error_queue
+    check_output_includes "Adjusting would put us beyond the newest (innermost) frame", interface.error_queue
   end
 
   it "must not set frame if the frame number is too high" do
     enter 'break 25', 'cont', 'up 100'
     debug_file('frame') { state.line.must_equal 25 }
-    check_output_includes "Adjusting would put us beyond the oldest (initial) frame.", interface.error_queue
+    check_output_includes "Adjusting would put us beyond the oldest (initial) frame", interface.error_queue
   end
 
   describe "full path settings" do
@@ -72,45 +72,47 @@ describe "Frame Command" do
     it "must display current backtrace with full path = true" do
       enter 'set fullpath', 'break 25', 'cont', 'where'
       debug_file('frame')
-      check_output_includes(
-        "-->", "#0", "A.d(e#String)", "at line #{fullpath('frame')}:25",
-               "#1", "A.c", "at line #{fullpath('frame')}:21"
-      )
+      check_output_includes(Regexp.new(
+        "--> #0 A.d\\(e#String\\)\\n" +
+        "       at line #{fullpath('frame')}:25\\n" +
+        "    #1 A.c at line #{fullpath('frame')}:21\\n",
+      Regexp::MULTILINE))
     end
 
     it "must display current backtrace with full path = false" do
       enter 'set nofullpath', 'break 25', 'cont', 'where'
       debug_file('frame')
-      check_output_includes(
-        "-->", "#0", "A.d(e#String)", "at line #{short_path(fullpath('frame'))}:25",
-               "#1", "A.c", "at line #{short_path(fullpath('frame'))}:21"
-      )
+      check_output_includes(Regexp.new(
+        "--> #0 A.d\\(e#String\\) at line #{short_path(fullpath('frame'))}:25\\n" +
+        "    #1 A.c at line #{short_path(fullpath('frame'))}:21",
+      Regexp::MULTILINE))
     end
   end
 
   describe "display backtrace with callstyle" do
     temporary_change_hash_value(Debugger::Command.settings, :callstyle, :last)
 
-    it "must display current backtrace" do
+    it "must display current backtrace with last callstyle" do
       enter 'set callstyle last', 'break 25', 'cont', 'where'
       debug_file('frame')
-      check_output_includes(
-        "-->", "#0", "A.d(e#String)", "at line #{fullpath('frame')}:25",
-               "#1", "A.c", "at line #{fullpath('frame')}:21",
-               "#2", "A.b", "at line #{fullpath('frame')}:17",
-               "#3", "A.a", "at line #{fullpath('frame')}:14"
-      )
+      check_output_includes(Regexp.new(
+        "--> #0 A.d\\(e#String\\)\\n" +
+        "       at line #{fullpath('frame')}:25\\n" +
+        "    #1 A.c at line #{fullpath('frame')}:21\\n" +
+        "    #2 A.b at line #{fullpath('frame')}:17\\n" +
+        "    #3 A.a at line #{fullpath('frame')}:14\\n",
+      Regexp::MULTILINE))
     end
 
-    it "must display current backtrace" do
+    it "must display current backtrace with short callstyle" do
       enter 'set callstyle short', 'break 25', 'cont', 'where'
       debug_file('frame')
-      check_output_includes(
-        "-->", "#0", "d(e)", "at line #{fullpath('frame')}:25",
-               "#1", "c", "at line #{fullpath('frame')}:21",
-               "#2", "b", "at line #{fullpath('frame')}:17",
-               "#3", "a", "at line #{fullpath('frame')}:14"
-      )
+      check_output_includes(Regexp.new(
+        "--> #0 d\\(e\\) at line #{fullpath('frame')}:25\\n" +
+        "    #1 c at line #{fullpath('frame')}:21\\n" +
+        "    #2 b at line #{fullpath('frame')}:17\\n" +
+        "    #3 a at line #{fullpath('frame')}:14\\n",
+      Regexp::MULTILINE))
     end
 
     # NOTE: We also have support of 'tracked' callstyle in the code, but by some reason
@@ -118,7 +120,7 @@ describe "Frame Command" do
     it "must not set 'tracked' callstyle" do
       enter 'set callstyle tracked'
       debug_file('frame')
-      check_output_includes "Invalid call style tracked. Should be one of: 'short' or 'last'."
+      check_output_includes "Invalid call style tracked. Should be one of: 'short' or 'last'"
       Debugger::Command.settings[:callstyle].must_equal :last
     end
   end

data/test/help_test.rb

@@ -38,7 +38,6 @@ describe "Help Command" do
     check_output_includes Debugger::AddBreakpoint.help(nil).split("\n").map { |l| l.gsub(/^ +/, '') }.join("\n")
   end
 
-
   describe "Post Mortem" do
     it "must work in post-mortem mode" do
       enter 'cont', 'help'

data/test/info_test.rb

@@ -162,7 +162,7 @@ describe "Info Command" do
     it "must show instance variables" do
       enter 'break 21', 'cont', 'info instance_variables'
       debug_file 'info'
-      check_output_includes '@bla = "blabla"', '@foo = "bar"'
+      check_output_includes %{@bla = "blabla"\n@foo = "bar"}
     end
   end
 
@@ -224,10 +224,10 @@ describe "Info Command" do
     it "must show stack info" do
       enter 'break 20', 'cont', 'info stack'
       debug_file 'info'
-      check_output_includes(
-        "-->", "#0", "A.a", "at line #{fullpath('info')}:20",
-               "#1",        "at line #{fullpath('info')}:30"
-      )
+      check_output_includes(Regexp.new(
+        "--> #0 A.a at line #{fullpath('info')}:20\\n" +
+        "    #1 A.b at line #{fullpath('info')}:30\\n",
+      Regexp::MULTILINE))
     end
   end
 
@@ -256,13 +256,13 @@ describe "Info Command" do
       thread_number = nil
       enter ->{thread_number = context.thnum; "info thread #{context.thnum}"}
       debug_file 'info'
-      check_output_includes "+", thread_number.to_s, /#<Thread:\S+ run>/
+      check_output_includes /\+ #{thread_number} #<Thread:\S+ run>/
     end
 
     it "must show verbose thread info" do
       enter 'break 20', 'cont', ->{"info thread #{context.thnum} verbose"}
       debug_file 'info'
-      check_output_includes /#<Thread:\S+ run>/, "#0", "A.a", "at line #{fullpath('info')}:20"
+      check_output_includes /#<Thread:\S+ run>/, "#0 A.a at line #{fullpath('info')}:20"
     end
 
     it "must show error when unknown parameter is used" do
@@ -276,7 +276,7 @@ describe "Info Command" do
     it "must show global variables" do
       enter 'info global_variables'
       debug_file 'info'
-      check_output_includes "$$ = #{Process.pid}"
+      check_output_includes /\$\$ = #{Process.pid}/
     end
   end
 
@@ -289,8 +289,7 @@ describe "Info Command" do
           'a = "1111111111111111111111...',
           "b = 2",
           /self = #<A:\S+.../,
-          '@bla = "blabla"',
-          '@foo = "bar"'
+          /@bla = "blabla"\n@foo = "bar"/
         )
       end
     end
@@ -301,8 +300,7 @@ describe "Info Command" do
       check_output_includes(
         'a = *Error in evaluation*',
         /self = #<A:\S+.../,
-        '@bla = "blabla"',
-        '@foo = "bar"'
+        /@bla = "blabla"\n@foo = "bar"/
       )
     end
 
@@ -313,7 +311,6 @@ describe "Info Command" do
     end
   end
 
-
   describe "Post Mortem" do
     it "must work in post-mortem mode" do
       enter 'cont', 'info line'
@@ -321,5 +318,4 @@ describe "Info Command" do
       check_output_includes "Line 8 of \"#{fullpath('post_mortem')}\""
     end
   end
-
 end

data/test/irb_test.rb

@@ -69,7 +69,6 @@ describe "Irb Command" do
     end
   end
 
-
   describe "Post Mortem" do
     it "must work in post-mortem mode" do
       irb.stubs(:eval_input).throws(:IRB_EXIT, :cont)

data/test/jump_test.rb

@@ -9,11 +9,24 @@ describe "Jump Command" do
       debug_file('jump') { state.line.must_equal 8 }
     end
 
+    describe "jumping to the same line" do
+      it "must jump to the same line" do
+        enter 'break 6', 'cont', "jump 6 #{fullpath('jump')}"
+        debug_file('jump') { state.line.must_equal 6 }
+      end
+
+      it "must show show the same position" do
+        enter 'break 6', 'cont', "jump 6 #{fullpath('jump')}"
+        debug_file('jump')
+        check_output_includes "#{fullpath('jump')}:6\nb = 3"
+      end
+    end
+
     it "must not initialize skipped variables during jump" do
       enter 'break 6', 'cont', "jump 8 #{fullpath('jump')}", 'next'
       enter 'var local'
       debug_file('jump')
-      check_output_includes "a => 2", "b => nil", "c => nil", "d => 5"
+      check_output_includes /a = 2\nb = nil\nc = nil\nd = 5\ne = nil\nf = nil/
     end
 
     it "must jump with relative line number (-)" do
@@ -25,6 +38,12 @@ describe "Jump Command" do
       enter 'break 8', 'cont', "jump +2 #{fullpath('jump')}"
       debug_file('jump') { state.line.must_equal 10 }
     end
+
+    it "must show message after jump" do
+      enter 'break 6', 'cont', "jump 8 #{fullpath('jump')}"
+      debug_file('jump')
+      check_output_includes "#{fullpath('jump')}:8\nd = 5"
+    end
   end
 
   describe "errors" do
@@ -37,7 +56,7 @@ describe "Jump Command" do
     it "must show an error if line number is not specified" do
       enter 'jump'
       debug_file('jump')
-      check_output_includes '"jump" must be followed by a line number', interface.error_queue
+      check_output_includes "'jump' must be followed by a line number", interface.error_queue
     end
 
     describe "when there is no active code in specified line" do