summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZachary Scott <e@zzak.io>2014-05-24 19:36:55 -0700
committerZachary Scott <e@zzak.io>2014-05-24 19:36:55 -0700
commitfa6aac2ab19762775fba78c264159efb4fcf3ecf (patch)
tree33367cdfad29891dbdf330566c9e041ac2f142d5
parentb6e8b10c83720fe73ab40784b3b0cf2d166cea70 (diff)
downloadpsych-fa6aac2ab19762775fba78c264159efb4fcf3ecf.tar.gz
YAML::ENGINE was removed in [Bug #8344]
-rw-r--r--CHANGELOG.rdoc4
-rw-r--r--test/psych/test_engine_manager.rb47
-rw-r--r--test/psych/test_yamldbm.rb2
-rw-r--r--test/psych/test_yamlstore.rb2
4 files changed, 4 insertions, 51 deletions
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index eadc02f..078d78d 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -1,3 +1,7 @@
+Sun May 25 11:35:41 2014 Zachary Scott <e@zzak.io>
+
+ * test/psych/*: YAML::ENGINE was removed in [Bug #8344]
+
2014-03-27 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* ext/psych/yaml/scanner.c: merge libyaml 0.1.6
diff --git a/test/psych/test_engine_manager.rb b/test/psych/test_engine_manager.rb
deleted file mode 100644
index 33a6743..0000000
--- a/test/psych/test_engine_manager.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require_relative 'helper'
-require 'yaml'
-
-module Psych
- class TestEngineManager < TestCase
- def test_bad_engine
- assert_raises(ArgumentError) do
- YAML::ENGINE.yamler = 'foooo'
- end
- end
-
- def test_set_psych
- YAML::ENGINE.yamler = 'psych'
- assert_equal Psych, YAML
- assert_equal 'psych', YAML::ENGINE.yamler
- end
-
- A = Struct.new(:name)
-
- def test_dump_types
- YAML::ENGINE.yamler = 'psych'
-
- assert_to_yaml ::Object.new
- assert_to_yaml Time.now
- assert_to_yaml Date.today
- assert_to_yaml('a' => 'b')
- assert_to_yaml A.new('foo')
- assert_to_yaml %w{a b}
- assert_to_yaml Exception.new('foo')
- assert_to_yaml "hello!"
- assert_to_yaml :fooo
- assert_to_yaml(1..10)
- assert_to_yaml(/hello!~/)
- assert_to_yaml 1
- assert_to_yaml 1.2
- assert_to_yaml Rational(1, 2)
- assert_to_yaml Complex(1, 2)
- assert_to_yaml true
- assert_to_yaml false
- assert_to_yaml nil
- end
-
- def assert_to_yaml obj
- assert obj.to_yaml, "#{obj.class} to_yaml works"
- end
- end
-end
diff --git a/test/psych/test_yamldbm.rb b/test/psych/test_yamldbm.rb
index dba9eee..23c7c9e 100644
--- a/test/psych/test_yamldbm.rb
+++ b/test/psych/test_yamldbm.rb
@@ -13,7 +13,6 @@ module Psych
class YAMLDBMTest < TestCase
def setup
- @engine, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'psych'
@dir = Dir.mktmpdir("rubytest-file")
File.chown(-1, Process.gid, @dir)
@yamldbm_file = make_tmp_filename("yamldbm")
@@ -21,7 +20,6 @@ module Psych
end
def teardown
- YAML::ENGINE.yamler = @engine
@yamldbm.clear
@yamldbm.close
FileUtils.remove_entry_secure @dir
diff --git a/test/psych/test_yamlstore.rb b/test/psych/test_yamlstore.rb
index 19471b1..94f1330 100644
--- a/test/psych/test_yamlstore.rb
+++ b/test/psych/test_yamlstore.rb
@@ -7,7 +7,6 @@ module Psych
class YAMLStoreTest < TestCase
def setup
- @engine, YAML::ENGINE.yamler = YAML::ENGINE.yamler, 'psych'
@dir = Dir.mktmpdir("rubytest-file")
File.chown(-1, Process.gid, @dir)
@yamlstore_file = make_tmp_filename("yamlstore")
@@ -15,7 +14,6 @@ module Psych
end
def teardown
- YAML::ENGINE.yamler = @engine
FileUtils.remove_entry_secure @dir
end