breeze/sockpp
1
0
Fork 0
mirror of https://github.com/fpagliughi/sockpp.git synced 2026-01-12 00:04:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed unit tests on Windows with MSVC

Browse Source
This commit is contained in:
fpagliughi
2023-12-16 14:31:18 -05:00
parent 9f3696583c
commit a97285e5c7
6 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/error.cpp
View File

@@ -41,12 +41,13 @@ namespace sockpp {
/////////////////////////////////////////////////////////////////////////////
#if !defined(_WIN32)
// A global function returning a static instance of the custom category
const ::detail::gai_errc_category &gai_errc_category() {
static ::detail::gai_errc_category c;
return c;
}
#endif
/////////////////////////////////////////////////////////////////////////////
// end namespace 'sockpp'
} // namespace sockpp

4
tests/unit/test_acceptor.cpp
View File

@@ -90,7 +90,7 @@ TEST_CASE("acceptor address constructor", "[acceptor]") {
// Windows returns a different error code than *nix
#if defined(_WIN32)
REQUIRE(sock.last_error() == WSAEINVAL);
REQUIRE(sock.last_error() == errc::invalid_argument);
#else
REQUIRE(sock.last_error() == errc::address_family_not_supported);
#endif
@@ -122,7 +122,7 @@ TEST_CASE("acceptor create", "[acceptor]") {
// Windows returns a different error code than *nix
#if defined(_WIN32)
REQUIRE(sock.last_error() == WSAEINVAL);
REQUIRE(sock.last_error() == errc::invalid_argument);
#else
REQUIRE(sock.last_error() == errc::address_family_not_supported);
#endif

2
tests/unit/test_connector.cpp
View File

@@ -58,7 +58,7 @@ TEST_CASE("connector unspecified address", "[connector]") {
// Windows returns a different error code than *nix
#if defined(_WIN32)
REQUIRE(conn.last_error() == WSAENOTSOCK);
REQUIRE(conn.last_error() == errc::invalid_argument);
#else
REQUIRE(conn.last_error() == errc::address_family_not_supported);
#endif

2
tests/unit/test_datagram_socket.cpp
View File

@@ -90,7 +90,7 @@ TEST_CASE("datagram_socket address constructor", "[datagram_socket]") {
// Windows returns a different error code than *nix
#if defined(_WIN32)
REQUIRE(sock.last_error() == WSAEINVAL);
REQUIRE(sock.last_error() == errc::invalid_argument);
#else
REQUIRE(sock.last_error() == errc::address_family_not_supported);
#endif

24
tests/unit/test_inet6_address.cpp
View File

@@ -126,11 +126,13 @@ TEST_CASE("IPv6 resolve address", "[address]") {
}
// According to RFC6761, "invalid." domain should not resolve
SECTION("resolve failure", "[address]") {
auto res = inet6_address::resolve_name("invalid");
REQUIRE(!res);
REQUIRE(res.is_error());
}
#if !defined(_WIN32)
SECTION("resolve failure", "[address]") {
auto res = inet6_address::resolve_name("invalid");
REQUIRE(!res);
REQUIRE(res.is_error());
}
#endif
}
TEST_CASE("IPv6 create address", "[address]") {
@@ -167,9 +169,11 @@ TEST_CASE("IPv6 create address", "[address]") {
}
// According to RFC6761, "invalid." domain should not resolve
SECTION("create failure", "[address]") {
auto res = inet6_address::create("invalid", PORT);
REQUIRE(!res);
REQUIRE(res.is_error());
}
#if !defined(_WIN32)
SECTION("create failure", "[address]") {
auto res = inet6_address::create("invalid", PORT);
REQUIRE(!res);
REQUIRE(res.is_error());
}
#endif
}

25
tests/unit/test_inet_address.cpp
View File

@@ -164,11 +164,14 @@ TEST_CASE("IPv4 resolve address", "[address]") {
}
// According to RFC6761, "invalid." domain should not resolve
SECTION("resolve failure", "[address]") {
auto res = inet_address::resolve_name("invalid");
REQUIRE(!res);
REQUIRE(res.is_error());
}
#if !defined(_WIN32)
SECTION("resolve failure", "[address]") {
auto res = inet_address::resolve_name("invalid");
REQUIRE(!res);
REQUIRE(res.is_error());
}
#endif
}
TEST_CASE("IPv4 create address", "[address]") {
@@ -194,9 +197,11 @@ TEST_CASE("IPv4 create address", "[address]") {
}
// According to RFC6761, "invalid." domain should not resolve
SECTION("create failure", "[address]") {
auto res = inet_address::create("invalid", PORT);
REQUIRE(!res);
REQUIRE(res.is_error());
}
#if !defined(_WIN32)
SECTION("create failure", "[address]") {
auto res = inet_address::create("invalid", PORT);
REQUIRE(!res);
REQUIRE(res.is_error());
}
#endif
}