diff options
author | Kazuki Yamaguchi <k@rhe.jp> | 2016-05-08 21:03:25 +0900 |
---|---|---|
committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-05-08 21:13:01 +0900 |
commit | cc5d3be0fd0b2794fd1149308e4071fc25fe7a44 (patch) | |
tree | a195c4d5a68cf3d6e9bdaa792dbe474318b20726 /test/plum/server/test_connection.rb | |
parent | 26ec6b88a8e078499835851a0310eba486475b7b (diff) | |
download | plum-cc5d3be0fd0b2794fd1149308e4071fc25fe7a44.tar.gz |
frame: create subclasses for each frame type
This improves code readability.
Diffstat (limited to 'test/plum/server/test_connection.rb')
-rw-r--r-- | test/plum/server/test_connection.rb | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/test/plum/server/test_connection.rb b/test/plum/server/test_connection.rb index 87e1893..ccc9dae 100644 --- a/test/plum/server/test_connection.rb +++ b/test/plum/server/test_connection.rb @@ -21,7 +21,7 @@ class HTTPSConnectionNegotiationTest < Minitest::Test con = ServerConnection.new(StringIO.new.method(:write)) con << Connection::CLIENT_CONNECTION_PREFACE assert_connection_error(:protocol_error) { - con << Frame.new(type: :window_update, stream_id: 0, payload: "".push_uint32(1)).assemble + con << Frame::WindowUpdate.new(0, 1).assemble } end @@ -31,7 +31,7 @@ class HTTPSConnectionNegotiationTest < Minitest::Test assert_no_error { con << magic[0...5] con << magic[5..-1] - con << Frame.new(type: :settings, stream_id: 0).assemble + con << Frame::Settings.new.assemble } end @@ -57,10 +57,9 @@ class HTTPSConnectionNegotiationTest < Minitest::Test end } } + rescue Errno::EPIPE rescue Timeout::Error flunk "server timeout" - rescue => e - flunk e ensure tcp_server.close end @@ -75,16 +74,14 @@ class HTTPSConnectionNegotiationTest < Minitest::Test ssl = OpenSSL::SSL::SSLSocket.new(sock, ctx) ssl.connect ssl.write Connection::CLIENT_CONNECTION_PREFACE - ssl.write Frame.settings.assemble - sleep - rescue => e - flunk e + ssl.write Frame::Settings.new.assemble + rescue Errno::EPIPE ensure sock.close end } server_thread.join - client_thread.kill + client_thread.join flunk "test not run" unless run end |