tests reworked to work on 1.8.7

Author: viuginick1

test-base/inspect_test.rb

@@ -69,6 +69,10 @@ def test_inspect_expr_with_timeout
   end
 
   def test_inspect_failing_expr_with_timeout
+    if RUBY_VERSION < "1.9"
+      @process_finished = true
+      return
+    end
     create_socket ["require 'timeout'", "puts 'test'"]
     run_to_line(2)
     send_ruby("v inspect (Timeout::timeout(0.1) { sleep 0.2 })")

test-base/test_base.rb

@@ -132,8 +132,9 @@ def TestBase.find_free_port(port = 1098)
   end
 
   def create_file(script_name, lines)
-    script_path = File.realdirpath(File.join(TMP_DIR, script_name))
-    
+    file = File.join(TMP_DIR, script_name)
+    script_path = RUBY_VERSION >= "1.9" ? File.realdirpath(file) : file.to_s
+
     File.open(script_path, "w") do |script|
       script.printf(lines.join("\n"))
     end
@@ -142,7 +143,9 @@ def create_file(script_name, lines)
 
   def create_test2(lines)
     @test2_name = "test2.rb"
-    @test2_path = create_file(@test2_name, lines).force_encoding(Encoding::UTF_8)
+    @test2_path = create_file(@test2_name, lines)
+
+    @test2_path = @test2_path.force_encoding(Encoding::UTF_8) if RUBY_VERSION >= "1.9"
   end
 
   # Creates test.rb with the given lines, set up @test_name and @test_path

test-base/variables_test.rb

@@ -100,7 +100,9 @@ def test_variable_local
   end
 
   def test_variable_instance
-    create_socket ["require_relative 'test2.rb'", "custom_object=Test2.new", "puts custom_object"]
+    require_string = RUBY_VERSION < "1.9" ? "require" : "require_relative"
+
+    create_socket ["#{require_string} 'test2.rb'", "custom_object=Test2.new", "puts custom_object"]
     create_test2 ["class Test2", "def initialize", "@y=5", "end", "def to_s", "'test'", "end", "end"]
     run_to("test2.rb", 6)
     frame_number = 3
@@ -130,8 +132,9 @@ def test_variable_hash_with_string_keys
     assert_variables(read_variables, 1,
       {:name => "hash", :hasChildren => true})
     send_ruby("v i hash")
+    expected_name = CGI::escapeHTML("'a'")
     assert_variables(read_variables, 2,
-      {:name => CGI.escape_html("'a'"), :value => "z", :type => "String"})
+      {:name => expected_name, :value => "z", :type => "String"})
     send_cont
   end
 
@@ -228,7 +231,13 @@ def test_new_hash_presentation
 
     send_ruby("v i b")
 
-    assert_variables(read_variables, 6,
+    variables = []
+
+    read_variables.each_slice(2) do |var|
+      variables << var
+    end
+
+    assert_variables(variables.sort_by{|a| a[0].value}.flatten, 6,
                      {:name => "key", :value => "1"},
                      {:name => "value", :value => "A instance", :type => "A"},
 
@@ -241,6 +250,11 @@ def test_new_hash_presentation
   end
 
   def test_to_s_timelimit
+    #no TracePointApi for old versions
+    if RUBY_VERSION <= "1.9"
+      @process_finished = true
+      return
+    end
     create_socket ['class A',
                     'def to_s',
                       'a = 1',