Fix Window

Author: MorganCaron

modules/UnitTest/UnitTest.mpp

@@ -25,6 +25,7 @@ namespace CppUtils::UnitTest
 		bool detail = true;
 		bool chrono = false;
 		bool fastAbort = false;
+		std::string filter = "";
 	};
 
 	struct Test final
@@ -126,7 +127,7 @@ namespace CppUtils::UnitTest
 			using namespace std::chrono_literals;
 			auto testSuiteIsSuccess = std::unordered_map<std::string, bool>{};
 
-			const auto nbTests = std::ranges::fold_left(
+			auto nbTests = std::ranges::fold_left(
 				std::views::values(m_testSuites.nodes) | std::views::transform([](auto&& node) { return std::ranges::size(node.value); }),
 				0uz,
 				std::plus{});
@@ -160,6 +161,12 @@ namespace CppUtils::UnitTest
 				auto allTestsPassed = true;
 				for (const auto& test : tests)
 				{
+					if (not std::empty(settings.filter) and test.name.find(settings.filter) == std::string::npos)
+					{
+						--nbTests;
+						continue;
+					}
+
 					if (executeTest(test, settings))
 						++nbSuccess;
 					else

modules/Window/Window.mpp

@@ -94,7 +94,7 @@ namespace CppUtils::Window
 		std::uint32_t serial) -> void;
 
 	inline const auto surfaceListener = xdg_surface_listener{
-		.configure = &Window::xdg_surface_configure,
+		.configure = xdg_surface_configure,
 	};
 #endif
 
@@ -228,7 +228,7 @@ namespace CppUtils::Window
 			// m_imageStorage = ImageStorage{size};
 			openWindow();
 			wl_surface_commit(surface.get());
-			// wl_display_roundtrip(Wayland::globals.display.get());
+			wl_display_roundtrip(Wayland::globals.display.get());
 			// wl_display_dispatch(Wayland::globals.display.get());
 			wl_display_flush(Wayland::globals.display.get());
 		}
@@ -276,13 +276,13 @@ namespace CppUtils::Window
 		{
 			auto result = 0;
 			while ((result = wl_display_dispatch(Wayland::globals.display.get())) != -1)
-				std::cout << "Event received, result = " << result << std::endl;
-			std::cout << "Wayland dispatch exited with " << result << std::endl;
+				Logger::print<"detail">("Event received, result = {}", result);
+			Logger::print<"warning">("Wayland dispatch exited with {}", result);
 		}
 
 		inline auto update() -> void
 		{
-			std::cout << "update" << std::endl;
+			Logger::print<"detail">("update");
 			wl_surface_attach(surface.get(), m_imageStorage.buffer.get(), 0, 0);
 			wl_surface_damage(surface.get(), 0, 0, std::numeric_limits<std::int32_t>::max(), std::numeric_limits<std::int32_t>::max());
 			wl_surface_commit(surface.get());
@@ -306,13 +306,13 @@ namespace CppUtils::Window
 #endif
 	};
 
-	inline auto drawFrame(Window& window) -> void
+	export inline auto drawFrame(Window& window) -> void
 	{
-		std::cout << "drawFrame" << std::endl;
+		Logger::print<"detail">("drawFrame");
 		const auto& imageSize = window.getSize();
 		if (not window.m_imageStorage.buffer)
 		{
-			std::cout << "ImageStorage" << std::endl;
+			Logger::print<"detail">("ImageStorage");
 			window.m_imageStorage = Window::ImageStorage{imageSize};
 		}
 		auto* pixels = window.getPixels();
@@ -331,7 +331,7 @@ namespace CppUtils::Window
 		xdg_surface* xdg_surface,
 		std::uint32_t serial) -> void
 	{
-		std::cout << "Surface configure !" << std::endl;
+		Logger::print<"detail">("Surface configure !");
 		auto& window = *static_cast<Window*>(data);
 		xdg_surface_ack_configure(xdg_surface, serial);
 

tests/Window/Window.mpp

@@ -9,8 +9,7 @@ export namespace CppUtils::UnitTest::Window
 		using namespace std::literals;
 
 		suite.addTest("Opening a window", [&] {
-			auto window = CppUtils::Window::Window{"Title", {1'920, 1'080}};
-			// window.runLoop();
+			auto window = CppUtils::Window::Window{"Title", {640, 360}};
 			std::this_thread::sleep_for(5s);
 			suite.expectEqual(window.getTitle(), "Title"sv);
 		});

tests/main.cpp

@@ -2,16 +2,14 @@ import std;
 import CppUtils;
 import CppUtils.UnitTests;
 
-auto start([[maybe_unused]] std::span<const std::string_view> args) -> int
+auto start(std::span<const std::string_view> args) -> int
 {
 	try
 	{
-		/*
-		auto& settings = CppUtils::UnitTest::executeCommands(argc, argv);
-		if (settings.abort)
-			return CppUtils::exitSuccess;
-		*/
 		auto settings = CppUtils::UnitTest::TestSettings{.fastAbort = false};
+		for (auto i = 0uz; i < std::size(args); ++i)
+			if (args[i] == "--filter" and i + 1 < std::size(args))
+				settings.filter = std::string{args[++i]};
 		return CppUtils::UnitTest::executeTests(std::move(settings));
 	}
 	catch (const std::exception& exception)