Skip to content

Commit

Permalink
[REMOVE] isolate handshake test
Browse files Browse the repository at this point in the history
  • Loading branch information
vinniefalco committed Apr 27, 2017
1 parent 1eae141 commit d24227c
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 107 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ after_script:

notifications:
email:
false
false
11 changes: 0 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -166,15 +166,4 @@ file(GLOB_RECURSE EXTRAS_INCLUDES
${PROJECT_SOURCE_DIR}/extras/beast/*.ipp
)

add_subdirectory (examples)
if (NOT OPENSSL_FOUND)
message("OpenSSL not found. Not building examples/ssl")
else()
add_subdirectory (examples/ssl)
endif()

add_subdirectory (test)
add_subdirectory (test/core)
add_subdirectory (test/http)
add_subdirectory (test/websocket)
add_subdirectory (test/zlib)
1 change: 0 additions & 1 deletion Jamroot
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,3 @@ project beast
;

build-project test ;
build-project examples ;
83 changes: 0 additions & 83 deletions test/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,71 +7,6 @@

import os ;

compile config.cpp : : ;
compile core.cpp : : ;
compile http.cpp : : ;
compile version.cpp : : ;
compile websocket.cpp : : ;
compile zlib.cpp : : ;

unit-test core-tests :
../extras/beast/unit_test/main.cpp
core/async_completion.cpp
core/bind_handler.cpp
core/buffer_cat.cpp
core/buffer_concepts.cpp
core/buffers_adapter.cpp
core/clamp.cpp
core/consuming_buffers.cpp
core/dynabuf_readstream.cpp
core/error.cpp
core/flat_streambuf.cpp
core/handler_alloc.cpp
core/handler_concepts.cpp
core/handler_ptr.cpp
core/placeholders.cpp
core/prepare_buffer.cpp
core/prepare_buffers.cpp
core/static_streambuf.cpp
core/static_string.cpp
core/stream_concepts.cpp
core/streambuf.cpp
core/to_string.cpp
core/write_dynabuf.cpp
core/base64.cpp
core/empty_base_optimization.cpp
core/get_lowest_layer.cpp
core/is_call_possible.cpp
core/sha1.cpp
;

unit-test http-tests :
../extras/beast/unit_test/main.cpp
http/basic_dynabuf_body.cpp
http/basic_fields.cpp
http/basic_parser.cpp
http/concepts.cpp
http/design.cpp
http/error.cpp
http/fields.cpp
http/header_parser.cpp
http/message.cpp
http/message_parser.cpp
http/read.cpp
http/reason.cpp
http/rfc7230.cpp
http/streambuf_body.cpp
http/string_body.cpp
http/write.cpp
http/chunk_encode.cpp
;

unit-test bench-tests :
../extras/beast/unit_test/main.cpp
http/nodejs_parser.cpp
http/parser_bench.cpp
;

unit-test websocket-tests :
../extras/beast/unit_test/main.cpp
websocket/error.cpp
Expand All @@ -83,21 +18,3 @@ unit-test websocket-tests :
websocket/mask.cpp
websocket/utf8_checker.cpp
;

unit-test zlib-tests :
../extras/beast/unit_test/main.cpp
zlib/zlib-1.2.8/adler32.c
zlib/zlib-1.2.8/compress.c
zlib/zlib-1.2.8/crc32.c
zlib/zlib-1.2.8/deflate.c
zlib/zlib-1.2.8/infback.c
zlib/zlib-1.2.8/inffast.c
zlib/zlib-1.2.8/inflate.c
zlib/zlib-1.2.8/inftrees.c
zlib/zlib-1.2.8/trees.c
zlib/zlib-1.2.8/uncompr.c
zlib/zlib-1.2.8/zutil.c
zlib/deflate_stream.cpp
zlib/error.cpp
zlib/inflate_stream.cpp
;
7 changes: 0 additions & 7 deletions test/websocket/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,7 @@ add_executable (websocket-tests
../../extras/beast/unit_test/main.cpp
websocket_async_echo_server.hpp
websocket_sync_echo_server.hpp
error.cpp
option.cpp
rfc6455.cpp
stream.cpp
teardown.cpp
frame.cpp
mask.cpp
utf8_checker.cpp
)

if (NOT WIN32)
Expand Down
16 changes: 12 additions & 4 deletions test/websocket/stream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1786,16 +1786,17 @@ class stream_test
auto const any = endpoint_type{
address_type::from_string("127.0.0.1"), 0};

permessage_deflate pmd;
pmd.client_enable = false;
pmd.server_enable = false;

#if 0
testOptions();
testAccept();
testHandshake();
testBadHandshakes();
testBadResponses();

permessage_deflate pmd;
pmd.client_enable = false;
pmd.server_enable = false;

{
error_code ec;
::websocket::sync_echo_server server{nullptr};
Expand All @@ -1820,6 +1821,7 @@ class stream_test
auto const ep = server.local_endpoint();
testAsyncWriteFrame(ep);
}
#endif

auto const doClientTests =
[this, any](permessage_deflate const& pmd)
Expand Down Expand Up @@ -1856,21 +1858,27 @@ class stream_test
}
};

#if 0
pmd.client_enable = false;
pmd.server_enable = false;
doClientTests(pmd);
#endif

#if 1
pmd.client_enable = true;
pmd.server_enable = true;
pmd.client_max_window_bits = 10;
pmd.client_no_context_takeover = false;
doClientTests(pmd);
#endif

#if 0
pmd.client_enable = true;
pmd.server_enable = true;
pmd.client_max_window_bits = 10;
pmd.client_no_context_takeover = true;
doClientTests(pmd);
#endif
}
};

Expand Down

0 comments on commit d24227c

Please sign in to comment.