Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita7892e1

Browse files
committed
Merge pull request#11 from imaginaryboy/gtest-integration
Migrate logging tests to gtest.
2 parents4874357 +a80b80c commita7892e1

File tree

3 files changed

+35
-38
lines changed

3 files changed

+35
-38
lines changed

‎logging/test/CMakeLists.txt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
# (See accompanying file LICENSE_1_0.txt or copy at
55
# http://www.boost.org/LICENSE_1_0.txt)
66

7+
include_directories(${GTEST_INCLUDE_DIRS})
78
include_directories(${CPP-NETLIB_SOURCE_DIR}/uri/src)
89
include_directories(${CPP-NETLIB_SOURCE_DIR}/message/src)
910
include_directories(${CPP-NETLIB_SOURCE_DIR}/logging/src)
1011

11-
if (Boost_FOUND)
12+
if (CPP-NETLIB_BUILD_TESTS)
1213
set(
1314
TESTS
1415
logging_log_record
@@ -22,10 +23,10 @@ if (Boost_FOUND)
2223
add_executable(cpp-netlib-${test}${test}.cpp)
2324
add_dependencies(cpp-netlib-${test} cppnetlib-logging)
2425
target_link_libraries(cpp-netlib-${test}
25-
${Boost_LIBRARIES} cppnetlib-logging)
26+
${Boost_LIBRARIES}${GTEST_BOTH_LIBRARIES}cppnetlib-logging)
2627
set_target_properties(cpp-netlib-${test}
2728
PROPERTIESRUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/tests)
2829
add_test(cpp-netlib-${test}
2930
${CPP-NETLIB_BINARY_DIR}/tests/cpp-netlib-${test})
3031
endforeach (test)
31-
endif()
32+
endif (CPP-NETLIB_BUILD_TESTS)

‎logging/test/logging_custom_handler.cpp‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@
66
#include<string>
77
#include<sstream>
88

9-
#defineBOOST_TEST_MODULE logging log_record
10-
#include<boost/config/warning_disable.hpp>
11-
#include<boost/test/unit_test.hpp>
9+
#include<gtest/gtest.h>
1210

1311
#include<network/logging/logging.hpp>
1412

1513
usingnamespacenetwork::logging;
1614

17-
BOOST_AUTO_TEST_CASE(custom_log_handler_output) {
15+
TEST(logging_custom_handler,custom_log_handler_output) {
1816

1917
std::stringstream log_output;
2018
auto custom_log_handler = [&](const log_record& log )
@@ -32,6 +30,6 @@ BOOST_AUTO_TEST_CASE(custom_log_handler_output) {
3230

3331
constauto result_output = log_output.str();
3432

35-
BOOST_CHECK( !result_output.empty() );
36-
BOOST_CHECK( result_output =="[CPPNETLIB]<somewhere.cpp:42>" + message );
33+
ASSERT_TRUE( !result_output.empty() );
34+
ASSERT_TRUE( result_output =="[CPPNETLIB]<somewhere.cpp:42>" + message );
3735
}

‎logging/test/logging_log_record.cpp‎

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,74 +5,72 @@
55

66
#include<string>
77

8-
#defineBOOST_TEST_MODULE logging log_record
9-
#include<boost/config/warning_disable.hpp>
10-
#include<boost/test/unit_test.hpp>
8+
#include<gtest/gtest.h>
119

1210
#include<network/logging/logging.hpp>
1311
#defineNETWORK_ENABLE_LOGGING
1412
#include<network/detail/debug.hpp>
1513

1614
usingnamespacenetwork::logging;
1715

18-
BOOST_AUTO_TEST_CASE(default_constructor) {
16+
TEST(logging_log_record,default_constructor) {
1917
log_record record;
20-
BOOST_CHECK( record.message() =="" );
21-
BOOST_CHECK( record.filename() == log_record::UNKNOWN_FILE_NAME );
22-
BOOST_CHECK( record.line() ==0 );
18+
ASSERT_TRUE( record.message() =="" );
19+
ASSERT_TRUE( record.filename() == log_record::UNKNOWN_FILE_NAME );
20+
ASSERT_TRUE( record.line() ==0 );
2321
}
2422

25-
BOOST_AUTO_TEST_CASE(cstring_constructor) {
23+
TEST(logging_log_record,cstring_constructor) {
2624
constauto message ="This is a test.";
2725
log_recordrecord( message );
28-
BOOST_CHECK( record.message() == message );
29-
BOOST_CHECK( record.filename() == log_record::UNKNOWN_FILE_NAME );
30-
BOOST_CHECK( record.line() ==0 );
26+
ASSERT_TRUE( record.message() == message );
27+
ASSERT_TRUE( record.filename() == log_record::UNKNOWN_FILE_NAME );
28+
ASSERT_TRUE( record.line() ==0 );
3129
}
3230

33-
BOOST_AUTO_TEST_CASE(string_constructor) {
31+
TEST(logging_log_record,string_constructor) {
3432
const std::stringmessage("This is a test.");
3533
log_recordrecord( message );
36-
BOOST_CHECK( record.message() == message );
37-
BOOST_CHECK( record.filename() == log_record::UNKNOWN_FILE_NAME );
38-
BOOST_CHECK( record.line() ==0 );
34+
ASSERT_TRUE( record.message() == message );
35+
ASSERT_TRUE( record.filename() == log_record::UNKNOWN_FILE_NAME );
36+
ASSERT_TRUE( record.line() ==0 );
3937
}
4038

41-
BOOST_AUTO_TEST_CASE(int_constructor) {
39+
TEST(logging_log_record,int_constructor) {
4240
constauto num =42;
4341
log_recordrecord( num );
44-
BOOST_CHECK( record.message() ==std::to_string( num ) );
45-
BOOST_CHECK( record.filename() == log_record::UNKNOWN_FILE_NAME );
46-
BOOST_CHECK( record.line() ==0 );
42+
ASSERT_TRUE( record.message() ==std::to_string( num ) );
43+
ASSERT_TRUE( record.filename() == log_record::UNKNOWN_FILE_NAME );
44+
ASSERT_TRUE( record.line() ==0 );
4745
}
4846

49-
BOOST_AUTO_TEST_CASE(info_constructor) {
47+
TEST(logging_log_record,info_constructor) {
5048
constauto line_num =42;
5149
constauto file_name ="somewhere.cpp";
5250
log_recordrecord( file_name, line_num );
53-
BOOST_CHECK( record.message() =="" );
54-
BOOST_CHECK( record.filename() == file_name );
55-
BOOST_CHECK( record.line() == line_num );
51+
ASSERT_TRUE( record.message() =="" );
52+
ASSERT_TRUE( record.filename() == file_name );
53+
ASSERT_TRUE( record.line() == line_num );
5654
}
5755

58-
BOOST_AUTO_TEST_CASE(text_stream) {
56+
TEST(logging_log_record,text_stream) {
5957
constauto line_num =42;
6058
constauto file_name ="somewhere.cpp";
6159
constauto message ="At line" +std::to_string(line_num) +" we check the code.";
6260
log_recordrecord( file_name, line_num );
6361

6462
record <<"At line" << line_num <<" we check the code.";
6563

66-
BOOST_CHECK( record.message() == message );
67-
BOOST_CHECK( record.filename() == file_name );
68-
BOOST_CHECK( record.line() == line_num );
64+
ASSERT_TRUE( record.message() == message );
65+
ASSERT_TRUE( record.filename() == file_name );
66+
ASSERT_TRUE( record.line() == line_num );
6967
}
7068

71-
BOOST_AUTO_TEST_CASE(raw_log) {
69+
TEST(logging_log_record,raw_log) {
7270
log("This is a raw log." );
7371
}
7472

75-
BOOST_AUTO_TEST_CASE(macro_log) {
73+
TEST(logging_log_record,macro_log) {
7674
NETWORK_MESSAGE("This is a log through the macro." );
7775
NETWORK_MESSAGE("This is a log through the macro, with a stream! Num=" <<42 <<" - OK!" );
7876
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp