From 10aaee129068a3f8187ad922964ab9780053a43b Mon Sep 17 00:00:00 2001 From: Chris Thrasher Date: Mon, 2 Sep 2024 12:08:55 -0600 Subject: [PATCH] Add tests for `sfSocketStatus` --- CMakeLists.txt | 20 ++++++++++++++++++++ include/CSFML/Network/SocketStatus.h | 1 - src/CSFML/CMakeLists.txt | 20 -------------------- test/CMakeLists.txt | 3 ++- test/Network/SocketStatus.test.cpp | 14 ++++++++++++++ 5 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 test/Network/SocketStatus.test.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index a00a37f..91b76d6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,6 +60,26 @@ if(SFML_OS_WINDOWS) endif() endif() +# find SFML libraries (C++) +if(CSFML_LINK_SFML_STATICALLY) + set(SFML_STATIC_LIBRARIES TRUE) + add_definitions(-DSFML_STATIC) +endif() +set(SFML_MODULES "System") +if(CSFML_BUILD_AUDIO) + list(PREPEND SFML_MODULES "Audio") +endif() +if(CSFML_BUILD_GRAPHICS) + list(PREPEND SFML_MODULES "Graphics") +endif() +if(CSFML_BUILD_WINDOW) + list(PREPEND SFML_MODULES "Window") +endif() +if(CSFML_BUILD_NETWORK) + list(PREPEND SFML_MODULES "Network") +endif() +find_package(SFML 3.0.0 COMPONENTS ${SFML_MODULES} REQUIRED) + # add the subdirectories add_subdirectory(src/CSFML) if(CSFML_BUILD_DOC) diff --git a/include/CSFML/Network/SocketStatus.h b/include/CSFML/Network/SocketStatus.h index 56648d6..2120ae8 100644 --- a/include/CSFML/Network/SocketStatus.h +++ b/include/CSFML/Network/SocketStatus.h @@ -35,5 +35,4 @@ typedef enum sfSocketPartial, ///< The socket sent a part of the data sfSocketDisconnected, ///< The TCP socket has been disconnected sfSocketError ///< An unexpected error happened - } sfSocketStatus; diff --git a/src/CSFML/CMakeLists.txt b/src/CSFML/CMakeLists.txt index 4d479a7..0331b45 100644 --- a/src/CSFML/CMakeLists.txt +++ b/src/CSFML/CMakeLists.txt @@ -16,26 +16,6 @@ if(SFML_COMPILER_MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif() -# find SFML libraries (C++) -if(CSFML_LINK_SFML_STATICALLY) - set(SFML_STATIC_LIBRARIES TRUE) - add_definitions(-DSFML_STATIC) -endif() -set(SFML_MODULES "System") -if(CSFML_BUILD_AUDIO) - list(PREPEND SFML_MODULES "Audio") -endif() -if(CSFML_BUILD_GRAPHICS) - list(PREPEND SFML_MODULES "Graphics") -endif() -if(CSFML_BUILD_WINDOW) - list(PREPEND SFML_MODULES "Window") -endif() -if(CSFML_BUILD_NETWORK) - list(PREPEND SFML_MODULES "Network") -endif() -find_package(SFML 3.0.0 COMPONENTS ${SFML_MODULES} REQUIRED) - # add the modules subdirectories add_subdirectory(System) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 83bcd48..f5da507 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -41,8 +41,9 @@ catch_discover_tests(test-csfml-window) add_executable(test-csfml-network Network/IpAddress.test.cpp + Network/SocketStatus.test.cpp ) -target_link_libraries(test-csfml-network PRIVATE csfml-network Catch2::Catch2WithMain) +target_link_libraries(test-csfml-network PRIVATE csfml-network Catch2::Catch2WithMain SFML::Network) set_target_warnings(test-csfml-network) catch_discover_tests(test-csfml-network) diff --git a/test/Network/SocketStatus.test.cpp b/test/Network/SocketStatus.test.cpp new file mode 100644 index 0000000..5d7c753 --- /dev/null +++ b/test/Network/SocketStatus.test.cpp @@ -0,0 +1,14 @@ +#include + +#include + +#include + +TEST_CASE("[Network] sfSocketStatus") +{ + STATIC_CHECK(sfSocketDone == static_cast(sf::Socket::Status::Done)); + STATIC_CHECK(sfSocketNotReady == static_cast(sf::Socket::Status::NotReady)); + STATIC_CHECK(sfSocketPartial == static_cast(sf::Socket::Status::Partial)); + STATIC_CHECK(sfSocketDisconnected == static_cast(sf::Socket::Status::Disconnected)); + STATIC_CHECK(sfSocketError == static_cast(sf::Socket::Status::Error)); +}