Skip to content

Resolve warnings in unit tests #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mingxwa merged 3 commits into from
Oct 10, 2024
Merged

Resolve warnings in unit tests #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c90614e
GCC
mingxwa Oct 9, 2024
f2e8a11
Fix GCC
mingxwa Oct 9, 2024
df3c310
Resolve warning
mingxwa Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ target_link_libraries(msft_proxy_tests PRIVATE msft_proxy)
target_link_libraries(msft_proxy_tests PRIVATE gtest_main)

if (MSVC)
target_compile_options(msft_proxy_tests PRIVATE /W4)
target_compile_options(msft_proxy_tests PRIVATE /W4 /WX)
else()
target_compile_options(msft_proxy_tests PRIVATE -Wall -Wextra -Wpedantic)
target_compile_options(msft_proxy_tests PRIVATE -Wall -Wextra -Wpedantic -Werror)
endif()

include(GoogleTest)
Expand Down
7 changes: 7 additions & 0 deletions tests/proxy_invocation_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,14 @@
#include <typeindex>
#include <typeinfo>
#include <vector>
#if defined(_MSC_VER) && !defined(__clang__)
#pragma warning(push)
#pragma warning(disable: 4702) // False alarm from MSVC: warning C4702: unreachable code
#endif // defined(_MSC_VER) && !defined(__clang__)
#include "proxy.h"
#if defined(_MSC_VER) && !defined(__clang__)
#pragma warning(pop)
#endif // defined(_MSC_VER) && !defined(__clang__)
#include "utils.h"

namespace {
Expand Down
61 changes: 41 additions & 20 deletions tests/proxy_lifetime_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,35 +805,56 @@ TEST(ProxyLifetimeTests, TestMoveAssignment_FromNull_ToNull) {
}

TEST(ProxyLifetimeTests, TestHasValue) {
int foo = 123;
pro::proxy<TestFacade> p1;
ASSERT_FALSE(p1.has_value());
p1 = &foo;
ASSERT_TRUE(p1.has_value());
ASSERT_EQ(ToString(*p1), "123");
utils::LifetimeTracker tracker;
std::vector<utils::LifetimeOperation> expected_ops;
{
pro::proxy<TestFacade> p;
ASSERT_FALSE(p.has_value());
p.emplace<utils::LifetimeTracker::Session>(&tracker);
ASSERT_TRUE(p.has_value());
ASSERT_EQ(ToString(*p), "Session 1");
expected_ops.emplace_back(1, utils::LifetimeOperationType::kValueConstruction);
ASSERT_TRUE(tracker.GetOperations() == expected_ops);
}
expected_ops.emplace_back(1, utils::LifetimeOperationType::kDestruction);
ASSERT_TRUE(tracker.GetOperations() == expected_ops);
}

TEST(ProxyLifetimeTests, TestOperatorBool) {
// Implicit conversion to bool shall be prohibited.
static_assert(!std::is_nothrow_convertible_v<pro::proxy<TestFacade>, bool>);

int foo = 123;
pro::proxy<TestFacade> p1;
ASSERT_FALSE(static_cast<bool>(p1));
p1 = &foo;
ASSERT_TRUE(static_cast<bool>(p1));
ASSERT_EQ(ToString(*p1), "123");
utils::LifetimeTracker tracker;
std::vector<utils::LifetimeOperation> expected_ops;
{
pro::proxy<TestFacade> p;
ASSERT_FALSE(static_cast<bool>(p));
p.emplace<utils::LifetimeTracker::Session>(&tracker);
ASSERT_TRUE(static_cast<bool>(p));
ASSERT_EQ(ToString(*p), "Session 1");
expected_ops.emplace_back(1, utils::LifetimeOperationType::kValueConstruction);
ASSERT_TRUE(tracker.GetOperations() == expected_ops);
}
expected_ops.emplace_back(1, utils::LifetimeOperationType::kDestruction);
ASSERT_TRUE(tracker.GetOperations() == expected_ops);
}

TEST(ProxyLifetimeTests, TestEqualsToNullptr) {
int foo = 123;
pro::proxy<TestFacade> p1;
ASSERT_TRUE(p1 == nullptr);
ASSERT_TRUE(nullptr == p1);
p1 = &foo;
ASSERT_TRUE(p1 != nullptr);
ASSERT_TRUE(nullptr != p1);
ASSERT_EQ(ToString(*p1), "123");
utils::LifetimeTracker tracker;
std::vector<utils::LifetimeOperation> expected_ops;
{
pro::proxy<TestFacade> p;
ASSERT_TRUE(p == nullptr);
ASSERT_TRUE(nullptr == p);
p.emplace<utils::LifetimeTracker::Session>(&tracker);
ASSERT_TRUE(p != nullptr);
ASSERT_TRUE(nullptr != p);
ASSERT_EQ(ToString(*p), "Session 1");
expected_ops.emplace_back(1, utils::LifetimeOperationType::kValueConstruction);
ASSERT_TRUE(tracker.GetOperations() == expected_ops);
}
expected_ops.emplace_back(1, utils::LifetimeOperationType::kDestruction);
ASSERT_TRUE(tracker.GetOperations() == expected_ops);
}

TEST(ProxyLifetimeTests, TestReset_FromValue) {
Expand Down