unit-testing of incoming unescaping, fixed inspect test

Author: valich

lib/ruby-debug-ide/command.rb

@@ -64,6 +64,11 @@ def method_missing(meth, *args, &block)
       def options
         @options ||= {}
       end
+
+      def unescape_incoming(str)
+        str.gsub(/((?:^|[^\\])(?:\\\\)*)\\n/, "\\1\n")
+            .gsub(/\\\\/, '\\')
+      end
     end
 
     def initialize(state, printer)
@@ -104,11 +109,11 @@ def timeout(sec)
         y.kill if y and y.alive?
       end
     end
-    
+
     def debug_eval(str, b = get_binding)
       begin
         str = str.to_s
-        to_inspect = unescape_incoming(str)
+        to_inspect = Command.unescape_incoming(str)
         max_time = Debugger.evaluation_timeout
         @printer.print_debug("Evaluating #{str} with timeout after %i sec", max_time)
         timeout(max_time) do
@@ -120,11 +125,6 @@ def debug_eval(str, b = get_binding)
       end
     end
 
-    def unescape_incoming(str)
-        str.gsub(/(?<backsl_escapes>(?:^|[^\\])(?:\\\\)*)\\n/, "\\k<backsl_escapes>\n")
-           .gsub(/\\\\/, '\\')
-    end
-
     def debug_silent_eval(str)
       begin
         str = str.to_s

test-base/inspect_test.rb

@@ -68,24 +68,31 @@ def test_inspect_multiline_expression
     send_cont
   end
 
-  def test_inspect_escaping_escaped_newlines
+  def test_inspect_unescaping_escaped_newlines
     create_socket ["sleep 0.1"]
     run_to_line(1)
 
     send_ruby('v inspect "\\\\n".size')
-    variable = read_variables
+    variables = read_variables
     assert_equal(1, variables.length, "There is one variable returned.")
-    assert_equal(1, variables[0].value, "There is one char (newline)")
+    assert_equal("1", variables[0].value, "There is one char (newline)")
 
     send_ruby('v inspect "\\\\\\n".size')
-    variable = read_variables
+    variables = read_variables
     assert_equal(1, variables.length, "There is one variable returned.")
-    assert_equal(0, variables[0].value, "There are no chars, it's line continuation here")
+    assert_equal("0", variables[0].value, "There are no chars, it's line continuation here")
 
     send_ruby('v inspect "\\\\\\\\\\n".size')
-    variable = read_variables
+    variables = read_variables
+    assert_equal(1, variables.length, "There is one variable returned.")
+    assert_equal("2", variables[0].value, "There are two chars: escaped backslash and newline")
+
+    send_ruby('v inspect \'"\\\\n\'.size')
+    variables = read_variables
     assert_equal(1, variables.length, "There is one variable returned.")
-    assert_equal(2, variables[0].value, "There are two chars: escaped backslash and newline")
+    assert_equal("3", variables[0].value, "There are three chars: quote, backslash and n")
+
+    send_cont
   end
 
 end

test/ruby-debug/unescape_incoming_test.rb

@@ -0,0 +1,34 @@
+require 'test/unit'
+require 'ruby-debug-ide/command'
+
+class UnescaperTest < Test::Unit::TestCase
+
+  def test_empty
+    do_test('', '')
+    do_test('a', 'a')
+  end
+
+  def test_newline
+    do_test('\n', "\n")
+    do_test('a\n', "a\n")
+  end
+
+  def test_escaped_newline
+    do_test('\\\\n', '\n')
+    do_test('a\\\\n', 'a\n')
+  end
+
+  def test_backslash_and_newline
+    do_test('\\\\\\n', "\\\n")
+    do_test('a\\\\\\n', "a\\\n")
+  end
+
+  def test_something
+    do_test('hello\nthere\\\\n', "hello\nthere\\n")
+    do_test('"\\\\\\n".size', "\"\\\n\".size")
+  end
+
+  def do_test(input, expected_result)
+    assert_equal(expected_result, Debugger::Command.unescape_incoming(input))
+  end
+end