diff tests/test-tileset.c @ 336:f5a5bbb77122

tests: switch to rexo
author David Demelier <markand@malikania.fr>
date Wed, 13 Oct 2021 20:56:07 +0200
parents d01e83210ca2
children 06badab52877
line wrap: on
line diff
--- a/tests/test-tileset.c	Wed Oct 13 15:58:02 2021 +0200
+++ b/tests/test-tileset.c	Wed Oct 13 20:56:07 2021 +0200
@@ -16,8 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define GREATEST_USE_ABBREVS 0
-#include <greatest.h>
+#include <rexo.h>
 
 #include <core/core.h>
 #include <core/window.h>
@@ -25,102 +24,73 @@
 #include <rpg/tileset-file.h>
 #include <rpg/tileset.h>
 
-GREATEST_TEST
-test_basics_sample(void)
+RX_TEST_CASE(test, basics_sample)
 {
 	struct tileset_file loader = {0};
 	struct tileset tileset;
 
-	GREATEST_ASSERT(tileset_file_open(&loader, &tileset, DIRECTORY "sample-tileset.tileset") == 0);
-	GREATEST_ASSERT_EQ(64U, tileset.sprite->cellw);
-	GREATEST_ASSERT_EQ(32U, tileset.sprite->cellh);
+	RX_REQUIRE(tileset_file_open(&loader, &tileset, DIRECTORY "sample-tileset.tileset") == 0);
+	RX_UINT_REQUIRE_EQUAL(tileset.sprite->cellw, 64U);
+	RX_UINT_REQUIRE_EQUAL(tileset.sprite->cellh, 32U);
 
-	GREATEST_ASSERT_EQ(4, tileset.tiledefsz);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefsz, 4U);
 
-	GREATEST_ASSERT_EQ(129, tileset.tiledefs[0].id);
-	GREATEST_ASSERT_EQ(8, tileset.tiledefs[0].x);
-	GREATEST_ASSERT_EQ(0, tileset.tiledefs[0].y);
-	GREATEST_ASSERT_EQ(56, tileset.tiledefs[0].w);
-	GREATEST_ASSERT_EQ(40, tileset.tiledefs[0].h);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[0].id, 129);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[0].x, 8);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[0].y, 0);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[0].w, 56);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[0].h, 40);
 
-	GREATEST_ASSERT_EQ(130, tileset.tiledefs[1].id);
-	GREATEST_ASSERT_EQ(0, tileset.tiledefs[1].x);
-	GREATEST_ASSERT_EQ(0, tileset.tiledefs[1].y);
-	GREATEST_ASSERT_EQ(62, tileset.tiledefs[1].w);
-	GREATEST_ASSERT_EQ(40, tileset.tiledefs[1].h);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[1].id, 130);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[1].x, 0);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[1].y, 0);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[1].w, 62);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[1].h, 40);
 
-	GREATEST_ASSERT_EQ(132, tileset.tiledefs[2].id);
-	GREATEST_ASSERT_EQ(0, tileset.tiledefs[2].x);
-	GREATEST_ASSERT_EQ(0, tileset.tiledefs[2].y);
-	GREATEST_ASSERT_EQ(64, tileset.tiledefs[2].w);
-	GREATEST_ASSERT_EQ(40, tileset.tiledefs[2].h);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[2].id, 132);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[2].x, 0);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[2].y, 0);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[2].w, 64);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[2].h, 40);
 
-	GREATEST_ASSERT_EQ(133, tileset.tiledefs[3].id);
-	GREATEST_ASSERT_EQ(0, tileset.tiledefs[3].x);
-	GREATEST_ASSERT_EQ(0, tileset.tiledefs[3].y);
-	GREATEST_ASSERT_EQ(58, tileset.tiledefs[3].w);
-	GREATEST_ASSERT_EQ(40, tileset.tiledefs[3].h);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[3].id, 133);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[3].x, 0);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[3].y, 0);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[3].w, 58);
+	RX_UINT_REQUIRE_EQUAL(tileset.tiledefs[3].h, 40);
 
 	tileset_file_finish(&loader);
-
-	GREATEST_PASS();
 }
 
-GREATEST_SUITE(suite_basics)
-{
-	GREATEST_RUN_TEST(test_basics_sample);
-}
-
-GREATEST_TEST
-test_error_tilewidth(void)
+RX_TEST_CASE(test, error_tilewidth)
 {
 	struct tileset_file loader = {0};
 	struct tileset tileset = {0};
 
-	GREATEST_ASSERT(tileset_file_open(&loader, &tileset, DIRECTORY "error-tilewidth.tileset") < 0);
-	GREATEST_PASS();
+	RX_INT_REQUIRE_EQUAL(tileset_file_open(&loader, &tileset, DIRECTORY "error-tilewidth.tileset"), -1);
 }
 
-GREATEST_TEST
-test_error_tileheight(void)
-{
-	struct tileset_file loader = {0};
-	struct tileset tileset = {0};
-
-	GREATEST_ASSERT(tileset_file_open(&loader, &tileset, DIRECTORY "error-tileheight.tileset") < 0);
-	GREATEST_PASS();
-}
-
-GREATEST_TEST
-test_error_image(void)
+RX_TEST_CASE(test, error_tileheight)
 {
 	struct tileset_file loader = {0};
 	struct tileset tileset = {0};
 
-	GREATEST_ASSERT(tileset_file_open(&loader, &tileset, DIRECTORY "error-image.tileset") < 0);
-	GREATEST_PASS();
+	RX_INT_REQUIRE_EQUAL(tileset_file_open(&loader, &tileset, DIRECTORY "error-tileheight.tileset"), -1);
 }
 
-GREATEST_SUITE(suite_errors)
+RX_TEST_CASE(test, error_image)
 {
-	GREATEST_RUN_TEST(test_error_tilewidth);
-	GREATEST_RUN_TEST(test_error_tileheight);
-	GREATEST_RUN_TEST(test_error_image);
+	struct tileset_file loader = {0};
+	struct tileset tileset = {0};
+
+	RX_INT_REQUIRE_EQUAL(tileset_file_open(&loader, &tileset, DIRECTORY "error-image.tileset"), -1);
 }
 
-GREATEST_MAIN_DEFS();
-
 int
 main(int argc, char **argv)
 {
-	GREATEST_MAIN_BEGIN();
+	if (core_init("fr.malikania", "test") < 0 && window_open("test-tileset", 100, 100) < 0)
+		return 1;
 
-	if (core_init("fr.malikania", "test") == 0 && window_open("test-tileset", 100, 100)) {
-		GREATEST_RUN_SUITE(suite_basics);
-		GREATEST_RUN_SUITE(suite_errors);
-	}
-
-	GREATEST_MAIN_END();
-
-	return 0;
+	return rx_main(0, NULL, argc, (const char **)argv) == RX_SUCCESS ? 0 : 1;
 }