diff options
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/debug.rb | 3 | ||||
| -rw-r--r-- | test/unit/lines_of_code.rb | 13 |
2 files changed, 5 insertions, 11 deletions
diff --git a/test/unit/debug.rb b/test/unit/debug.rb index 8bafcf5..f2b80bd 100644 --- a/test/unit/debug.rb +++ b/test/unit/debug.rb @@ -70,7 +70,8 @@ method([])] def test_filtering_text_tokens assert_equal TEST_OUTPUT, CodeRay::Scanners::Debug.new.tokenize(TEST_INPUT) - assert_equal TEST_OUTPUT, CodeRay.scan(TEST_INPUT, :debug) + assert_kind_of CodeRay::TokensProxy, CodeRay.scan(TEST_INPUT, :debug) + assert_equal TEST_OUTPUT, CodeRay.scan(TEST_INPUT, :debug).tokens end end diff --git a/test/unit/lines_of_code.rb b/test/unit/lines_of_code.rb index 4231d5a..e2c0caf 100644 --- a/test/unit/lines_of_code.rb +++ b/test/unit/lines_of_code.rb @@ -2,6 +2,8 @@ require 'test/unit' require 'coderay' $VERBOSE = true +require File.expand_path('../../lib/assert_warning', __FILE__) + class LinesOfCodeTest < Test::Unit::TestCase def test_creation @@ -39,17 +41,8 @@ puts "Hello world!" tokens.concat ["\n", :space] tokens.concat ["Hello\n", :comment] - stderr, fake_stderr = $stderr, Object.new - begin - $err = '' - def fake_stderr.write x - $err << x - end - $stderr = fake_stderr + assert_warning 'Tokens have no associated scanner, counting all nonempty lines.' do assert_equal 1, tokens.lines_of_code - assert_equal "Tokens have no associated scanner, counting all nonempty lines.\n", $err - ensure - $stderr = stderr end tokens.scanner = ScannerMockup.new |