byebug 2.1.1 → 2.2.0

data/test/finish_test.rb

@@ -1,29 +1,45 @@
 require_relative 'test_helper'
 
-class TestFinish < TestDsl::TestCase
+class FinishExample
+  def a
+    b
+  end
+  def b
+    c
+    2
+  end
+  def c
+    d
+    3
+  end
+  def d
+    5
+  end
+end
 
+class TestFinish < TestDsl::TestCase
   it 'must stop at the next frame by default' do
-    enter 'break 16', 'cont', 'finish'
+    enter "break #{__FILE__}:16", 'cont', 'finish'
     debug_file('finish') { $state.line.must_equal 13 }
   end
 
   it 'must stop at the #0 frame by default' do
-    enter 'break 16', 'cont', 'finish 0'
+    enter "break #{__FILE__}:16", 'cont', 'finish 0'
     debug_file('finish') { $state.line.must_equal 13 }
   end
 
   it 'must stop at the specified frame' do
-    enter 'break 16', 'cont', 'finish 1'
+    enter "break #{__FILE__}:16", 'cont', 'finish 1'
     debug_file('finish') { $state.line.must_equal 9 }
   end
 
   it 'must stop at the next frame if the current frame was changed' do
-    enter 'break 16', 'cont', 'up', 'finish'
+    enter "break #{__FILE__}:16", 'cont', 'up', 'finish'
     debug_file('finish') { $state.line.must_equal 9 }
   end
 
   describe 'not a number is specified for frame' do
-    before { enter 'break 16', 'cont', 'finish foo' }
+    before { enter "break #{__FILE__}:16", 'cont', 'finish foo' }
 
     it 'must show an error' do
       debug_file('finish')

data/test/frame_test.rb

@@ -1,10 +1,53 @@
 require_relative 'test_helper'
 
+class FrameExample
+  def initialize(f)
+    @f = f
+  end
+
+  def a
+    b
+  end
+
+  def b
+    c
+    2
+  end
+
+  def c
+    d('a')
+    3
+  end
+
+  def d(e)
+    5
+  end
+end
+
+class FrameDeepExample
+  def a
+    z = 1
+    z += b
+  end
+  def b
+    z = 2
+    z += c
+  end
+  def c
+    z = 3
+    byebug
+    z += d('a')
+  end
+  def d(e)
+    4
+  end
+end
+
 class TestFrame < TestDsl::TestCase
   describe 'when byebug started at the beginning' do
     before do
       @tst_file = fullpath('frame')
-      enter 'break 23', 'cont'
+      enter "break #{__FILE__}:23", 'cont'
     end
 
     it 'must go up' do
@@ -35,7 +78,7 @@ class TestFrame < TestDsl::TestCase
     it 'must print current stack frame when without arguments' do
       enter 'up', 'frame'
       debug_file('frame')
-      check_output_includes /#1  FrameExample\.c\s+at #{@tst_file}:18/
+      check_output_includes(/#1  FrameExample\.c\s+at #{__FILE__}:18/)
     end
 
     it 'must set frame to the first one' do
@@ -45,7 +88,7 @@ class TestFrame < TestDsl::TestCase
 
     it 'must set frame to the last one' do
       enter 'frame -1'
-      debug_file('frame') { $state.file.must_match /minitest\/unit.rb/ }
+      debug_file('frame') { $state.file.must_match(/minitest\/unit.rb/) }
     end
 
     it 'must not set frame if the frame number is too low' do
@@ -63,21 +106,16 @@ class TestFrame < TestDsl::TestCase
     end
 
     describe 'fullpath' do
-      def short_path(fullpath)
-        separator = File::ALT_SEPARATOR || File::SEPARATOR
-        "...#{separator}" + fullpath.split(separator)[-3..-1].join(separator)
-      end
-
       describe 'when set' do
         temporary_change_hash Byebug.settings, :fullpath, true
 
         it 'must display current backtrace with fullpaths' do
           enter 'where'
           debug_file 'frame'
-          check_output_includes \
-            /--> #0  FrameExample\.d\(e#String\)\s+at #{@tst_file}:23/,
-                /#1  FrameExample\.c\s+at #{@tst_file}:18/,
-                /#2  FrameExample\.b\s+at #{@tst_file}:13/
+          check_output_includes(
+            /--> #0  FrameExample\.d\(e#String\)\s+at #{__FILE__}:23/,
+                /#1  FrameExample\.c\s+at #{__FILE__}:18/,
+                /#2  FrameExample\.b\s+at #{__FILE__}:13/)
         end
       end
 
@@ -87,11 +125,11 @@ class TestFrame < TestDsl::TestCase
         it 'must display current backtrace with shortpaths' do
           enter 'where'
           debug_file 'frame'
-          check_output_includes \
-            /--> #0  FrameExample\.d\(e#String\)\s+at #{short_path(@tst_file)}:23/,
-                /#1  FrameExample\.c\s+at #{short_path(@tst_file)}:18/,
-                /#2  FrameExample\.b\s+at #{short_path(@tst_file)}:13/,
-                /#3  FrameExample\.a\s+at #{short_path(@tst_file)}:9/
+          check_output_includes(
+            /--> #0  FrameExample\.d\(e#String\)\s+at #{shortpath(__FILE__)}:23/,
+                /#1  FrameExample\.c\s+at #{shortpath(__FILE__)}:18/,
+                /#2  FrameExample\.b\s+at #{shortpath(__FILE__)}:13/,
+                /#3  FrameExample\.a\s+at #{shortpath(__FILE__)}:9/)
         end
       end
     end
@@ -103,11 +141,11 @@ class TestFrame < TestDsl::TestCase
         it 'displays current backtrace with callstyle "long"' do
           enter 'where'
           debug_file 'frame'
-          check_output_includes \
-            /--> #0  FrameExample\.d\(e#String\)\s+at #{@tst_file}:23/,
-                /#1  FrameExample\.c\s+at #{@tst_file}:18/,
-                /#2  FrameExample\.b\s+at #{@tst_file}:13/,
-                /#3  FrameExample\.a\s+at #{@tst_file}:9/
+          check_output_includes(
+            /--> #0  FrameExample\.d\(e#String\)\s+at #{__FILE__}:23/,
+                /#1  FrameExample\.c\s+at #{__FILE__}:18/,
+                /#2  FrameExample\.b\s+at #{__FILE__}:13/,
+                /#3  FrameExample\.a\s+at #{__FILE__}:9/)
         end
       end
 
@@ -117,81 +155,76 @@ class TestFrame < TestDsl::TestCase
         it 'displays current backtrace with callstyle "short"' do
             enter 'where'
             debug_file 'frame'
-            check_output_includes /--> #0  d\(e\)\s+at #{@tst_file}:23/,
-                                      /#1  c\s+at #{@tst_file}:18/,
-                                      /#2  b\s+at #{@tst_file}:13/,
-                                      /#3  a\s+at #{@tst_file}:9/
+            check_output_includes(/--> #0  d\(e\)\s+at #{__FILE__}:23/,
+                                      /#1  c\s+at #{__FILE__}:18/,
+                                      /#2  b\s+at #{__FILE__}:13/,
+                                      /#3  a\s+at #{__FILE__}:9/)
         end
       end
     end
   end
 
   describe 'when byebug is started deep in the callstack' do
-    before { @tst_file = fullpath('frame_deep') }
+    before { enter "break #{__FILE__}:42", 'cont' }
 
     it 'must print backtrace' do
-      enter 'break 16', 'cont', 'where'
+      enter 'where'
       debug_file 'frame_deep'
-      check_output_includes \
-        /--> #0  FrameDeepExample\.d\(e#String\)\s+at #{@tst_file}:16/,
-            /#1  FrameDeepExample\.c\s+at #{@tst_file}:13/,
-            /#2  FrameDeepExample\.b\s+at #{@tst_file}:8/
+      check_output_includes(
+        /--> #0  FrameDeepExample\.d\(e#String\)\s+at #{__FILE__}:42/,
+            /#1  FrameDeepExample\.c\s+at #{__FILE__}:39/,
+            /#2  FrameDeepExample\.b\s+at #{__FILE__}:34/)
     end
 
     it 'must go up' do
-      enter 'break 16', 'cont', 'up'
-      debug_file('frame_deep') { $state.line.must_equal 13 }
+      enter 'up'
+      debug_file('frame_deep') { $state.line.must_equal 39 }
     end
 
     it 'must go down' do
-      enter 'break 16', 'cont', 'up', 'down'
-      debug_file('frame_deep') { $state.line.must_equal 16 }
+      enter 'up', 'down'
+      debug_file('frame_deep') { $state.line.must_equal 42 }
     end
 
     it 'must set frame' do
-      enter 'break 16', 'cont', 'frame 2'
-      debug_file('frame_deep') { $state.line.must_equal 8 }
+      enter 'frame 2'
+      debug_file('frame_deep') { $state.line.must_equal 34 }
     end
 
     it 'must eval properly when scaling the stack' do
-      enter 'break 16', 'cont', 'p z', 'up', 'p z', 'up', 'p z'
+      enter 'p z', 'up', 'p z', 'up', 'p z'
       debug_file('frame_deep')
       check_output_includes 'nil', '3', '2'
     end
   end
 
-  describe 'c-frames (issue #10)' do
-    before do
-      @tst_file = fullpath('frame')
-      enter 'break 5', 'cont'
-    end
-
+  describe 'c-frames' do
     it 'must mark c-frames when printing the stack' do
+      enter "break #{__FILE__}:5", 'cont', 'where'
       enter 'where'
       debug_file 'frame'
-      check_output_includes \
-        /--> #0  FrameExample.initialize\(f#String\)\s+at #{@tst_file}:5/,
-            /ͱ-- #1  Class.new\(\*args\)\s+at #{@tst_file}:28/,
-            /#2  <top \(required\)>\s+at #{@tst_file}:28/
+      check_output_includes(
+        /--> #0  FrameExample.initialize\(f#String\)\s+at #{__FILE__}:5/,
+            /ͱ-- #1  Class.new\(\*args\)\s+at #{fullpath('frame')}:3/,
+            /#2  <top \(required\)>\s+at #{fullpath('frame')}:3/)
     end
 
-    it 'must not navigate "up" to c-frames' do
-      enter 'up', 'eval local_var'
+    it '"up" skips c-frames' do
+      enter "break #{__FILE__}:9", 'cont', 'up', 'eval fr_ex.class.to_s'
       debug_file 'frame'
-      check_output_includes '"hola"'
+      check_output_includes '"FrameExample"'
     end
 
-    it 'must not navigate "down" to c-frames' do
-      enter 'up', 'down', 'eval f'
+    it '"down" skips c-frames' do
+      enter "break #{__FILE__}:9", 'cont', 'up', 'down', 'eval @f'
       debug_file 'frame'
       check_output_includes '"f"'
     end
 
     it 'must not jump straigh to c-frames' do
-      enter 'frame 1'
+      enter "break #{__FILE__}:5", 'cont', 'frame 1'
       debug_file 'frame'
       check_output_includes "Can't navigate to c-frame", interface.error_queue
     end
   end
-
 end

data/test/info_test.rb

@@ -1,33 +1,61 @@
 require_relative 'test_helper'
 
+class InfoExample
+  def initialize
+    @foo = "bar"
+    @bla = "blabla"
+  end
+
+  def a(y, z)
+    w = "1" * 30
+    x = 2
+    w + x.to_s + y + z + @foo
+  end
+
+  def c
+    a = BasicObject.new
+    a
+  end
+
+  def b
+    a('a', 'b')
+    e = "%.2f"
+    e
+  end
+
+  def d
+    raise "bang"
+  rescue
+  end
+
+end
+
 class TestInfo < TestDsl::TestCase
   include Columnize
 
   describe 'Args info' do
-    temporary_change_hash Byebug.settings, :width, 15
-
     it 'must show info about all args' do
-      enter 'break 3', 'cont', 'info args'
+      enter "break #{__FILE__}:12", 'cont', 'info args'
       debug_file 'info'
-      check_output_includes 'a = "aaaaaaa...', 'b = "b"'
+      check_output_includes 'y = "a"', 'z = "b"'
     end
   end
 
   describe 'Breakpoints info' do
     it 'must show info about all breakpoints' do
-      enter 'break 7', 'break 9 if a == b', 'info breakpoints'
+      enter 'break 4', 'break 5 if y == z', 'info breakpoints'
       debug_file 'info'
       check_output_includes 'Num Enb What',
-                            /\d+ +y   at #{fullpath('info')}:7/,
-                            /\d+ +y   at #{fullpath('info')}:9 if a == b/
+                            /\d+ +y   at #{fullpath('info')}:4/,
+                            /\d+ +y   at #{fullpath('info')}:5 if y == z/
     end
 
     it 'must show info about specific breakpoint' do
-      enter 'break 7', 'break 9',
+      enter 'break 4', 'break 5',
             ->{ "info breakpoints #{Byebug.breakpoints.first.id}" }
       debug_file 'info'
-      check_output_includes 'Num Enb What', /\d+ +y   at #{fullpath('info')}:7/
-      check_output_doesnt_include  /\d+ +y   at #{fullpath('info')}:9/
+      check_output_includes 'Num Enb What', /\d+ +y   at #{fullpath('info')}:4/
+      check_output_doesnt_include(/\d+ +y   at #{fullpath('info')}:5/)
     end
 
     it 'must show an error if no breakpoints are found' do
@@ -37,16 +65,16 @@ class TestInfo < TestDsl::TestCase
     end
 
     it 'must show an error if no breakpoints are found' do
-      enter 'break 7', 'info breakpoints 123'
+      enter 'break 4', 'info breakpoints 123'
       debug_file 'info'
       check_error_includes 'No breakpoints found among list given.'
     end
 
     it 'must show hit count' do
-      enter 'break 9', 'cont', 'info breakpoints'
+      enter 'break 5', 'cont', 'info breakpoints'
       debug_file 'info'
-      check_output_includes \
-        /\d+ +y   at #{fullpath('info')}:9/, 'breakpoint already hit 1 time'
+      check_output_includes(
+        /\d+ +y   at #{fullpath('info')}:5/, 'breakpoint already hit 1 time')
     end
   end
 
@@ -68,7 +96,7 @@ class TestInfo < TestDsl::TestCase
   end
 
   describe 'Files info' do
-    let(:files) { (LineCache.cached_files + SCRIPT_LINES__.keys).uniq.sort }
+    let(:files) { SCRIPT_LINES__.keys.uniq.sort }
 
     it 'must show all files read in' do
       enter 'info files'
@@ -129,12 +157,12 @@ class TestInfo < TestDsl::TestCase
     end
 
     it 'must show breakpoints in the file' do
-      enter 'break 5', 'break 7', "info file #{file} breakpoints"
+      enter 'break 4', 'break 5', "info file #{file} breakpoints"
       debug_file 'info'
-      check_output_includes /Created breakpoint \d+ at #{file}:5/,
-                            /Created breakpoint \d+ at #{file}:7/,
+      check_output_includes(/Created breakpoint \d+ at #{file}:4/,
+                            /Created breakpoint \d+ at #{file}:5/,
                             filename,
-                            'breakpoint line numbers:', breakpoint_line_numbers
+                            'breakpoint line numbers:', breakpoint_line_numbers)
       check_output_doesnt_include lines, mtime, sha1
     end
 
@@ -145,12 +173,6 @@ class TestInfo < TestDsl::TestCase
         filename, lines, breakpoint_line_numbers, mtime, sha1
     end
 
-    it 'must not show info about the file if the file is not loaded' do
-      enter "info file #{fullpath('info2')} basic"
-      debug_file 'info'
-      check_output_includes "File #{fullpath('info2')} is not cached"
-    end
-
     it 'must not show any info if the parameter is invalid' do
       enter "info file #{file} blabla"
       debug_file 'info'
@@ -160,7 +182,7 @@ class TestInfo < TestDsl::TestCase
 
   describe 'Instance variables info' do
     it 'must show instance variables' do
-      enter 'break 21', 'cont', 'info instance_variables'
+      enter "break #{__FILE__}:12", 'cont', 'info instance_variables'
       debug_file 'info'
       check_output_includes '@bla = "blabla"', '@foo = "bar"'
     end
@@ -168,9 +190,9 @@ class TestInfo < TestDsl::TestCase
 
   describe 'Line info' do
     it 'must show the current line' do
-      enter 'break 21', 'cont', 'info line'
+      enter "break #{__FILE__}:12", 'cont', 'info line'
       debug_file 'info'
-      check_output_includes "Line 21 of \"#{fullpath('info')}\""
+      check_output_includes "Line 12 of \"#{__FILE__}\""
     end
   end
 
@@ -178,13 +200,13 @@ class TestInfo < TestDsl::TestCase
     temporary_change_hash Byebug.settings, :width, 28
 
     it 'must show the current local variables' do
-      enter 'break 21', 'cont', 'info locals'
+      enter "break #{__FILE__}:12", 'cont', 'info locals'
       debug_file 'info'
-      check_output_includes 'a = "11111111111111111111...', 'b = 2'
+      check_output_includes 'w = "11111111111111111111...', 'x = 2'
     end
 
     it 'must fail if local variable doesn\'t respond to #to_s or to #inspect' do
-      enter 'break 26', 'cont', 'info locals'
+      enter "break #{__FILE__}:17", 'cont', 'info locals'
       debug_file 'info'
       check_output_includes 'a = *Error in evaluation*'
     end
@@ -207,17 +229,19 @@ class TestInfo < TestDsl::TestCase
     end
 
     it 'must show the breakpoint stop reason' do
-      enter 'break 7', 'cont', 'info program'
+      enter 'break 4', 'cont', 'info program'
       debug_file 'info'
       check_output_includes 'Program stopped.', 'It stopped at a breakpoint.'
     end
 
     it 'must show the catchpoint stop reason' do
-      skip('TODO')
+      enter 'catch Exception', 'cont', 'info program'
+      debug_file 'info'
+      check_output_includes 'Program stopped.', 'It stopped at a catchpoint.'
     end
 
     it 'must show the unknown stop reason' do
-      enter 'break 7', 'cont',
+      enter 'break 5', 'cont',
              ->{ context.stubs(:stop_reason).returns('blabla'); 'info program' }
       debug_file 'info'
       check_output_includes 'Program stopped.', 'unknown reason: blabla'
@@ -230,11 +254,12 @@ class TestInfo < TestDsl::TestCase
 
   describe 'Stack info' do
     it 'must show stack info' do
-      enter 'set fullpath', 'break 20', 'cont', 'info stack'
+      enter 'set fullpath', "break #{__FILE__}:10", 'cont', 'info stack'
       debug_file 'info'
-      check_output_includes /--> #0  InfoExample.a\s+at #{fullpath('info')}:20/,
-                                /#1  InfoExample.b\s+at #{fullpath('info')}:30/,
-                                /#2  <top \(required\)>\s+at #{fullpath('info')}:36/
+      check_output_includes(
+        /--> #0  InfoExample.a\(y\#String, z\#String\)\s+at #{__FILE__}:10/,
+            /#1  InfoExample.b\s+at #{__FILE__}:21/,
+            /#2  <top \(required\)>\s+at #{fullpath('info')}:4/)
     end
   end
 
@@ -250,17 +275,17 @@ class TestInfo < TestDsl::TestCase
     temporary_change_hash Byebug.settings, :width, 30
 
     it 'must show all variables' do
-      enter 'break 21', 'cont', 'info variables'
+      enter "break #{__FILE__}:12", 'cont', 'info variables'
       debug_file 'info'
-      check_output_includes 'a = "1111111111111111111111...',
-                            'b = 2',
-                            /self = #<InfoExample:\S+.../,
+      check_output_includes(/self = #<InfoExample:\S+.../,
+                            'w = "1111111111111111111111...',
+                            'x = 2',
                             '@bla = "blabla"',
-                            '@foo = "bar"'
+                            '@foo = "bar"')
     end
 
     it 'must fail if the variable doesn\'t respond to #to_s or to #inspect' do
-      enter 'break 26', 'cont', 'info variables'
+      enter "break #{__FILE__}:17", 'cont', 'info variables'
       debug_file 'info'
       check_output_includes 'a = *Error in evaluation*',
                             /self = #<InfoExample:\S+.../,
@@ -269,7 +294,7 @@ class TestInfo < TestDsl::TestCase
     end
 
     it 'must correctly print variables containing % sign' do
-      enter 'break 32', 'cont', 'info variables'
+      enter "break #{__FILE__}:23", 'cont', 'info variables'
       debug_file 'info'
       check_output_includes 'e = "%.2f"'
     end
@@ -279,7 +304,7 @@ class TestInfo < TestDsl::TestCase
     it 'must show help when typing just "info"' do
       enter 'info', 'cont'
       debug_file 'info'
-      check_output_includes /List of "info" subcommands:/
+      check_output_includes(/List of "info" subcommands:/)
     end
   end
 end