summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/unit/file_type.rb4
-rw-r--r--test/unit/lines_of_code.rb24
2 files changed, 10 insertions, 18 deletions
diff --git a/test/unit/file_type.rb b/test/unit/file_type.rb
index dfd5b17..d62a006 100644
--- a/test/unit/file_type.rb
+++ b/test/unit/file_type.rb
@@ -20,10 +20,6 @@ class FileTypeTests < Test::Unit::TestCase
end
def test_block_supersedes_default_warning
- if defined? JRUBY_VERSION
- $stderr.puts 'Skipped test because of JRUBY bug.'
- return
- end
stderr, fake_stderr = $stderr, Object.new
begin
$err = ''
diff --git a/test/unit/lines_of_code.rb b/test/unit/lines_of_code.rb
index a76fed6..4231d5a 100644
--- a/test/unit/lines_of_code.rb
+++ b/test/unit/lines_of_code.rb
@@ -39,21 +39,17 @@ puts "Hello world!"
tokens.concat ["\n", :space]
tokens.concat ["Hello\n", :comment]
- if defined? JRUBY_VERSION
- $stderr.puts 'Skipped test because of JRUBY bug.'
- else
- stderr, fake_stderr = $stderr, Object.new
- begin
- $err = ''
- def fake_stderr.write x
- $err << x
- end
- $stderr = fake_stderr
- assert_equal 1, tokens.lines_of_code
- assert_equal "Tokens have no associated scanner, counting all nonempty lines.\n", $err
- ensure
- $stderr = stderr
+ stderr, fake_stderr = $stderr, Object.new
+ begin
+ $err = ''
+ def fake_stderr.write x
+ $err << x
end
+ $stderr = fake_stderr
+ 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