highline 1.7.10 → 2.0.0.pre.develop.2

data/test/acceptance/acceptance_test.rb

@@ -0,0 +1,69 @@
+# coding: utf-8
+
+require 'highline/import'
+
+class HighLine::AcceptanceTest
+  @@answers ||= {}
+
+  def self.check(&block)
+    caller_file = File.basename(caller[0].split(":")[-3])
+
+    test = new
+    yield test
+    test.caller_file = caller_file
+    test.check
+  end
+
+  def self.answers
+    @@answers
+  end
+
+  def self.answers_for_report
+    answers.map do |file, answer|
+      "#{file}: #{answer}"
+    end.join("\n")
+  end
+
+  # A test description to be shown to user.
+  # It should express what the user is
+  # expected to check.
+  attr_accessor :desc
+
+  # A test action to be checked by the user
+  attr_accessor :action
+
+  # A text asking the confirmation if
+  # the action worked (y) or not (n).
+  attr_accessor :question
+
+  # Automatically filled attribute pointing
+  # to the file where the current test
+  # source is located. So we could check
+  # at the report what tests passed or failed.
+  attr_accessor :caller_file
+
+  def check
+    # Print a header with the test description
+    puts "====="
+    puts "   #{caller_file}"
+    puts "====="
+    puts
+    puts desc
+
+    # Execute the proc/lambda assigned to action
+    puts "---"
+    puts
+    action.call
+    puts
+    puts "---"
+    puts
+
+    # Gather the user feedback about the test
+    print question
+    answer = STDIN.gets.chomp
+    answer = "y" if answer.empty?
+    @@answers[caller_file] = answer
+
+    puts
+  end
+end

data/test/acceptance/at_color_output_using_erb_templates.rb

@@ -0,0 +1,17 @@
+# coding: utf-8
+
+require_relative 'acceptance_test'
+
+HighLine::AcceptanceTest.check do |t|
+  t.desc =
+    "This step checks if coloring "       \
+    "with erb templates is working ok.\n" \
+    "You should see the word _grass_ "    \
+    "colored in green color"
+
+  t.action = Proc.new do
+    say "The <%= color('grass', :green) %> should be green!"
+  end
+
+  t.question = "Do you see the word 'grass' on green color (y/n)? "
+end

data/test/acceptance/at_echo_false.rb

@@ -0,0 +1,23 @@
+# coding: utf-8
+
+require_relative 'acceptance_test'
+
+HighLine::AcceptanceTest.check do |t|
+  t.desc =
+    "This step checks if the 'echo = false' " \
+    "setting is effective in hiding the user " \
+    "typed characters.\n" \
+    "This functionality is useful when asking " \
+    "for passwords.\n" \
+    "When typing the characters you should not " \
+    "see any of them on the screen."
+
+  t.action = Proc.new do
+    answer = ask "Enter some characters and press <enter>: " do |q|
+      q.echo = false
+    end
+    puts "You've entered -> #{answer} <-"
+  end
+
+  t.question = "Were the characters adequately hidden when you typed them (y/n)? "
+end

data/test/acceptance/at_readline.rb

@@ -0,0 +1,37 @@
+# coding: utf-8
+
+require_relative 'acceptance_test'
+
+HighLine::AcceptanceTest.check do |t|
+  t.desc =
+    "This step checks if the readline autocomplete " \
+    "feature is working. \n" \
+    "The test has 5 options you can choose from: " \
+    "save, sample, exec, exit and load.\n" \
+    "If you type the first character of one of them and then press \n" \
+    "the <TAB> key you should see the options available for autocomplete.\n\n" \
+    "For example, if I type 's' and then I press <TAB> I should see a list\n" \
+    "with 'save' and 'sample' as possible options for autocomplete.\n\n" \
+    "Although, if I type 'l' and then press the <TAB> key it should be \n" \
+    "readly autcompleted as 'load', because 'load' is the only option\n" \
+    "that begins with the 'l' letter in this particular case.\n\n" \
+    "If I don't type any character but press <TAB> two times, I should\n" \
+    "be able to see ALL available options.\n\n" \
+    "Please, play with Readline autocomplete for a while, pressing <ENTER>\n" \
+    "to see that it really gets the selected answer.\n" \
+    "When ready, just type 'exit' and the loop will finish.\n\n" \
+    "Don't forget to answer 'y' (yes) or 'n' (no) to the question at the end."
+
+  t.action = Proc.new do
+    loop do
+      cmd =
+      ask "Enter command:  ", %w{ save sample exec exit load } do |q|
+        q.readline = true
+      end
+      say("Executing \"#{cmd}\"...")
+      break if cmd == "exit"
+    end
+  end
+
+  t.question = "Did the Readline autocomplete work fine (y/n)? "
+end

data/test/io_console_compatible.rb

@@ -0,0 +1,37 @@
+# coding: utf-8
+
+require 'stringio'
+require 'tempfile'
+
+#
+# On tests, we try to simulate input output with
+# StringIO, Tempfile and File objects.
+#
+# For this to be accomplished, we have to do some
+# tweaking so that they respond adequately to the
+# called methods during tests.
+#
+
+module IOConsoleCompatible
+  def getch
+    getc
+  end
+
+  attr_accessor :echo
+
+  def winsize
+    [24, 80]
+  end
+end
+
+class Tempfile
+  include IOConsoleCompatible
+end
+
+class File
+  include IOConsoleCompatible
+end
+
+class StringIO
+  include IOConsoleCompatible
+end

data/test/string_methods.rb

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+
 # string_methods.rb
 #
 #  Created by Richard LeBer 2011-06-27

data/test/test_answer_converter.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+
+require "test_helper"
+
+require "highline/question"
+
+class TestAnswerConverter < Minitest::Test
+  def test_integer_convertion
+    question = HighLine::Question.new("What's your age?", Integer)
+    question.answer = "18"
+    answer_converter = HighLine::Question::AnswerConverter.new(question)
+
+    refute_equal "18", answer_converter.convert
+    assert_equal   18, answer_converter.convert
+  end
+
+  def test_float_convertion
+    question = HighLine::Question.new("Write PI", Float)
+    question.answer = "3.14159"
+    answer_converter = HighLine::Question::AnswerConverter.new(question)
+
+    refute_equal "3.14159", answer_converter.convert
+    assert_equal   3.14159, answer_converter.convert
+  end
+end

data/test/{tc_color_scheme.rb → test_color_scheme.rb}

@@ -1,3 +1,6 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+
 # tc_color_scheme.rb
 #
 #  Created by Jeremy Hinegardner on 2007-01-24.  
@@ -5,22 +8,17 @@
 #
 #  This is Free Software.  See LICENSE and COPYING for details.
 
-require "test/unit"
+require "test_helper"
 
 require "highline"
 require "stringio"
 
-class TestColorScheme < Test::Unit::TestCase
+class TestColorScheme < Minitest::Test
   def setup
+    HighLine.reset
     @input    = StringIO.new
     @output   = StringIO.new
     @terminal = HighLine.new(@input, @output)
-    
-    @old_color_scheme = HighLine.color_scheme
-  end
-  
-  def teardown
-    HighLine.color_scheme = @old_color_scheme
   end
 
   def test_using_color_scheme
@@ -88,7 +86,7 @@ class TestColorScheme < Test::Unit::TestCase
     assert_equal [:bold, :yellow], HighLine.color_scheme.definition(:warning)
 
     # turn it back off, should raise an exception
-    HighLine.color_scheme = @old_color_scheme
+    HighLine.color_scheme = nil
     assert_raises(NameError) {
       @terminal.say("This should be <%= color('nothing at all', :error) %>.")
     }

data/test/test_helper.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+# coding: utf-8
+
+require 'simplecov'
+
+if ENV['CODECLIMATE_REPO_TOKEN']
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+end
+
+# Compatibility module for StringIO, File
+# and Tempfile. Necessary for some tests.
+require "io_console_compatible"
+
+require 'highline'
+debug_message = "Tests will be run under:\n"
+debug_message << "  - #{HighLine.new.terminal.class}\n"
+debug_message << "  - HighLine::VERSION #{HighLine::VERSION}\n"
+
+if defined? RUBY_DESCRIPTION
+  debug_message << "  - #{RUBY_DESCRIPTION}\n"
+end
+
+puts debug_message
+
+require "minitest/autorun"

data/test/{tc_highline.rb → test_highline.rb}

@@ -1,4 +1,6 @@
-# encoding: utf-8
+#!/usr/bin/env ruby
+# coding: utf-8
+
 # tc_highline.rb
 #
 #  Created by James Edward Gray II on 2005-04-26.
@@ -6,13 +8,14 @@
 #
 #  This is Free Software.  See LICENSE and COPYING for details.
 
-require "test/unit"
+require "test_helper"
 
 require "highline"
 require "stringio"
 require "readline"
 require "tempfile"
 
+=begin
 if HighLine::CHARACTER_MODE == "Win32API"
   class HighLine
     # Override Windows' character reading so it's not tied to STDIN.
@@ -21,9 +24,11 @@ if HighLine::CHARACTER_MODE == "Win32API"
     end
   end
 end
+=end
 
-class TestHighLine < Test::Unit::TestCase
+class TestHighLine < Minitest::Test
   def setup
+    HighLine.reset
     @input    = StringIO.new
     @output   = StringIO.new
     @terminal = HighLine.new(@input, @output)  
@@ -60,7 +65,7 @@ class TestHighLine < Test::Unit::TestCase
 
     assert_equal(name, @terminal.ask("What is your name?  "))
     
-    assert_raise(EOFError) { @terminal.ask("Any input left?  ") }
+    assert_raises(EOFError) { @terminal.ask("Any input left?  ") }
   end
   
   def test_ask_string
@@ -70,7 +75,25 @@ class TestHighLine < Test::Unit::TestCase
 
     assert_equal(name, @terminal.ask("What is your name?  ", String))
 
-    assert_raise(EOFError) { @terminal.ask("Any input left?  ", String) }
+    assert_raises(EOFError) { @terminal.ask("Any input left?  ", String) }
+  end
+
+  def test_ask_string_converting
+    name = "James Edward Gray II"
+    @input << name << "\n"
+    @input.rewind
+
+    answer = @terminal.ask("What is your name?  ", String)
+
+    assert_instance_of HighLine::String, answer
+
+    @input.rewind
+
+    answer = @terminal.ask("What is your name?  ", HighLine::String)
+
+    assert_instance_of HighLine::String, answer
+
+    assert_raises(EOFError) { @terminal.ask("Any input left?  ", HighLine::String) }
   end
 
   def test_indent
@@ -91,28 +114,29 @@ class TestHighLine < Test::Unit::TestCase
     assert_equal(' '*10+text, @output.string)
 
     @output.truncate(@output.rewind)
+    @terminal.indent_level=0
     @terminal.indent_size=4
     @terminal.indent {
-        @terminal.say(text)
+      @terminal.say(text)
     }
     assert_equal(' '*4+text, @output.string)
 
     @output.truncate(@output.rewind)
     @terminal.indent_size=2
     @terminal.indent(3) { |t|
-        t.say(text)
+      t.say(text)
     }
     assert_equal(' '*6+text, @output.string)
 
     @output.truncate(@output.rewind)
     @terminal.indent { |t|
+      t.indent {
         t.indent {
-            t.indent {
-                t.indent { |tt|
-                    tt.say(text)
-                }
-            }
+          t.indent { |tt|
+            tt.say(text)
+          }
         }
+      }
     }
     assert_equal(' '*8+text, @output.string)
 
@@ -194,6 +218,35 @@ class TestHighLine < Test::Unit::TestCase
     assert_equal("crazy", answer)
   end
 
+  def test_ask_with_overwrite
+    @input << "Yes, sure!\n"
+    @input.rewind
+
+    answer = @terminal.ask("Do you like Ruby? ") do |q|
+      q.overwrite = true
+      q.echo      = false
+    end
+
+    assert_equal("Yes, sure!", answer)
+    erase_sequence = "\r#{HighLine.Style(:erase_line).code}"
+    assert_equal("Do you like Ruby? #{erase_sequence}", @output.string)
+  end
+
+  def test_ask_with_overwrite_and_character_mode
+    @input << "Y"
+    @input.rewind
+
+    answer = @terminal.ask("Do you like Ruby (Y/N)? ") do |q|
+      q.overwrite = true
+      q.echo      = false
+      q.character = true
+    end
+
+    assert_equal("Y", answer)
+    erase_sequence = "\r#{HighLine.Style(:erase_line).code}"
+    assert_equal("Do you like Ruby (Y/N)? #{erase_sequence}", @output.string)
+  end
+
   def test_character_echo
     @input << "password\r"
     @input.rewind
@@ -249,12 +302,20 @@ class TestHighLine < Test::Unit::TestCase
   end
 
   def test_readline_mode
-    # Rubinius seems to be ignoring Readline input
-    # and output assignments. This ruins testing.
-    # but it doesn't mean readline is not working
-    # properly on rubinius.
-
-    return if RUBY_ENGINE == "rbx"
+    #
+    # Rubinius (and JRuby) seems to be ignoring
+    # Readline input and output assignments. This
+    # ruins testing.
+    #
+    # But it doesn't mean readline is not working
+    # properly on rubinius or jruby.
+    #
+
+    terminal = @terminal.terminal
+
+    if terminal.jruby? or terminal.rubinius? or terminal.windows?
+      skip "We can't test Readline on JRuby, Rubinius and Windows yet"
+    end
 
     # Creating Tempfiles here because Readline.input
     #   and Readline.output only accepts a File object
@@ -381,6 +442,14 @@ class TestHighLine < Test::Unit::TestCase
     @terminal.say("This should be <%= ON_RGB_C06030 %>on_rgb_c06030<%= CLEAR %>!")
     assert_equal("This should be \e[48;5;173mon_rgb_c06030\e[0m!\n", @output.string)
 
+    # Relying on const_missing
+    assert_instance_of HighLine::Style, HighLine::ON_RGB_C06031_STYLE
+    assert_instance_of String         , HighLine::ON_RGB_C06032
+    assert_raises(NameError)          { HighLine::ON_RGB_ZZZZZZ }
+
+    # Retrieving color_code from a style
+    assert_equal "\e[41m", @terminal.color_code([HighLine::ON_RED_STYLE])
+
     @output.truncate(@output.rewind)
     
     # Does class method work, too?
@@ -392,7 +461,7 @@ class TestHighLine < Test::Unit::TestCase
 
     # turn off color
     old_setting = HighLine.use_color?
-    assert_nothing_raised(Exception) { HighLine.use_color = false }
+    HighLine.use_color = false
     @terminal.say("This should be <%= color('cyan', CYAN) %>!")
     assert_equal("This should be cyan!\n", @output.string)
     HighLine.use_color = old_setting
@@ -448,7 +517,7 @@ class TestHighLine < Test::Unit::TestCase
     @input.rewind
 
     answer = @terminal.ask("Enter a filename:  ") do |q|
-      q.confirm = "Are you sure you want to overwrite <%= @answer %>?  "
+      q.confirm = "Are you sure you want to overwrite <%= answer %>?  "
       q.responses[:ask_on_error] = :question
     end
     assert_equal("save.txt", answer)
@@ -464,7 +533,7 @@ class TestHighLine < Test::Unit::TestCase
     @output.truncate(@output.rewind)
 
     answer = @terminal.ask("Enter a filename:  ") do |q|
-      q.confirm = "Are you sure you want to overwrite <%= @answer %>?  "
+      q.confirm = "Are you sure you want to overwrite <%= answer %>?  "
     end
     assert_equal("junk.txt", answer)
     assert_equal( "Enter a filename:  " +
@@ -472,6 +541,35 @@ class TestHighLine < Test::Unit::TestCase
                   @output.string )
   end
   
+  def test_generic_confirm_with_true
+    @input << "junk.txt\nno\nsave.txt\ny\n"
+    @input.rewind
+
+    answer = @terminal.ask("Enter a filename:  ") do |q|
+      q.confirm = true
+      q.responses[:ask_on_error] = :question
+    end
+    assert_equal("save.txt", answer)
+    assert_equal( "Enter a filename:  " +
+                  "Are you sure?  " +
+                  "Enter a filename:  " +
+                  "Are you sure?  ",
+                  @output.string )
+
+    @input.truncate(@input.rewind)
+    @input << "junk.txt\nyes\nsave.txt\nn\n"
+    @input.rewind
+    @output.truncate(@output.rewind)
+
+    answer = @terminal.ask("Enter a filename:  ") do |q|
+      q.confirm = true
+    end
+    assert_equal("junk.txt", answer)
+    assert_equal( "Enter a filename:  " +
+                  "Are you sure?  ",
+                  @output.string )
+  end
+
   def test_defaults
     @input << "\nNo Comment\n"
     @input.rewind
@@ -576,10 +674,10 @@ class TestHighLine < Test::Unit::TestCase
   end
   
   def test_files
-    @input << "#{File.basename(__FILE__)[0, 5]}\n"
+    @input << "#{File.basename(__FILE__)[0, 7]}\n"
     @input.rewind
     
-    assert_equal "tc_hi\n",@input.read
+    assert_equal "test_hi\n",@input.read
     @input.rewind
 
     file = @terminal.ask("Select a file:  ", File) do |q|
@@ -587,7 +685,7 @@ class TestHighLine < Test::Unit::TestCase
       q.glob      = "*.rb"
     end
     assert_instance_of(File, file)
-    assert_equal("# encoding: utf-8\n", file.gets)
+    assert_equal("#!/usr/bin/env ruby\n", file.gets)
     file.close
 
     @input.rewind
@@ -600,7 +698,7 @@ class TestHighLine < Test::Unit::TestCase
     assert_equal(File.size(__FILE__), pathname.size)
   end
   
-  def test_gather
+  def test_gather_with_integer
     @input << "James\nDana\nStorm\nGypsy\n\n"
     @input.rewind
 
@@ -610,27 +708,33 @@ class TestHighLine < Test::Unit::TestCase
     assert_equal(%w{James Dana Storm Gypsy}, answers)
     assert_equal("\n", @input.gets)
     assert_equal("Enter four names:\n", @output.string)
+  end
 
+  def test_gather_with_an_empty_string
+    @input << "James\nDana\nStorm\nGypsy\n\n"
     @input.rewind
 
     answers = @terminal.ask("Enter four names:") do |q|
       q.gather = ""
     end
     assert_equal(%w{James Dana Storm Gypsy}, answers)
+  end
 
+  def test_gather_with_regexp
+    @input << "James\nDana\nStorm\nGypsy\n\n"
     @input.rewind
 
     answers = @terminal.ask("Enter four names:") do |q|
       q.gather = /^\s*$/
     end
     assert_equal(%w{James Dana Storm Gypsy}, answers)
+  end
 
-    @input.truncate(@input.rewind)
+  def test_gather_with_hash
     @input << "29\n49\n30\n"
     @input.rewind
-    @output.truncate(@output.rewind)
 
-    answers = @terminal.ask("<%= @key %>:  ", Integer) do |q|
+    answers = @terminal.ask("<%= key %>:  ", Integer) do |q|
       q.gather = { "Age" => 0, "Wife's Age" => 0, "Father's Age" => 0}
     end
     assert_equal( { "Age" => 29, "Wife's Age" => 30, "Father's Age" => 49},
@@ -669,7 +773,7 @@ class TestHighLine < Test::Unit::TestCase
     @input.rewind
     @output.truncate(@output.rewind)
 
-    answer = @terminal.ask("<%= @key %>: ") do |q|
+    answer = @terminal.ask("<%= key %>: ") do |q|
       q.verify_match = true
       q.gather = {"Enter a password" => '', "Please type it again" => ''}
     end
@@ -680,7 +784,7 @@ class TestHighLine < Test::Unit::TestCase
     @input.rewind
     @output.truncate(@output.rewind)
 
-    answer = @terminal.ask("<%= @key %>: ") do |q|
+    answer = @terminal.ask("<%= key %>: ") do |q|
       q.verify_match = true
       q.responses[:mismatch] = 'Typing mismatch!'
       q.responses[:ask_on_error] = ''
@@ -855,8 +959,8 @@ class TestHighLine < Test::Unit::TestCase
   end
   
   def test_mode
-    assert(%w[Win32API termios ncurses stty jline].include?(HighLine::CHARACTER_MODE),
-           "#{HighLine::CHARACTER_MODE} not in list")
+    assert(%w[io_console Win32API termios ncurses stty unix_stty jline].include?(@terminal.terminal.character_mode),
+           "#{@terminal.terminal.character_mode} not in list")
   end
   
   class NameClass
@@ -924,7 +1028,7 @@ class TestHighLine < Test::Unit::TestCase
     end
 
     assert_equal "ação", answer
-    assert_equal Encoding::default_external, answer.encoding
+    assert_equal Encoding::UTF_8, answer.encoding
   end
 
   def test_backspace_with_ascii_when_echo_false
@@ -935,7 +1039,7 @@ class TestHighLine < Test::Unit::TestCase
       q.echo = false
     end
 
-    assert_not_equal("password", answer)
+    refute_equal("password", answer)
     assert_equal("passwor", answer)
   end
 
@@ -947,7 +1051,7 @@ class TestHighLine < Test::Unit::TestCase
       q.echo = false
     end
 
-    assert_not_equal("maçã", answer)
+    refute_equal("maçã", answer)
     assert_equal("maç", answer)
   end
 
@@ -962,63 +1066,6 @@ class TestHighLine < Test::Unit::TestCase
     assert_equal("Type:  ****\n", @output.string)
     assert_equal("maçã", answer)
   end
-
-  def test_paging
-    @terminal.page_at = 22
-
-    @input << "\n\n"
-    @input.rewind
-
-    @terminal.say((1..50).map { |n| "This is line #{n}.\n"}.join)
-    assert_equal( (1..22).map { |n| "This is line #{n}.\n"}.join +
-                  "\n-- press enter/return to continue or q to stop -- \n\n" +
-                  (23..44).map { |n| "This is line #{n}.\n"}.join +
-                  "\n-- press enter/return to continue or q to stop -- \n\n" +
-                  (45..50).map { |n| "This is line #{n}.\n"}.join,
-                  @output.string )
-  end
-
-  def test_statement_lines_count_equal_to_page_at_shouldnt_paginate
-    @terminal.page_at = 6
-
-    @input << "\n"
-    @input.rewind
-
-    list = "a\nb\nc\nd\ne\nf\n"
-
-    @terminal.say(list)
-    assert_equal(list, @output.string)
-  end
-
-  def test_statement_with_one_line_bigger_than_page_at_should_paginate
-    @terminal.page_at = 6
-
-    @input << "\n"
-    @input.rewind
-
-    list = "a\nb\nc\nd\ne\nf\ng\n"
-
-    paginated =
-      "a\nb\nc\nd\ne\nf\n" \
-      "\n-- press enter/return to continue or q to stop -- \n\n" \
-      "g\n"
-
-    @terminal.say(list)
-    assert_equal(paginated, @output.string)
-  end
-
-  def test_quiting_paging_shouldnt_raise
-    # See https://github.com/JEG2/highline/issues/168
-
-    @terminal.page_at = 6
-
-    @input << "q"
-    @input.rewind
-
-    list = "a\nb\nc\nd\ne\nf\n"
-
-    assert_nothing_raised { @terminal.say(list) }
-  end
   
   def test_range_requirements
     @input << "112\n-541\n28\n"
@@ -1070,6 +1117,24 @@ class TestHighLine < Test::Unit::TestCase
                   "(below 0).\n" +
                   "?  ", @output.string )
 
+    @input.truncate(@input.rewind)
+    @input << "-541\n11\n6\n"
+    @input.rewind
+    @output.truncate(@output.rewind)
+
+    answer = @terminal.ask("Enter a low even number:  ", Integer) do |q|
+      q.above = 0
+      q.below = 10
+    end
+    assert_equal(6, answer)
+    assert_equal( "Enter a low even number:  " +
+                  "Your answer isn't within the expected range " +
+                  "(above 0 and below 10).\n" +
+                  "?  " +
+                  "Your answer isn't within the expected range " +
+                  "(above 0 and below 10).\n" +
+                  "?  ", @output.string )
+
     @input.truncate(@input.rewind)
     @input << "1\n-541\n6\n"
     @input.rewind
@@ -1137,8 +1202,8 @@ class TestHighLine < Test::Unit::TestCase
 
     answer = @terminal.ask("Tell me your age.", Integer) do |q|
       q.in = 0..105
-      q.responses[:not_in_range] = "Need a <%= @question.answer_type %>" +
-                                   " <%= @question.expected_range %>."
+      q.responses[:not_in_range] = "Need a #{q.answer_type}" +
+                                   " #{q.expected_range}."
     end
     assert_equal(28, answer)
     assert_equal( "Tell me your age.\n" +
@@ -1162,6 +1227,11 @@ class TestHighLine < Test::Unit::TestCase
     @terminal.say("This will not have a newline.  ")
     assert_equal("This will not have a newline.  ", @output.string)
 
+    @output.truncate(@output.rewind)
+
+    @terminal.say("This will not have a newline.\t")
+    assert_equal("This will not have a newline.\t", @output.string)
+
     @output.truncate(@output.rewind)
     
     @terminal.say("This will not\n end with a newline. ")
@@ -1186,7 +1256,7 @@ class TestHighLine < Test::Unit::TestCase
 
     @output.truncate(@output.rewind)
 
-    assert_nothing_raised { @terminal.say(nil) }
+    @terminal.say(nil)
     assert_equal("", @output.string)
   end
 
@@ -1194,18 +1264,18 @@ class TestHighLine < Test::Unit::TestCase
     integer = 10
     hash    = { :a => 20 }
 
-    assert_nothing_raised { @terminal.say(integer) }
+    @terminal.say(integer)
     assert_equal String(integer), @output.string.chomp
 
     @output.truncate(@output.rewind)
 
-    assert_nothing_raised { @terminal.say(hash) }
+    @terminal.say(hash)
     assert_equal String(hash), @output.string.chomp
   end
 
   def test_terminal_size
-    assert_instance_of(Fixnum, @terminal.terminal_size[0])
-    assert_instance_of(Fixnum, @terminal.terminal_size[1])
+    assert_instance_of(Fixnum, @terminal.terminal.terminal_size[0])
+    assert_instance_of(Fixnum, @terminal.terminal.terminal_size[1])
   end
 
   def test_type_conversion
@@ -1320,6 +1390,20 @@ class TestHighLine < Test::Unit::TestCase
 
     @input.rewind
 
+    answer = @terminal.ask("Enter a whitespace filled string:  ") do |q|
+      q.whitespace = :strip
+    end
+    assert_equal("A   lot\tof  \t  space\t  \there!", answer)
+
+    @input.rewind
+
+    answer = @terminal.ask("Enter a whitespace filled string:  ") do |q|
+      q.whitespace = :collapse
+    end
+    assert_equal(" A lot of space here! ", answer)
+
+    @input.rewind
+
     answer = @terminal.ask("Enter a whitespace filled string:  ")
     assert_equal("A   lot\tof  \t  space\t  \there!", answer)
 
@@ -1343,60 +1427,33 @@ class TestHighLine < Test::Unit::TestCase
       q.whitespace = :none
     end
     assert_equal("  A   lot\tof  \t  space\t  \there!   \n", answer)
-  end
-  
-  def test_wrap
-    @terminal.wrap_at = 80
-    
-    @terminal.say("This is a very short line.")
-    assert_equal("This is a very short line.\n", @output.string)
-    
-    @output.truncate(@output.rewind)
 
-    @terminal.say( "This is a long flowing paragraph meant to span " +
-                   "several lines.  This text should definitely be " +
-                   "wrapped at the set limit, in the result.  Your code " +
-                   "does well with things like this.\n\n" +
-                   "  * This is a simple embedded list.\n" +
-                   "  * You're code should not mess with this...\n" +
-                       "  * Because it's already formatted correctly and " +
-                   "does not\n" +
-                   "    exceed the limit!" )
-    assert_equal( "This is a long flowing paragraph meant to span " +
-                  "several lines.  This text should\n" +
-                  "definitely be wrapped at the set limit, in the " +
-                  "result.  Your code does well with\n" +
-                  "things like this.\n\n" +
-                  "  * This is a simple embedded list.\n" +
-                  "  * You're code should not mess with this...\n" +
-                  "  * Because it's already formatted correctly and does " +
-                  "not\n" +
-                  "    exceed the limit!\n", @output.string )
-
-    @output.truncate(@output.rewind)
+    @input.rewind
 
-    @terminal.say("-=" * 50)
-    assert_equal(("-=" * 40 + "\n") + ("-=" * 10 + "\n"), @output.string)
+    answer = @terminal.ask("Enter a whitespace filled string:  ") do |q|
+      q.whitespace = nil
+    end
+    assert_equal("  A   lot\tof  \t  space\t  \there!   \n", answer)
   end
   
   def test_track_eof
-    assert_raise(EOFError) { @terminal.ask("Any input left?  ") }
+    assert_raises(EOFError) { @terminal.ask("Any input left?  ") }
     
     # turn EOF tracking
     old_setting = HighLine.track_eof?
-    assert_nothing_raised(Exception) { HighLine.track_eof = false }
+    HighLine.track_eof = false
     begin
       @terminal.ask("And now?  ")  # this will still blow up, nothing available
     rescue
-      assert_not_equal(EOFError, $!.class)  # but HighLine's safe guards are off
+      refute_equal(EOFError, $!.class)  # but HighLine's safe guards are off
     end
     HighLine.track_eof = old_setting
   end
   
   def test_version
-    assert_not_nil(HighLine::VERSION)
+    refute_nil(HighLine::VERSION)
     assert_instance_of(String, HighLine::VERSION)
     assert(HighLine::VERSION.frozen?)
-    assert_match(/\A\d+\.\d+\.\d+\Z/, HighLine::VERSION)
+    assert_match(/\A\d+\.\d+\.\d+(-.*)?/, HighLine::VERSION)
   end
 end