aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2015-11-11 18:48:31 +0900
committerKazuki Yamaguchi <k@rhe.jp>2015-11-11 18:48:31 +0900
commitdc0e97de3cda4e104e48ecaaba9181b7d4906d9d (patch)
treed7251f4c1d81272ec7224e918072d5e31ef225a1 /test
parent3466b54b14cc2d4ce3d1db6af1bc282678bab443 (diff)
downloadplum-dc0e97de3cda4e104e48ecaaba9181b7d4906d9d.tar.gz
frame_factory: specify flags by kwargs
Diffstat (limited to 'test')
-rw-r--r--test/plum/client/test_upgrade_client_session.rb4
-rw-r--r--test/plum/test_connection_utils.rb2
-rw-r--r--test/plum/test_flow_control.rb12
-rw-r--r--test/plum/test_frame_factory.rb6
-rw-r--r--test/plum/test_stream.rb4
5 files changed, 14 insertions, 14 deletions
diff --git a/test/plum/client/test_upgrade_client_session.rb b/test/plum/client/test_upgrade_client_session.rb
index d695142..3cc97b4 100644
--- a/test/plum/client/test_upgrade_client_session.rb
+++ b/test/plum/client/test_upgrade_client_session.rb
@@ -24,8 +24,8 @@ class UpgradeClientSessionTest < Minitest::Test
sock.rio.string << Frame.settings().assemble
sock.rio.string << Frame.settings(:ack).assemble
res = session.request({ ":method" => "GET", ":path" => "/aa" }, "aa", {})
- sock.rio.string << Frame.headers(3, HPACK::Encoder.new(3).encode(":status" => "200", "content-length" => "3"), :end_headers).assemble
- sock.rio.string << Frame.data(3, "aaa", :end_stream).assemble
+ sock.rio.string << Frame.headers(3, HPACK::Encoder.new(3).encode(":status" => "200", "content-length" => "3"), end_headers: true).assemble
+ sock.rio.string << Frame.data(3, "aaa", end_stream: true).assemble
session.succ until res.finished?
assert(res.finished?)
assert_equal("aaa", res.body)
diff --git a/test/plum/test_connection_utils.rb b/test/plum/test_connection_utils.rb
index 0051117..35ab7b8 100644
--- a/test/plum/test_connection_utils.rb
+++ b/test/plum/test_connection_utils.rb
@@ -16,7 +16,7 @@ class ServerConnectionUtilsTest < Minitest::Test
def test_server_goaway
open_server_connection {|con|
- con << Frame.headers(3, "", :end_stream, :end_headers).assemble
+ con << Frame.headers(3, "", end_stream: true, end_headers: true).assemble
con.goaway(:stream_closed)
last = sent_frames.last
diff --git a/test/plum/test_flow_control.rb b/test/plum/test_flow_control.rb
index 758472d..8133e0e 100644
--- a/test/plum/test_flow_control.rb
+++ b/test/plum/test_flow_control.rb
@@ -135,17 +135,17 @@ class FlowControlTest < Minitest::Test
prepare.call {|con, stream|
con.window_update(500) # extend only connection
- con << Frame.headers(stream.id, "", :end_headers).assemble
+ con << Frame.headers(stream.id, "", end_headers: true).assemble
assert_stream_error(:flow_control_error) {
- con << Frame.data(stream.id, "\x00" * 30, :end_stream).assemble
+ con << Frame.data(stream.id, "\x00" * 30, end_stream: true).assemble
}
}
prepare.call {|con, stream|
stream.window_update(500) # extend only stream
- con << Frame.headers(stream.id, "", :end_headers).assemble
+ con << Frame.headers(stream.id, "", end_headers: true).assemble
assert_connection_error(:flow_control_error) {
- con << Frame.data(stream.id, "\x00" * 30, :end_stream).assemble
+ con << Frame.data(stream.id, "\x00" * 30, end_stream: true).assemble
}
}
end
@@ -155,8 +155,8 @@ class FlowControlTest < Minitest::Test
con = stream.connection
con.settings(initial_window_size: 24)
stream.window_update(1)
- con << Frame.headers(stream.id, "", :end_headers).assemble
- con << Frame.data(stream.id, "\x00" * 20, :end_stream).assemble
+ con << Frame.headers(stream.id, "", end_headers: true).assemble
+ con << Frame.data(stream.id, "\x00" * 20, end_stream: true).assemble
assert_equal(4, con.recv_remaining_window)
assert_equal(5, stream.recv_remaining_window)
con.settings(initial_window_size: 60)
diff --git a/test/plum/test_frame_factory.rb b/test/plum/test_frame_factory.rb
index ccaa56c..109fb95 100644
--- a/test/plum/test_frame_factory.rb
+++ b/test/plum/test_frame_factory.rb
@@ -55,7 +55,7 @@ class FrameFactoryTest < Minitest::Test
end
def test_continuation
- frame = Frame.continuation(123, "abc", :end_headers)
+ frame = Frame.continuation(123, "abc", end_headers: true)
assert_frame(frame,
type: :continuation,
stream_id: 123,
@@ -74,7 +74,7 @@ class FrameFactoryTest < Minitest::Test
end
def test_headers
- frame = Frame.headers(123, "abc", :end_stream)
+ frame = Frame.headers(123, "abc", end_stream: true)
assert_frame(frame,
type: :headers,
stream_id: 123,
@@ -83,7 +83,7 @@ class FrameFactoryTest < Minitest::Test
end
def test_push_promise
- frame = Frame.push_promise(345, 2, "abc", :end_headers)
+ frame = Frame.push_promise(345, 2, "abc", end_headers: true)
assert_frame(frame,
type: :push_promise,
stream_id: 345,
diff --git a/test/plum/test_stream.rb b/test/plum/test_stream.rb
index a9de58e..9b06214 100644
--- a/test/plum/test_stream.rb
+++ b/test/plum/test_stream.rb
@@ -28,7 +28,7 @@ class StreamTest < Minitest::Test
}
assert_stream_error(:frame_size_error) {
- con << Frame.headers(1, "", :end_headers).assemble
+ con << Frame.headers(1, "", end_headers: true).assemble
}
last = sent_frames.last
@@ -43,7 +43,7 @@ class StreamTest < Minitest::Test
stream = nil
con.on(:headers) { |s| stream = s }
- con << Frame.headers(1, "", :end_headers).assemble
+ con << Frame.headers(1, "", end_headers: true).assemble
assert_raises(LocalStreamError) {
con << Frame.rst_stream(1, :frame_size_error).assemble
}