diff options
author | Aaron Patterson <tenderlove@ruby-lang.org> | 2020-06-03 10:18:34 -0700 |
---|---|---|
committer | Aaron Patterson <tenderlove@ruby-lang.org> | 2020-06-03 10:18:34 -0700 |
commit | 3f5e520fd38c39975c25a1bbd8d6c8ec9a132f2d (patch) | |
tree | 5bbdf5f950ce1c54c18e5640bafca442cfd2dcc6 | |
parent | d2deaa9adfc88fc0b870df022a434d6431277d08 (diff) | |
download | psych-3f5e520fd38c39975c25a1bbd8d6c8ec9a132f2d.zip |
Fixing compatibility with libyaml 0.2.5
The main issue is that commas aren't allowed in local tags. libyaml
was updated to follow the spec, and our tests were out of date.
See: https://github.com/yaml/libyaml/issues/196
-rw-r--r-- | test/psych/test_nil.rb | 4 | ||||
-rw-r--r-- | test/psych/test_psych.rb | 17 | ||||
-rw-r--r-- | test/psych/test_yaml.rb | 24 |
3 files changed, 21 insertions, 24 deletions
diff --git a/test/psych/test_nil.rb b/test/psych/test_nil.rb index 910a2e6..bcbbcb9 100644 --- a/test/psych/test_nil.rb +++ b/test/psych/test_nil.rb @@ -5,13 +5,13 @@ module Psych class TestNil < TestCase def test_nil yml = Psych.dump nil - assert_match(/--- \n(?:\.\.\.\n)?/, yml) + assert_match(/---[ ]?\n(?:\.\.\.\n)?/, yml) assert_nil Psych.load(yml) end def test_array_nil yml = Psych.dump [nil] - assert_equal "---\n- \n", yml + assert_match(/---\n-[ ]?\n/, yml) assert_equal [nil], Psych.load(yml) end diff --git a/test/psych/test_psych.rb b/test/psych/test_psych.rb index 8fd9d27..55d9f19 100644 --- a/test/psych/test_psych.rb +++ b/test/psych/test_psych.rb @@ -178,17 +178,17 @@ class TestPsych < Psych::TestCase def test_domain_types got = nil - Psych.add_domain_type 'foo.bar,2002', 'foo' do |type, val| + Psych.add_domain_type 'foo.bar/2002', 'foo' do |type, val| got = val end - Psych.load('--- !foo.bar,2002/foo hello') + Psych.load('--- !foo.bar/2002:foo hello') assert_equal 'hello', got - Psych.load("--- !foo.bar,2002/foo\n- hello\n- world") + Psych.load("--- !foo.bar/2002:foo\n- hello\n- world") assert_equal %w{ hello world }, got - Psych.load("--- !foo.bar,2002/foo\nhello: world") + Psych.load("--- !foo.bar/2002:foo\nhello: world") assert_equal({ 'hello' => 'world' }, got) end @@ -311,16 +311,13 @@ class TestPsych < Psych::TestCase types = [] appender = lambda { |*args| types << args } - Psych.add_builtin_type('foo', &appender) - Psych.add_domain_type('example.com,2002', 'foo', &appender) + Psych.add_domain_type('example.com:2002', 'foo', &appender) Psych.load <<-eoyml -- !tag:yaml.org,2002:foo bar -- !tag:example.com,2002:foo bar +- !tag:example.com:2002:foo bar eoyml assert_equal [ - ["tag:yaml.org,2002:foo", "bar"], - ["tag:example.com,2002:foo", "bar"] + ["tag:example.com:2002:foo", "bar"] ], types end diff --git a/test/psych/test_yaml.rb b/test/psych/test_yaml.rb index 5fa759c..0dfd60f 100644 --- a/test/psych/test_yaml.rb +++ b/test/psych/test_yaml.rb @@ -617,11 +617,11 @@ EOY raise ArgumentError, "Not a Hash in domain.tld,2002/invoice: " + val.inspect end } - Psych.add_domain_type( "domain.tld,2002", 'invoice', &customer_proc ) - Psych.add_domain_type( "domain.tld,2002", 'customer', &customer_proc ) + Psych.add_domain_type( "domain.tld/2002", 'invoice', &customer_proc ) + Psych.add_domain_type( "domain.tld/2002", 'customer', &customer_proc ) assert_parse_only( { "invoice"=> { "customers"=> [ { "given"=>"Chris", "type"=>"domain customer", "family"=>"Dumars" } ], "type"=>"domain invoice" } }, <<EOY # 'http://domain.tld,2002/invoice' is some type family. -invoice: !domain.tld,2002/invoice +invoice: !domain.tld/2002:invoice # 'seq' is shorthand for 'http://yaml.org/seq'. # This does not effect '^customer' below # because it is does not specify a prefix. @@ -705,7 +705,7 @@ EOY end def test_spec_explicit_families - Psych.add_domain_type( "somewhere.com,2002", 'type' ) { |type, val| + Psych.add_domain_type( "somewhere.com/2002", 'type' ) { |type, val| "SOMEWHERE: #{val}" } assert_parse_only( @@ -717,7 +717,7 @@ picture: !binary | Pz7Y6OjuDg4J+fn5OTk6enp 56enmleECcgggoBADs= -hmm: !somewhere.com,2002/type | +hmm: !somewhere.com/2002:type | family above is short for http://somewhere.com/type EOY @@ -726,7 +726,7 @@ EOY def test_spec_application_family # Testing the clarkevans.com graphs - Psych.add_domain_type( "clarkevans.com,2002", 'graph/shape' ) { |type, val| + Psych.add_domain_type( "clarkevans.com/2002", 'graph/shape' ) { |type, val| if Array === val val << "Shape Container" val @@ -743,13 +743,13 @@ EOY raise ArgumentError, "Invalid graph of type #{val.class}: " + val.inspect end } - Psych.add_domain_type( "clarkevans.com,2002", 'graph/circle', &one_shape_proc ) - Psych.add_domain_type( "clarkevans.com,2002", 'graph/line', &one_shape_proc ) - Psych.add_domain_type( "clarkevans.com,2002", 'graph/text', &one_shape_proc ) + Psych.add_domain_type( "clarkevans.com/2002", 'graph/circle', &one_shape_proc ) + Psych.add_domain_type( "clarkevans.com/2002", 'graph/line', &one_shape_proc ) + Psych.add_domain_type( "clarkevans.com/2002", 'graph/text', &one_shape_proc ) # MODIFIED to remove invalid Psych assert_parse_only( [[{"radius"=>7, "center"=>{"x"=>73, "y"=>129}, "TYPE"=>"Shape: graph/circle"}, {"finish"=>{"x"=>89, "y"=>102}, "TYPE"=>"Shape: graph/line", "start"=>{"x"=>73, "y"=>129}}, {"TYPE"=>"Shape: graph/text", "value"=>"Pretty vector drawing.", "start"=>{"x"=>73, "y"=>129}, "color"=>16772795}, "Shape Container"]], <<EOY -- !clarkevans.com,2002/graph/shape +- !clarkevans.com/2002:graph/shape - !/graph/circle center: &ORIGIN {x: 73, y: 129} radius: 7 @@ -771,8 +771,8 @@ EOY # have the same type and value. - 10.0 - !float 10 -- !yaml.org,2002/float '10' -- !yaml.org,2002/float "\\ +- !yaml.org/2002/float '10' +- !yaml.org/2002/float "\\ 1\\ 0" EOY |