summaryrefslogtreecommitdiff
path: root/test/psych
diff options
context:
space:
mode:
authortenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-09 18:44:27 +0000
committertenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-09 18:44:27 +0000
commit59a13448083080407e33c90ca0f02166ce88c01c (patch)
treed565965a8f0bf7325e28ecac6fee2e8a09d816d2 /test/psych
parent14c97cf9b6721d55f8f5afa0e7be7e7e80311aea (diff)
downloadruby-59a13448083080407e33c90ca0f02166ce88c01c.tar.gz
* ext/psych/parser.c: removed external encoding setter, allow parser
to be reused. * ext/psych/lib/psych/parser.rb: added external encoding setter. * test/psych/test_parser.rb: test parser reuse git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34527 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/psych')
-rw-r--r--test/psych/test_parser.rb15
1 files changed, 6 insertions, 9 deletions
diff --git a/test/psych/test_parser.rb b/test/psych/test_parser.rb
index b607514fe6..a491d7fdd6 100644
--- a/test/psych/test_parser.rb
+++ b/test/psych/test_parser.rb
@@ -32,6 +32,12 @@ module Psych
@handler.parser = @parser
end
+ def test_multiparse
+ 3.times do
+ @parser.parse '--- foo'
+ end
+ end
+
def test_filename
ex = assert_raises(Psych::SyntaxError) do
@parser.parse '--- `', 'omg!'
@@ -87,15 +93,6 @@ module Psych
assert_equal 19, @parser.mark.index
end
- def test_set_encoding_twice
- @parser.external_encoding = Psych::Parser::UTF16LE
-
- e = assert_raises(Psych::Exception) do
- @parser.external_encoding = Psych::Parser::UTF16LE
- end
- assert_equal "don't set the encoding twice!", e.message
- end
-
def test_bom
tadpole = 'おたまじゃくし'