Corrected some tests after the last refactor.

viferga · viferga · commit 470d7f3f25c3 · 2021-03-09T14:55:35.000+01:00
diff --git a/source/tests/file_loader_test/CMakeLists.txt b/source/tests/file_loader_test/CMakeLists.txt
@@ -87,12 +87,20 @@ target_link_libraries(${target}
 
 	${META_PROJECT_NAME}::version
 	${META_PROJECT_NAME}::preprocessor
+	${META_PROJECT_NAME}::environment
 	${META_PROJECT_NAME}::format
 	${META_PROJECT_NAME}::threading
 	${META_PROJECT_NAME}::log
+	${META_PROJECT_NAME}::memory
+	${META_PROJECT_NAME}::portability
+	${META_PROJECT_NAME}::adt
+	${META_PROJECT_NAME}::filesystem
+	${META_PROJECT_NAME}::dynlink
+	${META_PROJECT_NAME}::detour
 	${META_PROJECT_NAME}::reflect
-	${META_PROJECT_NAME}::loader
+	${META_PROJECT_NAME}::serial
 	${META_PROJECT_NAME}::configuration
+	${META_PROJECT_NAME}::loader
 )
 
 #
diff --git a/source/tests/java_loader_test/CMakeLists.txt b/source/tests/java_loader_test/CMakeLists.txt
@@ -87,12 +87,20 @@ target_link_libraries(${target}
 
 	${META_PROJECT_NAME}::version
 	${META_PROJECT_NAME}::preprocessor
+	${META_PROJECT_NAME}::environment
 	${META_PROJECT_NAME}::format
 	${META_PROJECT_NAME}::threading
 	${META_PROJECT_NAME}::log
+	${META_PROJECT_NAME}::memory
+	${META_PROJECT_NAME}::portability
+	${META_PROJECT_NAME}::adt
+	${META_PROJECT_NAME}::filesystem
+	${META_PROJECT_NAME}::dynlink
+	${META_PROJECT_NAME}::detour
 	${META_PROJECT_NAME}::reflect
-	${META_PROJECT_NAME}::loader
+	${META_PROJECT_NAME}::serial
 	${META_PROJECT_NAME}::configuration
+	${META_PROJECT_NAME}::loader
 )
 
 #
diff --git a/source/tests/loader_path_test/CMakeLists.txt b/source/tests/loader_path_test/CMakeLists.txt
@@ -82,11 +82,19 @@ target_link_libraries(${target}
 
 	${META_PROJECT_NAME}::version
 	${META_PROJECT_NAME}::preprocessor
+	${META_PROJECT_NAME}::environment
 	${META_PROJECT_NAME}::format
 	${META_PROJECT_NAME}::threading
 	${META_PROJECT_NAME}::log
+	${META_PROJECT_NAME}::memory
+	${META_PROJECT_NAME}::portability
 	${META_PROJECT_NAME}::adt
+	${META_PROJECT_NAME}::filesystem
+	${META_PROJECT_NAME}::dynlink
+	${META_PROJECT_NAME}::detour
 	${META_PROJECT_NAME}::reflect
+	${META_PROJECT_NAME}::serial
+	${META_PROJECT_NAME}::configuration
 	${META_PROJECT_NAME}::loader
 )
 
diff --git a/source/tests/node_loader_test/CMakeLists.txt b/source/tests/node_loader_test/CMakeLists.txt
@@ -87,12 +87,20 @@ target_link_libraries(${target}
 
 	${META_PROJECT_NAME}::version
 	${META_PROJECT_NAME}::preprocessor
+	${META_PROJECT_NAME}::environment
 	${META_PROJECT_NAME}::format
 	${META_PROJECT_NAME}::threading
 	${META_PROJECT_NAME}::log
+	${META_PROJECT_NAME}::memory
+	${META_PROJECT_NAME}::portability
+	${META_PROJECT_NAME}::adt
+	${META_PROJECT_NAME}::filesystem
+	${META_PROJECT_NAME}::dynlink
+	${META_PROJECT_NAME}::detour
 	${META_PROJECT_NAME}::reflect
-	${META_PROJECT_NAME}::loader
+	${META_PROJECT_NAME}::serial
 	${META_PROJECT_NAME}::configuration
+	${META_PROJECT_NAME}::loader
 )
 
 #
diff --git a/source/tests/rb_loader_parser_test/CMakeLists.txt b/source/tests/rb_loader_parser_test/CMakeLists.txt
@@ -87,14 +87,19 @@ target_link_libraries(${target}
 
 	${META_PROJECT_NAME}::version
 	${META_PROJECT_NAME}::preprocessor
+	${META_PROJECT_NAME}::environment
 	${META_PROJECT_NAME}::format
 	${META_PROJECT_NAME}::threading
 	${META_PROJECT_NAME}::log
 	${META_PROJECT_NAME}::memory
 	${META_PROJECT_NAME}::portability
 	${META_PROJECT_NAME}::adt
-	${META_PROJECT_NAME}::reflect
+	${META_PROJECT_NAME}::filesystem
 	${META_PROJECT_NAME}::dynlink
+	${META_PROJECT_NAME}::detour
+	${META_PROJECT_NAME}::reflect
+	${META_PROJECT_NAME}::serial
+	${META_PROJECT_NAME}::configuration
 	${META_PROJECT_NAME}::loader
 	${META_PROJECT_NAME}::rb_loader
 )
diff --git a/source/tests/rb_loader_test/CMakeLists.txt b/source/tests/rb_loader_test/CMakeLists.txt
@@ -85,14 +85,7 @@ target_link_libraries(${target}
 
 	GTest
 
-	${META_PROJECT_NAME}::version
-	${META_PROJECT_NAME}::preprocessor
-	${META_PROJECT_NAME}::format
-	${META_PROJECT_NAME}::threading
-	${META_PROJECT_NAME}::log
-	${META_PROJECT_NAME}::reflect
-	${META_PROJECT_NAME}::loader
-	${META_PROJECT_NAME}::configuration
+	${META_PROJECT_NAME}::metacall
 )
 
 #
diff --git a/source/tests/rb_loader_test/source/rb_loader_test.cpp b/source/tests/rb_loader_test/source/rb_loader_test.cpp
@@ -20,9 +20,7 @@
 
 #include <gtest/gtest.h>
 
-#include <loader/loader.h>
-
-#include <log/log.h>
+#include <metacall/metacall.h>
 
 class rb_loader_test : public testing::Test
 {
@@ -31,18 +29,10 @@ class rb_loader_test : public testing::Test
 
 TEST_F(rb_loader_test, DefaultConstructor)
 {
-	const loader_naming_path names[] =
+	const char * names[] =
 	{
 		"hello.rb"
 	};
 
-	EXPECT_EQ((int) 0, (int) log_configure("metacall",
-		log_policy_format_text(),
-		log_policy_schedule_sync(),
-		log_policy_storage_sequential(),
-		log_policy_stream_stdio(stdout)));
-
-	EXPECT_EQ((int) 0, (int) loader_load_from_file("rb", names, sizeof(names) / sizeof(names[0]), NULL));
-
-	EXPECT_EQ((int) 0, (int) loader_unload());
+	EXPECT_EQ((int) 0, (int) metacall_load_from_file("rb", names, sizeof(names) / sizeof(names[0]), NULL));
 }

Original file line number	Diff line number	Diff line change
`@@ -85,14 +85,7 @@ target_link_libraries(${target}`
`85`	`85`
`86`	`86`	`GTest`
`87`	`87`
`88`		`- ${META_PROJECT_NAME}::version`
`89`		`- ${META_PROJECT_NAME}::preprocessor`
`90`		`- ${META_PROJECT_NAME}::format`
`91`		`- ${META_PROJECT_NAME}::threading`
`92`		`- ${META_PROJECT_NAME}::log`
`93`		`- ${META_PROJECT_NAME}::reflect`
`94`		`- ${META_PROJECT_NAME}::loader`
`95`		`- ${META_PROJECT_NAME}::configuration`
	`88`	`+ ${META_PROJECT_NAME}::metacall`
`96`	`89`	`)`
`97`	`90`
`98`	`91`	`#`