From 0ae078c9adae81d2566b86ac645390f75ce4335a Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Mon, 23 Dec 2024 12:14:46 +0100
Subject: WIP

---
 test/deps_test.cc | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'test/deps_test.cc')

diff --git a/test/deps_test.cc b/test/deps_test.cc
index 762b0e5..fdaa691 100644
--- a/test/deps_test.cc
+++ b/test/deps_test.cc
@@ -42,43 +42,43 @@ public:
 
 		{
 			auto res = readDeps(trivial.string(), ctor::toolchain::gcc);
-			uASSERT_EQUAL(1u, res.size());
-			uASSERT_EQUAL("x.cc"s, res[0]);
+			assert_equal(1u, res.size(), __FILE__, __LINE__);
+			assert_equal("x.cc"s, res[0], __FILE__, __LINE__);
 		}
 
 		{
 			auto res = readDeps(no_newline.string(), ctor::toolchain::gcc);
-			uASSERT_EQUAL(1u, res.size());
-			uASSERT_EQUAL("x.cc"s, res[0]);
+			assert_equal(1u, res.size(), __FILE__, __LINE__);
+			assert_equal("x.cc"s, res[0], __FILE__, __LINE__);
 		}
 
 		{
 			auto res = readDeps(no_deps.string(), ctor::toolchain::gcc);
-			uASSERT_EQUAL(0u, res.size());
+			assert_equal(0u, res.size(), __FILE__, __LINE__);
 		}
 
 		{
 			auto res = readDeps(spaces.string(), ctor::toolchain::gcc);
-			uASSERT_EQUAL(2u, res.size());
-			uASSERT_EQUAL("x y.cc"s, res[0]);
-			uASSERT_EQUAL("x y.h"s, res[1]);
+			assert_equal(2u, res.size(), __FILE__, __LINE__);
+			assert_equal("x y.cc"s, res[0], __FILE__, __LINE__);
+			assert_equal("x y.h"s, res[1], __FILE__, __LINE__);
 		}
 
 		{
 			auto res = readDeps(multiline.string(), ctor::toolchain::gcc);
-			uASSERT_EQUAL(12u, res.size());
-			uASSERT_EQUAL("src/configure.cc"s, res[0]);
-			uASSERT_EQUAL("src/configure.h"s, res[1]);
-			uASSERT_EQUAL("src/getoptpp/getoptpp.hpp"s, res[2]);
-			uASSERT_EQUAL("src/execute.h"s, res[3]);
-			uASSERT_EQUAL("src/ctor.h"s, res[4]);
-			uASSERT_EQUAL("src/tasks.h"s, res[5]);
-			uASSERT_EQUAL("src/task.h"s, res[6]);
-			uASSERT_EQUAL("src/rebuild.h"s, res[7]);
-			uASSERT_EQUAL("src/externals.h"s, res[8]);
-			uASSERT_EQUAL("src/externals_manual.h"s, res[9]);
-			uASSERT_EQUAL("src/tools.h"s, res[10]);
-			uASSERT_EQUAL("src/util.h"s, res[11]);
+			assert_equal(12u, res.size(), __FILE__, __LINE__);
+			assert_equal("src/configure.cc"s, res[0], __FILE__, __LINE__);
+			assert_equal("src/configure.h"s, res[1], __FILE__, __LINE__);
+			assert_equal("src/getoptpp/getoptpp.hpp"s, res[2], __FILE__, __LINE__);
+			assert_equal("src/execute.h"s, res[3], __FILE__, __LINE__);
+			assert_equal("src/ctor.h"s, res[4], __FILE__, __LINE__);
+			assert_equal("src/tasks.h"s, res[5], __FILE__, __LINE__);
+			assert_equal("src/task.h"s, res[6], __FILE__, __LINE__);
+			assert_equal("src/rebuild.h"s, res[7], __FILE__, __LINE__);
+			assert_equal("src/externals.h"s, res[8], __FILE__, __LINE__);
+			assert_equal("src/externals_manual.h"s, res[9], __FILE__, __LINE__);
+			assert_equal("src/tools.h"s, res[10], __FILE__, __LINE__);
+			assert_equal("src/util.h"s, res[11], __FILE__, __LINE__);
 		}
 
 		{
-- 
cgit v1.2.3