...

3 files changed, 16 insertions, 14 deletions

diff --git a/test/common/platform/win/StreamConvertTest.cpp b/test/common/platform/win/StreamConvertTest.cpp
index 4840a82e..f49d18dc 100644
--- a/test/common/platform/win/StreamConvertTest.cpp
+++ b/test/common/platform/win/StreamConvertTest.cpp
@@ -3,12 +3,12 @@
 #include "cru/common/platform/win/StreamConvert.h"
 #include "cru/common/platform/win/Win32FileStream.h"
 
-#include <gtest/gtest.h>
+#include <catch2/catch_test_macros.hpp>
 
 #include <cstdio>
 #include <filesystem>
 
-TEST(StreamConvert, FileStreamWork) {
+TEST_CASE("StreamConvert FileStreamWork", "[stream]") {
   using namespace cru;
   using namespace cru::io;
   using namespace cru::platform::win;
@@ -31,7 +31,7 @@ TEST(StreamConvert, FileStreamWork) {
   ThrowIfFailed(com_stream->Seek(position, SEEK_SET, nullptr));
   auto buffer = std::make_unique<char[]>(3);
   ThrowIfFailed(com_stream->Read(buffer.get(), 3, nullptr));
-  ASSERT_EQ(std::string_view(buffer.get(), 3), "abc");
+  REQUIRE(std::string_view(buffer.get(), 3) == "abc");
   com_stream->Release();
   file2.Close();
 
diff --git a/test/common/platform/win/Win32FileStreamTest.cpp b/test/common/platform/win/Win32FileStreamTest.cpp
index e8b28cd6..d5de451b 100644
--- a/test/common/platform/win/Win32FileStreamTest.cpp
+++ b/test/common/platform/win/Win32FileStreamTest.cpp
@@ -1,12 +1,12 @@
 #include "cru/common/io/OpenFileFlag.h"
 #include "cru/common/platform/win/Win32FileStream.h"
 
-#include <gtest/gtest.h>
+#include <catch2/catch_test_macros.hpp>
 
 #include <cstdio>
 #include <filesystem>
 
-TEST(Win32FileStream, Work) {
+TEST_CASE("Win32FileStream Work", "[stream]") {
   using namespace cru;
   using namespace cru::io;
   using namespace cru::platform::win;
@@ -20,17 +20,17 @@ TEST(Win32FileStream, Work) {
 
   Win32FileStream file(path, OpenFileFlags::Write | OpenFileFlags::Create);
   auto write_count = file.Write("abc", 3);
-  ASSERT_EQ(write_count, 3);
+  REQUIRE(write_count == 3);
   file.Close();
 
-  ASSERT_EQ(std::filesystem::file_size(path.ToUtf8()), 3);
+  REQUIRE(std::filesystem::file_size(path.ToUtf8()) == 3);
 
   Win32FileStream file2(path, OpenFileFlags::Read);
   auto buffer = std::make_unique<std::byte[]>(3);
   auto read_count = file2.Read(buffer.get(), 3);
-  ASSERT_EQ(read_count, 3);
-  ASSERT_EQ(std::string_view(reinterpret_cast<const char*>(buffer.get()), 3),
-            "abc");
+  REQUIRE(read_count == 3);
+  REQUIRE(std::string_view(reinterpret_cast<const char*>(buffer.get()), 3) ==
+          "abc");
   file2.Close();
 
   std::filesystem::remove(temp_file_path);
diff --git a/test/win/graphics/direct/ConvertTest.cpp b/test/win/graphics/direct/ConvertTest.cpp
index a0744e8b..998c93db 100644
--- a/test/win/graphics/direct/ConvertTest.cpp
+++ b/test/win/graphics/direct/ConvertTest.cpp
@@ -2,7 +2,9 @@
 #include "cru/win/graphics/direct/ConvertUtil.h"
 
 #include <catch2/catch_test_macros.hpp>
+#include "catch2/catch_approx.hpp"
 
+using Catch::Approx;
 using cru::platform::Matrix;
 using cru::platform::graphics::win::direct::Convert;
 
@@ -13,8 +15,8 @@ TEST_CASE("MatrixConvert Rotation", "[matrix]") {
 
   auto p = m.TransformPoint({1, 1});
 
-  REQUIRE(p.x == -1);
-  REQUIRE(p.y == 1);
+  REQUIRE(p.x == Approx(-1));
+  REQUIRE(p.y == Approx(1));
 }
 
 TEST_CASE("MatrixConvert RotationAndTranslation", "[matrix]") {
@@ -24,6 +26,6 @@ TEST_CASE("MatrixConvert RotationAndTranslation", "[matrix]") {
 
   auto p = m.TransformPoint({1, 1});
 
-  REQUIRE(p.x == 0);
-  REQUIRE(p.y == 2);
+  REQUIRE(p.x == Approx(0));
+  REQUIRE(p.y == Approx(2));
 }