PROTON-1537: [ruby] Fix typo in messaging_adapter.rb code
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/38afef9d Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/38afef9d Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/38afef9d Branch: refs/heads/go1 Commit: 38afef9d2d6a09d15a489d3223190fedb8bb09c0 Parents: bf8d90e Author: Alan Conway <[email protected]> Authored: Tue Dec 19 10:08:46 2017 -0500 Committer: Alan Conway <[email protected]> Committed: Tue Dec 19 10:10:45 2017 -0500 ---------------------------------------------------------------------- proton-c/bindings/ruby/lib/handler/messaging_adapter.rb | 2 +- proton-c/bindings/ruby/tests/test_delivery.rb | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38afef9d/proton-c/bindings/ruby/lib/handler/messaging_adapter.rb ---------------------------------------------------------------------- diff --git a/proton-c/bindings/ruby/lib/handler/messaging_adapter.rb b/proton-c/bindings/ruby/lib/handler/messaging_adapter.rb index 92f92e1..acd08e9 100644 --- a/proton-c/bindings/ruby/lib/handler/messaging_adapter.rb +++ b/proton-c/bindings/ruby/lib/handler/messaging_adapter.rb @@ -91,7 +91,7 @@ module Qpid::Proton rescue Reject d.reject unless d.settled? rescue Release - d.release unless d.settled + d.release unless d.settled? end end end http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/38afef9d/proton-c/bindings/ruby/tests/test_delivery.rb ---------------------------------------------------------------------- diff --git a/proton-c/bindings/ruby/tests/test_delivery.rb b/proton-c/bindings/ruby/tests/test_delivery.rb index 266ccd6..5f20b58 100644 --- a/proton-c/bindings/ruby/tests/test_delivery.rb +++ b/proton-c/bindings/ruby/tests/test_delivery.rb @@ -78,6 +78,8 @@ class TestDelivery < Minitest::Test when "modify" then delivery.release({:undeliverable => true, :annotations => {:x => 42 }}) when "modify-empty" then delivery.release({:failed => false, :undeliverable => false, :annotations => {}}) when "modify-nil" then delivery.release({:failed => false, :undeliverable => false, :annotations => nil}) + when "reject-raise" then raise Reject + when "release-raise" then raise Release else raise inspect end end @@ -85,7 +87,7 @@ class TestDelivery < Minitest::Test def test_outcomes rh = ReceiveHandler.new - sh = SendHandler.new(["accept", "reject", "release-really", "release", "modify", "modify-empty", "modify-nil"]) + sh = SendHandler.new(["accept", "reject", "release-really", "release", "modify", "modify-empty", "modify-nil", "reject-raise", "release-raise"]) c = Container.new(nil, __method__) l = c.listen_io(TCPServer.new(0), ListenOnceHandler.new({ :handler => rh })) c.connect(l.url, {:handler => sh}) @@ -98,8 +100,10 @@ class TestDelivery < Minitest::Test assert_equal ["modify", :on_tracker_modify, "5", Transfer::MODIFIED, {:failed=>true, :undeliverable=>true, :annotations=>{:x => 42}}], o.shift assert_equal ["modify-empty", :on_tracker_release, "6", Transfer::RELEASED, nil], o.shift assert_equal ["modify-nil", :on_tracker_release, "7", Transfer::RELEASED, nil], o.shift + assert_equal ["reject-raise", :on_tracker_reject, "8", Transfer::REJECTED, nil], o.shift + assert_equal ["release-raise", :on_tracker_modify, "9", Transfer::MODIFIED, {:failed=>true, :undeliverable=>false, :annotations=>nil}], o.shift assert_empty o - assert_equal ["accept", "reject", "release-really", "release", "modify", "modify-empty", "modify-nil"], rh.received + assert_equal ["accept", "reject", "release-really", "release", "modify", "modify-empty", "modify-nil", "reject-raise", "release-raise"], rh.received assert_empty sh.unsettled end end --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
