From 3f5293432b6dc6a99f26aca2eba3876d2660665c Mon Sep 17 00:00:00 2001 From: Vaxry Date: Wed, 25 Sep 2024 22:44:05 +0100 Subject: [PATCH] tests: enhance memory + format --- tests/math.cpp | 2 +- tests/memory.cpp | 18 +++++++++++++++--- tests/shared.hpp | 2 +- tests/signal.cpp | 8 +++----- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/tests/math.cpp b/tests/math.cpp index 6c80151..a7b8090 100644 --- a/tests/math.cpp +++ b/tests/math.cpp @@ -88,7 +88,7 @@ int main(int argc, char** argv, char** envp) { // Test matrices { - Mat3x3 jeremy = Mat3x3::outputProjection({1920, 1080}, HYPRUTILS_TRANSFORM_FLIPPED_90); + Mat3x3 jeremy = Mat3x3::outputProjection({1920, 1080}, HYPRUTILS_TRANSFORM_FLIPPED_90); Mat3x3 matrixBox = jeremy.projectBox(CBox{10, 10, 200, 200}, HYPRUTILS_TRANSFORM_NORMAL).translate({100, 100}).scale({1.25F, 1.5F}).transpose(); Mat3x3 expected = std::array{0, 0.46296296, 0, 0.3125, 0, 0, 19.84375, 36.055557, 1}; diff --git a/tests/memory.cpp b/tests/memory.cpp index 805ef42..e0ac822 100644 --- a/tests/memory.cpp +++ b/tests/memory.cpp @@ -1,5 +1,6 @@ #include #include "shared.hpp" +#include using namespace Hyprutils::Memory; @@ -7,9 +8,10 @@ using namespace Hyprutils::Memory; #define WP CWeakPointer int main(int argc, char** argv, char** envp) { - SP intPtr = makeShared(10); + SP intPtr = makeShared(10); + SP intPtr2 = makeShared(1337); - int ret = 0; + int ret = 0; EXPECT(*intPtr, 10); EXPECT(intPtr.strongRef(), 1); @@ -21,7 +23,17 @@ int main(int argc, char** argv, char** envp) { EXPECT(*weak.get(), 10); EXPECT(weak.expired(), false); - intPtr = {}; + std::vector> sps; + sps.push_back(intPtr); + sps.emplace_back(intPtr); + sps.push_back(intPtr2); + sps.emplace_back(intPtr2); + std::erase_if(sps, [intPtr](const auto& e) { return e == intPtr; }); + + intPtr.reset(); + + EXPECT(weak.impl_->ref(), 0); + EXPECT(intPtr2.strongRef(), 3); EXPECT(weak.expired(), true); diff --git a/tests/shared.hpp b/tests/shared.hpp index 131764c..33109f8 100644 --- a/tests/shared.hpp +++ b/tests/shared.hpp @@ -13,7 +13,7 @@ namespace Colors { #define EXPECT(expr, val) \ if (const auto RESULT = expr; RESULT != (val)) { \ - std::cout << Colors::RED << "Failed: " << Colors::RESET << #expr << ", expected " << val << " but got " << RESULT << "\n"; \ + std::cout << Colors::RED << "Failed: " << Colors::RESET << #expr << ", expected " << val << " but got " << RESULT << "\n"; \ ret = 1; \ } else { \ std::cout << Colors::GREEN << "Passed " << Colors::RESET << #expr << ". Got " << val << "\n"; \ diff --git a/tests/signal.cpp b/tests/signal.cpp index e76e427..5084b78 100644 --- a/tests/signal.cpp +++ b/tests/signal.cpp @@ -6,13 +6,11 @@ using namespace Hyprutils::Signal; using namespace Hyprutils::Memory; int main(int argc, char** argv, char** envp) { - int ret = 0; + int ret = 0; CSignal signal; - int data = 0; - auto listener = signal.registerListener([&] (std::any d) { - data = 1; - }); + int data = 0; + auto listener = signal.registerListener([&](std::any d) { data = 1; }); signal.emit();