debugger 1.4.0 → 1.5.0

data/test/method_test.rb

@@ -23,7 +23,7 @@ describe "Method Command" do
     it "must show an error if specified object is not a class or module" do
       enter 'break 15', 'cont', 'm a'
       debug_file 'method'
-      check_output_includes "Should be Class/Module: a"
+      check_output_includes "Should be Class/Module: a", interface.error_queue
     end
   end
 
@@ -48,13 +48,13 @@ describe "Method Command" do
     it "must show using full name command" do
       enter 'break 15', 'cont', 'method iv a'
       debug_file 'method'
-      check_output_includes '@a = "b"', '@c = "d"'
+      check_output_includes %{@a = b\n@c = d}
     end
 
     it "must show using shortcut" do
       enter 'break 15', 'cont', 'm iv a'
       debug_file 'method'
-      check_output_includes '@a = "b"', '@c = "d"'
+      check_output_includes %{@a = b\n@c = d}
     end
   end
 

data/test/new/printers/plain_test.rb

@@ -0,0 +1,84 @@
+require_relative '../test_helper'
+
+describe "Printers::Plain" do
+  include PrinterHelpers
+  include TestDsl
+
+  let(:klass) { Printers::Plain }
+  let(:printer) { klass.new }
+  let(:yaml_plain) do
+    {
+      "foo" => {
+        "bar" => "plain {zee}, {uga} gaa",
+        "with_c" => "{arg} bla|c",
+        "confirmations" => {
+          "okay" => "Okay?"
+        }
+      },
+      "variable" => {"variable" => "{key}: {value}"}
+    }
+  end
+
+  let(:yaml_base) do
+    {
+      "foo" => {
+        "bar" => "base {zee}, {uga} gaa",
+        "boo" => "{zee}, gau"
+      }
+    }
+  end
+
+  before do
+    YAML.stubs(:load_file).with(yaml_file_path('plain')).returns(yaml_plain)
+    YAML.stubs(:load_file).with(yaml_file_path('base')).returns(yaml_base)
+  end
+
+  describe "#print" do
+    it "must return correctly translated string" do
+      printer.print("foo.bar", zee: 'zuu', uga: 'aga').must_equal "plain zuu, aga gaa\n"
+    end
+
+    it "must add (y/n) to the confirmation strings" do
+      printer.print("foo.confirmations.okay").must_equal "Okay? (y/n) \n"
+    end
+
+    it "must use strings, inherited from base" do
+      printer.print("foo.boo", zee: 'zuu').must_equal "zuu, gau\n"
+    end
+  end
+
+  describe "errors" do
+    it "must show an error if there is no specified path" do
+      ->{ printer.print("foo.bla") }.must_raise klass::MissedPath
+    end
+
+    it "must show an error if there is no specified argument" do
+      ->{ printer.print("foo.bar", zee: 'zuu') }.must_raise klass::MissedArgument
+    end
+  end
+
+  describe "#print_collection" do
+    it "must print collection" do
+      printer.print_collection("foo.bar", [{uga: 'a'}, {uga: 'b'}]) do |item, index|
+        item.merge(zee: index)
+      end.must_equal "plain 0, a gaa\nplain 1, b gaa\n"
+    end
+
+    it "must columnize collection with modifier 'c'" do
+      temporary_change_hash_value(Debugger.settings, :width, 30) do
+        printer.print_collection("foo.with_c", (1..10)) { |i, _| {arg: i} }.must_equal(
+          "1 bla  4 bla  7 bla  10 bla\n" +
+          "2 bla  5 bla  8 bla\n" +
+          "3 bla  6 bla  9 bla\n"
+        )
+      end
+    end
+  end
+
+  describe "#print_variables" do
+    it "must print variables" do
+      printer.print_variables([['a', 'b'], ['c', 'd']], '').must_equal %{a: b\nc: d\n}
+    end
+  end
+
+end

data/test/reload_test.rb

@@ -7,13 +7,13 @@ describe "Reload Command" do
   it "must notify that automatic reloading is off" do
     enter 'reload'
     debug_file 'reload'
-    check_output_includes "Source code is reloaded. Automatic reloading is off."
+    check_output_includes "Source code is reloaded. Automatic reloading is off"
   end
 
   it "must notify that automatic reloading is on" do
     enter 'set autoreload', 'reload'
     debug_file 'reload'
-    check_output_includes "Source code is reloaded. Automatic reloading is on."
+    check_output_includes "Source code is reloaded. Automatic reloading is on"
   end
 
   describe "reloading" do

data/test/restart_test.rb

@@ -111,8 +111,7 @@ describe "Restart Command" do
 
       it "must show a warning message when prog script is not executable" do
         debug_file('restart')
-        check_output_includes "Ruby program #{prog_script} doesn't seem to be executable..."
-        check_output_includes "We'll add a call to Ruby."
+        check_output_includes "Ruby program #{prog_script} doesn't seem to be executable...\nWe'll add a call to Ruby"
       end
     end
 

data/test/set_test.rb

@@ -59,7 +59,7 @@ describe "Set Command" do
     it "must show a message after setting" do
       enter 'set autolist on'
       debug_file 'set'
-      check_output_includes "autolist is on."
+      check_output_includes "autolist is on"
     end
   end
 
@@ -77,7 +77,7 @@ describe "Set Command" do
       temporary_change_hash_value(Debugger::Command.settings, :basename, false) do
         enter 'set debuggertesting', 'show basename'
         debug_file('set')
-        check_output_includes "basename is on."
+        check_output_includes "basename is on"
       end
     end
 
@@ -98,7 +98,7 @@ describe "Set Command" do
       it "must show a message" do
         enter 'set history save on'
         debug_file 'set'
-        check_output_includes "Saving of history save is on."
+        check_output_includes "Saving of history save is on"
       end
 
       it "must set history save to off" do
@@ -132,20 +132,21 @@ describe "Set Command" do
       it "must show a message" do
         enter 'set history filename .debugger-hist'
         debug_file 'set'
-        check_output_includes "The filename in which to record the command history is \"#{File.join(ENV["HOME"]||ENV["HOMEPATH"]||".", ".debugger-hist")}\""
+        history_filename = File.join(ENV["HOME"] || ENV["HOMEPATH"] || ".", ".debugger-hist")
+        check_output_includes "The filename in which to record the command history is '#{history_filename}'"
       end
     end
 
     it "must show an error message if used wrong subcommand" do
       enter 'set history bla 2'
       debug_file 'set'
-      check_output_includes "Invalid history parameter bla. Should be 'filename', 'save' or 'size'."
+      check_output_includes "Invalid history parameter bla. Should be 'filename', 'save' or 'size'"
     end
 
     it "must show an error message if provided only one argument" do
       enter 'set history save'
       debug_file 'set'
-      check_output_includes "Need two parameters for 'set history'; got 1."
+      check_output_includes "Need two parameters for 'set history'; got 1"
     end
   end
 
@@ -170,7 +171,7 @@ describe "Set Command" do
     it "must work in post-mortem mode" do
       enter 'cont', "set autolist on"
       debug_file 'post_mortem'
-      check_output_includes "autolist is on."
+      check_output_includes "autolist is on"
     end
   end
 

data/test/show_test.rb

@@ -27,14 +27,14 @@ describe "Show Command" do
       Debugger.send(:remove_const, "RDEBUG_SCRIPT") if Debugger.const_defined?("RDEBUG_SCRIPT")
       enter 'show args'
       debug_file 'show'
-      check_output_includes 'Argument list to give program being debugged when it is started is "foo bar".'
+      check_output_includes "Argument list to give program being debugged when it is started is 'foo bar'"
     end
 
     it "must not show the first arg if RDEBUG_SCRIPT is defined" do
       temporary_set_const(Debugger, "RDEBUG_SCRIPT", "bla") do
         enter 'show args'
         debug_file 'show'
-        check_output_includes 'Argument list to give program being debugged when it is started is "bar".'
+        check_output_includes "Argument list to give program being debugged when it is started is 'bar'"
       end
     end
   end
@@ -44,7 +44,7 @@ describe "Show Command" do
     temporary_change_hash_value(Debugger::Command.settings, :autolist, 1) do
       enter 'show autolist'
       debug_file 'show'
-      check_output_includes 'autolist is on.'
+      check_output_includes 'autolist is on'
     end
   end
 
@@ -52,7 +52,7 @@ describe "Show Command" do
     temporary_change_hash_value(Debugger::Command.settings, :autoeval, true) do
       enter 'show autoeval'
       debug_file 'show'
-      check_output_includes 'autoeval is on.'
+      check_output_includes 'autoeval is on'
     end
   end
 
@@ -60,7 +60,7 @@ describe "Show Command" do
     temporary_change_hash_value(Debugger::Command.settings, :reload_source_on_change, true) do
       enter 'show autoreload'
       debug_file 'show'
-      check_output_includes 'autoreload is on.'
+      check_output_includes 'autoreload is on'
     end
   end
 
@@ -69,7 +69,7 @@ describe "Show Command" do
     temporary_change_hash_value(Debugger::Command.settings, :autoirb, 1) do
       enter 'show autoirb'
       debug_file 'show'
-      check_output_includes 'autoirb is on.'
+      check_output_includes 'autoirb is on'
     end
   end
 
@@ -77,7 +77,7 @@ describe "Show Command" do
     temporary_change_hash_value(Debugger::Command.settings, :basename, true) do
       enter 'show basename'
       debug_file 'show'
-      check_output_includes 'basename is on.'
+      check_output_includes 'basename is on'
     end
   end
 
@@ -85,7 +85,7 @@ describe "Show Command" do
     temporary_change_hash_value(Debugger::Command.settings, :callstyle, :short) do
       enter 'show callstyle'
       debug_file 'show'
-      check_output_includes 'Frame call-display style is short.'
+      check_output_includes 'Frame call-display style is short'
     end
   end
 
@@ -93,7 +93,7 @@ describe "Show Command" do
     temporary_change_hash_value(Debugger::Command.settings, :force_stepping, true) do
       enter 'show forcestep'
       debug_file 'show'
-      check_output_includes 'force-stepping is on.'
+      check_output_includes 'force-stepping is on'
     end
   end
 
@@ -101,7 +101,7 @@ describe "Show Command" do
     temporary_change_hash_value(Debugger::Command.settings, :full_path, true) do
       enter 'show fullpath'
       debug_file 'show'
-      check_output_includes "Displaying frame's full file names is on."
+      check_output_includes "Displaying frame's full file names is on"
     end
   end
 
@@ -109,7 +109,7 @@ describe "Show Command" do
     temporary_change_method_value(Debugger, :tracing, true) do
       enter 'show linetrace'
       debug_file 'show'
-      check_output_includes "line tracing is on."
+      check_output_includes "line tracing is on"
     end
   end
 
@@ -119,7 +119,7 @@ describe "Show Command" do
       temporary_change_hash_value(Debugger::Command.settings, :tracing_plus, true) do
         enter 'show linetrace+'
         debug_file 'show'
-        check_output_includes "line tracing style is different consecutive lines."
+        check_output_includes "line tracing style is different consecutive lines"
       end
     end
 
@@ -127,7 +127,7 @@ describe "Show Command" do
       temporary_change_hash_value(Debugger::Command.settings, :tracing_plus, false) do
         enter 'show linetrace+'
         debug_file 'show'
-        check_output_includes "line tracing style is every line."
+        check_output_includes "line tracing style is every line"
       end
     end
   end
@@ -137,7 +137,7 @@ describe "Show Command" do
     temporary_change_hash_value(Debugger::Command.settings, :listsize, 10) do
       enter 'show listsize'
       debug_file 'show'
-      check_output_includes 'Number of source lines to list by default is 10.'
+      check_output_includes 'Number of source lines to list by default is 10'
     end
   end
 
@@ -145,7 +145,7 @@ describe "Show Command" do
     temporary_set_const(Debugger, "PORT", 12345) do
       enter 'show port'
       debug_file 'show'
-      check_output_includes 'server port is 12345.'
+      check_output_includes 'server port is 12345'
     end
   end
 
@@ -153,7 +153,7 @@ describe "Show Command" do
     temporary_change_hash_value(Debugger::Command.settings, :stack_trace_on_error, true) do
       enter 'show trace'
       debug_file 'show'
-      check_output_includes "Displaying stack trace is on."
+      check_output_includes "Displaying stack trace is on"
     end
   end
 
@@ -167,7 +167,7 @@ describe "Show Command" do
     temporary_change_hash_value(Debugger::Command.settings, :width, 35) do
       enter 'show width'
       debug_file 'show'
-      check_output_includes 'width is 35.'
+      check_output_includes 'width is 35'
     end
   end
 
@@ -189,11 +189,11 @@ describe "Show Command" do
       end
 
       it "must show history file" do
-        check_output_includes /filename: The filename in which to record the command history is "hist_file\.txt"/
+        check_output_includes /filename: The filename in which to record the command history is 'hist_file\.txt'/
       end
 
       it "must show history save setting" do
-        check_output_includes /save: Saving of history save is on\./
+        check_output_includes /save: Saving of history save is on/
       end
 
       it "must show history length" do
@@ -206,14 +206,14 @@ describe "Show Command" do
         interface.histfile = "hist_file.txt"
         enter 'show history filename'
         debug_file 'show'
-        check_output_includes 'The filename in which to record the command history is "hist_file.txt"'
+        check_output_includes "The filename in which to record the command history is 'hist_file.txt'"
       end
 
       it "must show history save setting" do
         interface.history_save = true
         enter 'show history save'
         debug_file 'show'
-        check_output_includes 'Saving of history save is on.'
+        check_output_includes 'Saving of history save is on'
       end
 
       it "must show history length" do
@@ -285,7 +285,7 @@ describe "Show Command" do
     it "must work in post-mortem mode" do
       enter 'cont', "show autolist"
       debug_file 'post_mortem'
-      check_output_includes "autolist is off."
+      check_output_includes "autolist is off"
     end
   end
 

data/test/source_test.rb

@@ -37,7 +37,7 @@ describe "Source Command" do
   describe "Post Mortem" do
     it "must work in post-mortem mode" do
       enter 'cont', "so #{filename}"
-      debug_file('post_mortem') { Debugger.breakpoints[0].pos.must_equal 3 }
+      debug_file('post_mortem') { Debugger.breakpoints[0].pos.must_equal 2 }
     end
   end
 

data/test/test_helper.rb

@@ -3,6 +3,7 @@ require 'minitest/autorun'
 require 'mocha/setup'
 
 require 'debugger'
-Dir.glob(File.expand_path("../support/*.rb", __FILE__)).each { |f| require f }
+require 'debugger/test'
 
+$debugger_test_dir = File.expand_path("..", __FILE__)
 Debugger::Command.settings[:debuggertesting] = true

data/test/thread_test.rb

@@ -9,21 +9,20 @@ describe "Thread Command" do
       thnum = nil
       enter 'break 8', 'cont', 'thread list', release
       debug_file('thread') { thnum = Debugger.contexts.first.thnum }
-      check_output_includes '+', thnum.to_s, /#<Thread:\S+ run>/, "#{fullpath('thread')}:8"
+      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 = Debugger.contexts.first.thnum }
-      check_output_includes '+', thnum.to_s, /#<Thread:\S+ run>/, "#{fullpath('thread')}:8"
+      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 /#<Thread:\S+ (sleep|run)>/, /#<Thread:\S+ (sleep|run)>/, /#<Thread:\S+ (sleep|run)>/
+      check_output_includes /#<Thread:\S+ (sleep|run)>.*#<Thread:\S+ (sleep|run)>.*#<Thread:\S+ (sleep|run)>/m
     end
   end
 
@@ -33,7 +32,7 @@ describe "Thread Command" do
       thnum = nil
       enter 'break 21', 'cont', ->{"thread stop #{Debugger.contexts.last.thnum}"}, release
       debug_file('thread') { thnum = Debugger.contexts.last.thnum }
-      check_output_includes "$", thnum.to_s, /#<Thread:/
+      check_output_includes /\$ #{thnum} #<Thread:/
     end
 
     it "must show error message if thread number is not specified" do
@@ -45,7 +44,7 @@ describe "Thread Command" do
     it "must show error message when trying to stop current thread" do
       enter 'break 8', 'cont', ->{"thread stop #{Debugger.contexts.first.thnum}"}, release
       debug_file 'thread'
-      check_output_includes "It's the current thread.", interface.error_queue
+      check_output_includes "It's the current thread", interface.error_queue
     end
   end
 
@@ -79,14 +78,13 @@ describe "Thread Command" do
     it "must show error message when trying to resume current thread" do
       enter 'break 8', 'cont', ->{"thread resume #{Debugger.contexts.first.thnum}"}, release
       debug_file 'thread'
-      check_output_includes "It's the current thread.", interface.error_queue
+      check_output_includes "It's the current thread", interface.error_queue
     end
 
     it "must show error message if it is not stopped" do
-      thnum = nil
       enter 'break 21', 'cont', ->{"thread resume #{Debugger.contexts.last.thnum}"}, release
-      debug_file('thread') { thnum = Debugger.contexts.last.thnum }
-      check_output_includes "Already running."
+      debug_file('thread')
+      check_output_includes "Already running", interface.error_queue
     end
   end
 
@@ -100,13 +98,13 @@ describe "Thread Command" do
     it "must show error message if thread number is not specified" do
       enter 'break 8', 'cont', "thread switch", release
       debug_file 'thread'
-      check_output_includes "thread thread switch argument 'switch' needs to be a number."
+      check_output_includes "thread thread switch argument 'switch' needs to be a number"
     end
 
     it "must show error message when trying to switch current thread" do
       enter 'break 8', 'cont', ->{"thread switch #{Debugger.contexts.first.thnum}"}, release
       debug_file 'thread'
-      check_output_includes "It's the current thread.", interface.error_queue
+      check_output_includes "It's the current thread", interface.error_queue
     end
   end
 
@@ -115,7 +113,7 @@ describe "Thread Command" do
     it "must work in post-mortem mode" do
       enter 'cont', 'thread list'
       debug_file('post_mortem')
-      check_output_includes "+", /\d+/, /#<Thread:(\S+) run/
+      check_output_includes /\+ \d+ #<Thread:(\S+) run/
     end
   end