diff options
author | Florian Frank <flori@ping.de> | 2012-11-29 13:44:14 +0100 |
---|---|---|
committer | Florian Frank <flori@ping.de> | 2012-11-29 15:01:27 +0100 |
commit | 103ae8eb39b598964b497601c73b7a6fc8c61ad5 (patch) | |
tree | 8f83e3ebdc1ed69a9d59332ca3214d5e18a7e711 | |
parent | e3c6a7c7fee695b45b9cd2bf062138bcc54b2d28 (diff) | |
download | json-103ae8eb39b598964b497601c73b7a6fc8c61ad5.tar.gz |
add merge alias for configure in jruby
-rw-r--r-- | java/src/json/ext/GeneratorState.java | 2 | ||||
-rwxr-xr-x | tests/test_json_generate.rb | 24 |
2 files changed, 25 insertions, 1 deletions
diff --git a/java/src/json/ext/GeneratorState.java b/java/src/json/ext/GeneratorState.java index 14d5431..58904ee 100644 --- a/java/src/json/ext/GeneratorState.java +++ b/java/src/json/ext/GeneratorState.java @@ -445,7 +445,7 @@ public class GeneratorState extends RubyObject { * @param vOpts The options hash * @return The receiver */ - @JRubyMethod + @JRubyMethod(alias = "merge") public IRubyObject configure(ThreadContext context, IRubyObject vOpts) { OptionsReader opts = new OptionsReader(context, vOpts); diff --git a/tests/test_json_generate.rb b/tests/test_json_generate.rb index a7975bf..f580c12 100755 --- a/tests/test_json_generate.rb +++ b/tests/test_json_generate.rb @@ -227,6 +227,30 @@ EOT GC.stress = stress end if GC.respond_to?(:stress=) + def test_configure_using_merge + numbered_state = { + :indent => "1", + :space => '2', + :space_before => '3', + :object_nl => '4', + :array_nl => '5' + } + state1 = JSON.state.new + state1.merge(numbered_state) + assert_equal '1', state1.indent + assert_equal '2', state1.space + assert_equal '3', state1.space_before + assert_equal '4', state1.object_nl + assert_equal '5', state1.array_nl + state2 = JSON.state.new + state2.configure(numbered_state) + assert_equal '1', state2.indent + assert_equal '2', state2.space + assert_equal '3', state2.space_before + assert_equal '4', state2.object_nl + assert_equal '5', state2.array_nl + end + if defined?(JSON::Ext::Generator) def test_broken_bignum # [ruby-core:38867] pid = fork do |