From 3c9045a3a80a7b59c05fabec068eecc620a607cb Mon Sep 17 00:00:00 2001
From: Michele Caini <michele.caini@gmail.com>
Date: Thu, 6 Oct 2022 15:40:21 +0200
Subject: [PATCH] test: avoid using the trampoline resolve function

---
 test/entt/meta/meta_base.cpp | 3 ++-
 test/entt/meta/meta_conv.cpp | 3 ++-
 test/entt/meta/meta_ctor.cpp | 3 ++-
 test/entt/meta/meta_data.cpp | 3 ++-
 test/entt/meta/meta_dtor.cpp | 3 ++-
 test/entt/meta/meta_prop.cpp | 3 ++-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/test/entt/meta/meta_base.cpp b/test/entt/meta/meta_base.cpp
index 19e46b8ec..eaf3c1cbe 100644
--- a/test/entt/meta/meta_base.cpp
+++ b/test/entt/meta/meta_base.cpp
@@ -1,6 +1,7 @@
 #include <utility>
 #include <gtest/gtest.h>
 #include <entt/core/hashed_string.hpp>
+#include <entt/locator/locator.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/node.hpp>
@@ -181,7 +182,7 @@ TEST_F(MetaBase, TransferWithMutatingThis) {
 TEST_F(MetaBase, ReRegistration) {
     SetUp();
 
-    auto &&node = entt::internal::resolve_TODO<derived_t>();
+    auto &&node = entt::internal::resolve<derived_t>(entt::internal::meta_context::from(entt::locator<entt::meta_ctx>::value_or()));
 
     ASSERT_TRUE(node.details);
     ASSERT_FALSE(node.details->base.empty());
diff --git a/test/entt/meta/meta_conv.cpp b/test/entt/meta/meta_conv.cpp
index 84486ee27..9b44c483f 100644
--- a/test/entt/meta/meta_conv.cpp
+++ b/test/entt/meta/meta_conv.cpp
@@ -1,6 +1,7 @@
 #include <utility>
 #include <gtest/gtest.h>
 #include <entt/core/hashed_string.hpp>
+#include <entt/locator/locator.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/node.hpp>
@@ -62,7 +63,7 @@ TEST_F(MetaConv, Functionalities) {
 TEST_F(MetaConv, ReRegistration) {
     SetUp();
 
-    auto &&node = entt::internal::resolve_TODO<clazz_t>();
+    auto &&node = entt::internal::resolve<clazz_t>(entt::internal::meta_context::from(entt::locator<entt::meta_ctx>::value_or()));
 
     ASSERT_TRUE(node.details);
     ASSERT_FALSE(node.details->conv.empty());
diff --git a/test/entt/meta/meta_ctor.cpp b/test/entt/meta/meta_ctor.cpp
index 988deb035..e3e358473 100644
--- a/test/entt/meta/meta_ctor.cpp
+++ b/test/entt/meta/meta_ctor.cpp
@@ -3,6 +3,7 @@
 #include <entt/core/hashed_string.hpp>
 #include <entt/core/utility.hpp>
 #include <entt/entity/registry.hpp>
+#include <entt/locator/locator.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/resolve.hpp>
@@ -205,7 +206,7 @@ TEST_F(MetaCtor, NonDefaultConstructibleType) {
 TEST_F(MetaCtor, ReRegistration) {
     SetUp();
 
-    auto &&node = entt::internal::resolve_TODO<double>();
+    auto &&node = entt::internal::resolve<double>(entt::internal::meta_context::from(entt::locator<entt::meta_ctx>::value_or()));
 
     ASSERT_TRUE(node.details);
     ASSERT_FALSE(node.details->ctor.empty());
diff --git a/test/entt/meta/meta_data.cpp b/test/entt/meta/meta_data.cpp
index a6366b713..9aa7de8c0 100644
--- a/test/entt/meta/meta_data.cpp
+++ b/test/entt/meta/meta_data.cpp
@@ -4,6 +4,7 @@
 #include <gtest/gtest.h>
 #include <entt/core/hashed_string.hpp>
 #include <entt/core/type_traits.hpp>
+#include <entt/locator/locator.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/node.hpp>
@@ -645,7 +646,7 @@ TEST_F(MetaData, ReRegistration) {
 
     SetUp();
 
-    auto &&node = entt::internal::resolve_TODO<base_t>();
+    auto &&node = entt::internal::resolve<base_t>(entt::internal::meta_context::from(entt::locator<entt::meta_ctx>::value_or()));
     auto type = entt::resolve<base_t>();
 
     ASSERT_TRUE(node.details);
diff --git a/test/entt/meta/meta_dtor.cpp b/test/entt/meta/meta_dtor.cpp
index 1f928298f..ba8b8924b 100644
--- a/test/entt/meta/meta_dtor.cpp
+++ b/test/entt/meta/meta_dtor.cpp
@@ -1,6 +1,7 @@
 #include <utility>
 #include <gtest/gtest.h>
 #include <entt/core/hashed_string.hpp>
+#include <entt/locator/locator.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/node.hpp>
@@ -101,7 +102,7 @@ TEST_F(MetaDtor, AsRefConstruction) {
 TEST_F(MetaDtor, ReRegistration) {
     SetUp();
 
-    auto &&node = entt::internal::resolve_TODO<clazz_t>();
+    auto &&node = entt::internal::resolve<clazz_t>(entt::internal::meta_context::from(entt::locator<entt::meta_ctx>::value_or()));
 
     ASSERT_NE(node.dtor.dtor, nullptr);
 
diff --git a/test/entt/meta/meta_prop.cpp b/test/entt/meta/meta_prop.cpp
index 7edb901fd..92071c5c8 100644
--- a/test/entt/meta/meta_prop.cpp
+++ b/test/entt/meta/meta_prop.cpp
@@ -3,6 +3,7 @@
 #include <utility>
 #include <gtest/gtest.h>
 #include <entt/core/hashed_string.hpp>
+#include <entt/locator/locator.hpp>
 #include <entt/meta/factory.hpp>
 #include <entt/meta/meta.hpp>
 #include <entt/meta/resolve.hpp>
@@ -86,7 +87,7 @@ TEST_F(MetaProp, ReRegistration) {
 
     SetUp();
 
-    auto &&node = entt::internal::resolve_TODO<base_1_t>();
+    auto &&node = entt::internal::resolve<base_1_t>(entt::internal::meta_context::from(entt::locator<entt::meta_ctx>::value_or()));
     auto type = entt::resolve<base_1_t>();
 
     ASSERT_TRUE(node.details);