diff --git a/TODO b/TODO index e743e180a..6749ab3a0 100644 --- a/TODO +++ b/TODO @@ -24,9 +24,6 @@ Next: * review multi component views to reduce instantiations once empty types are gone... * move signals down to the storage class? -* WIP: - - update tests for fast/std paths - * WIP: - introduce the component iterators for non-contiguous collections of entities (multi component views, observers, user defined collections) - deprecate snapshot, loader, ... diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 026763ed0..8e8d234ac 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -115,8 +115,6 @@ if(BUILD_LIB) SETUP_LIB_TEST(meta) SETUP_LIB_TEST(registry) - SETUP_LIB_TEST(meta_std ENTT_STANDARD_CPP) - SETUP_PLUGIN_TEST(dispatcher_plugin) SETUP_PLUGIN_TEST(emitter_plugin) SETUP_PLUGIN_TEST(meta_plugin) diff --git a/test/lib/meta_std/lib.cpp b/test/lib/meta_std/lib.cpp deleted file mode 100644 index c550d967b..000000000 --- a/test/lib/meta_std/lib.cpp +++ /dev/null @@ -1,34 +0,0 @@ -#include -#include -#include -#include -#include "types.h" - -position create_position(int x, int y) { - return position{x, y}; -} - -ENTT_API void set_up(entt::meta_ctx ctx) { - entt::meta_ctx::bind(ctx); - - entt::meta() - .alias("position"_hs) - .ctor<&create_position>() - .data<&position::x>("x"_hs) - .data<&position::y>("y"_hs); - - entt::meta() - .alias("velocity"_hs) - .ctor<>() - .data<&velocity::dx>("dx"_hs) - .data<&velocity::dy>("dy"_hs); -} - -ENTT_API void tear_down() { - entt::meta().reset(); - entt::meta().reset(); -} - -ENTT_API entt::meta_any wrap_int(int value) { - return value; -} diff --git a/test/lib/meta_std/main.cpp b/test/lib/meta_std/main.cpp deleted file mode 100644 index 2b7fb3a00..000000000 --- a/test/lib/meta_std/main.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include -#include -#include -#include -#include "types.h" - -ENTT_API void set_up(entt::meta_ctx); -ENTT_API void tear_down(); -ENTT_API entt::meta_any wrap_int(int); - -TEST(Lib, Meta) { - ASSERT_FALSE(entt::resolve("position"_hs)); - - set_up(entt::meta_ctx{}); - entt::meta().conv(); - - ASSERT_TRUE(entt::resolve("position"_hs)); - ASSERT_TRUE(entt::resolve("velocity"_hs)); - - auto pos = entt::resolve("position"_hs).construct(42., 3.); - auto vel = entt::resolve("velocity"_hs).ctor().invoke(); - - ASSERT_TRUE(pos && vel); - - ASSERT_EQ(pos.type().data("x"_hs).type(), entt::resolve()); - ASSERT_TRUE(pos.type().data("y"_hs).get(*pos).try_cast()); - ASSERT_EQ(pos.type().data("x"_hs).get(*pos).cast(), 42); - ASSERT_EQ(pos.type().data("y"_hs).get(*pos).cast(), 3); - - ASSERT_EQ(vel.type().data("dx"_hs).type(), entt::resolve()); - ASSERT_TRUE(vel.type().data("dy"_hs).get(*vel).convert()); - ASSERT_EQ(vel.type().data("dx"_hs).get(*vel).cast(), 0.); - ASSERT_EQ(vel.type().data("dy"_hs).get(*vel).cast(), 0.); - - ASSERT_EQ(wrap_int(42).type(), entt::resolve()); - ASSERT_EQ(wrap_int(42).cast(), 42); - - tear_down(); - - ASSERT_FALSE(entt::resolve("position"_hs)); - ASSERT_FALSE(entt::resolve("velocity"_hs)); -} diff --git a/test/lib/meta_std/types.h b/test/lib/meta_std/types.h deleted file mode 100644 index 77086199a..000000000 --- a/test/lib/meta_std/types.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef ENTT_LIB_META_STD_TYPES_H -#define ENTT_LIB_META_STD_TYPES_H - -struct position { - int x; - int y; -}; - -struct velocity { - double dx; - double dy; -}; - -#endif