diff --git a/test/entt/meta/meta_any.cpp b/test/entt/meta/meta_any.cpp index 83a79d3e4..795553baa 100644 --- a/test/entt/meta/meta_any.cpp +++ b/test/entt/meta/meta_any.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -60,10 +61,10 @@ struct fat_t: empty_t { fat_t &operator=(const fat_t &) = default; bool operator==(const fat_t &other) const { - return std::equal(std::begin(value), std::end(value), std::begin(other.value), std::end(other.value)); + return (value == other.value); } - double value[4]; // NOLINT + std::array value{}; }; enum class enum_class : unsigned short int { diff --git a/test/entt/meta/meta_data.cpp b/test/entt/meta/meta_data.cpp index f51be9f99..fa7e25188 100644 --- a/test/entt/meta/meta_data.cpp +++ b/test/entt/meta/meta_data.cpp @@ -82,8 +82,8 @@ struct multi_setter_t { }; struct array_t { - inline static int global[3]; // NOLINT - int local[5]; // NOLINT + inline static int global[2]; // NOLINT + int local[4]; // NOLINT }; enum class property_t : entt::id_type { @@ -526,8 +526,10 @@ TEST_F(MetaData, ArrayStatic) { ASSERT_TRUE(data); ASSERT_EQ(data.arity(), 1u); - ASSERT_EQ(data.type(), entt::resolve()); // NOLINT - ASSERT_EQ(data.arg(0u), entt::resolve()); // NOLINT + // NOLINTBEGIN(*-avoid-c-arrays) + ASSERT_EQ(data.type(), entt::resolve()); + ASSERT_EQ(data.arg(0u), entt::resolve()); + // NOLINTEND(*-avoid-c-arrays) ASSERT_FALSE(data.is_const()); ASSERT_TRUE(data.is_static()); ASSERT_TRUE(data.type().is_array()); @@ -542,8 +544,10 @@ TEST_F(MetaData, Array) { ASSERT_TRUE(data); ASSERT_EQ(data.arity(), 1u); - ASSERT_EQ(data.type(), entt::resolve()); // NOLINT - ASSERT_EQ(data.arg(0u), entt::resolve()); // NOLINT + // NOLINTBEGIN(*-avoid-c-arrays) + ASSERT_EQ(data.type(), entt::resolve()); + ASSERT_EQ(data.arg(0u), entt::resolve()); + // NOLINTEND(*-avoid-c-arrays) ASSERT_FALSE(data.is_const()); ASSERT_FALSE(data.is_static()); ASSERT_TRUE(data.type().is_array()); diff --git a/test/entt/meta/meta_pointer.cpp b/test/entt/meta/meta_pointer.cpp index 000069fc4..1bc0b4654 100644 --- a/test/entt/meta/meta_pointer.cpp +++ b/test/entt/meta/meta_pointer.cpp @@ -428,11 +428,15 @@ TEST(MetaPointerLike, DereferenceProxyPointer) { } TEST(MetaPointerLike, DereferenceArray) { - const entt::meta_any array{std::in_place_type}; // NOLINT - const entt::meta_any array_of_array{std::in_place_type}; // NOLINT + // NOLINTBEGIN(*-avoid-c-arrays) + const entt::meta_any array{std::in_place_type}; + const entt::meta_any array_of_array{std::in_place_type}; + // NOLINTEND(*-avoid-c-arrays) - ASSERT_EQ(array.type(), entt::resolve()); // NOLINT - ASSERT_EQ(array_of_array.type(), entt::resolve()); // NOLINT + // NOLINTBEGIN(*-avoid-c-arrays) + ASSERT_EQ(array.type(), entt::resolve()); + ASSERT_EQ(array_of_array.type(), entt::resolve()); + // NOLINTEND(*-avoid-c-arrays) ASSERT_FALSE(*array); ASSERT_FALSE(*array_of_array); diff --git a/test/entt/meta/meta_utility.cpp b/test/entt/meta/meta_utility.cpp index 034679277..914359cd8 100644 --- a/test/entt/meta/meta_utility.cpp +++ b/test/entt/meta/meta_utility.cpp @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -188,15 +189,15 @@ TEST_F(MetaUtility, MetaGetter) { } TEST_F(MetaUtility, MetaInvokeWithCandidate) { - entt::meta_any args[2u]{clazz{}, 42}; // NOLINT + std::array args{entt::meta_any{clazz{}}, entt::meta_any{4}}; args[0u].cast().value = 3; - ASSERT_FALSE((entt::meta_invoke({}, &clazz::setter, nullptr))); + ASSERT_FALSE((entt::meta_invoke({}, &clazz::setter, std::next(args.data())))); ASSERT_FALSE((entt::meta_invoke({}, &clazz::getter, nullptr))); - ASSERT_TRUE((entt::meta_invoke(args[0u], &clazz::setter, args + 1u))); // NOLINT - ASSERT_FALSE((entt::meta_invoke(args[0u], &clazz::setter, args))); // NOLINT - ASSERT_EQ((entt::meta_invoke(args[0u], &clazz::getter, nullptr)).cast(), 42); + ASSERT_TRUE((entt::meta_invoke(args[0u], &clazz::setter, std::next(args.data())))); + ASSERT_FALSE((entt::meta_invoke(args[0u], &clazz::setter, args.data()))); + ASSERT_EQ((entt::meta_invoke(args[0u], &clazz::getter, nullptr)).cast(), 4); ASSERT_FALSE((entt::meta_invoke(args[1u], &clazz::getter, nullptr))); ASSERT_EQ((entt::meta_invoke({}, &clazz::get_value, nullptr)).cast(), 3); @@ -206,20 +207,20 @@ TEST_F(MetaUtility, MetaInvokeWithCandidate) { const auto setter = [](int &value) { value = 3; }; const auto getter = [](int value) { return value * 2; }; - ASSERT_TRUE(entt::meta_invoke({}, setter, args + 1u)); // NOLINT - ASSERT_EQ(entt::meta_invoke({}, getter, args + 1u).cast(), 6); // NOLINT + ASSERT_TRUE(entt::meta_invoke({}, setter, std::next(args.data()))); + ASSERT_EQ(entt::meta_invoke({}, getter, std::next(args.data())).cast(), 6); } TEST_F(MetaUtility, MetaInvoke) { - entt::meta_any args[2u]{clazz{}, 42}; // NOLINT + std::array args{entt::meta_any{clazz{}}, entt::meta_any{4}}; args[0u].cast().value = 3; - ASSERT_FALSE((entt::meta_invoke({}, nullptr))); + ASSERT_FALSE((entt::meta_invoke({}, std::next(args.data())))); ASSERT_FALSE((entt::meta_invoke({}, nullptr))); - ASSERT_TRUE((entt::meta_invoke(args[0u], args + 1u))); // NOLINT - ASSERT_FALSE((entt::meta_invoke(args[0u], args))); // NOLINT - ASSERT_EQ((entt::meta_invoke(args[0u], nullptr)).cast(), 42); + ASSERT_TRUE((entt::meta_invoke(args[0u], std::next(args.data())))); + ASSERT_FALSE((entt::meta_invoke(args[0u], args.data()))); + ASSERT_EQ((entt::meta_invoke(args[0u], nullptr)).cast(), 4); ASSERT_FALSE((entt::meta_invoke(args[1u], nullptr))); ASSERT_EQ((entt::meta_invoke({}, nullptr)).cast(), 3); @@ -228,42 +229,42 @@ TEST_F(MetaUtility, MetaInvoke) { } TEST_F(MetaUtility, MetaConstructArgsOnly) { - entt::meta_any args[2u]{clazz{}, 42}; // NOLINT - const auto any = entt::meta_construct(args + 1u); // NOLINT + std::array args{entt::meta_any{clazz{}}, entt::meta_any{4}}; + const auto any = entt::meta_construct(std::next(args.data())); ASSERT_TRUE(any); - ASSERT_FALSE((entt::meta_construct(args))); // NOLINT - ASSERT_EQ(any.cast().member, 42); + ASSERT_FALSE((entt::meta_construct(args.data()))); + ASSERT_EQ(any.cast().member, 4); } TEST_F(MetaUtility, MetaConstructWithCandidate) { - entt::meta_any args[2u]{clazz{}, 42}; // NOLINT - const auto any = entt::meta_construct(&clazz::factory, args + 1u); // NOLINT + std::array args{entt::meta_any{clazz{}}, entt::meta_any{4}}; + const auto any = entt::meta_construct(&clazz::factory, std::next(args.data())); ASSERT_TRUE(any); - ASSERT_FALSE((entt::meta_construct(&clazz::factory, args))); // NOLINT - ASSERT_EQ(any.cast().member, 42); + ASSERT_FALSE((entt::meta_construct(&clazz::factory, args.data()))); + ASSERT_EQ(any.cast().member, 4); ASSERT_EQ(args[0u].cast().member, 0); - ASSERT_TRUE((entt::meta_construct(&clazz::static_setter, args))); // NOLINT - ASSERT_EQ(args[0u].cast().member, 42); + ASSERT_TRUE((entt::meta_construct(&clazz::static_setter, args.data()))); + ASSERT_EQ(args[0u].cast().member, 4); const auto setter = [](int &value) { value = 3; }; const auto builder = [](int value) { return value * 2; }; - ASSERT_TRUE(entt::meta_construct(setter, args + 1u)); // NOLINT - ASSERT_EQ(entt::meta_construct(builder, args + 1u).cast(), 6); // NOLINT + ASSERT_TRUE(entt::meta_construct(setter, std::next(args.data()))); + ASSERT_EQ(entt::meta_construct(builder, std::next(args.data())).cast(), 6); } TEST_F(MetaUtility, MetaConstruct) { - std::array args{entt::meta_any{clazz{}}, entt::meta_any{2}}; - const auto any = entt::meta_construct(args.data() + 1u); // NOLINT + std::array args{entt::meta_any{clazz{}}, entt::meta_any{4}}; + const auto any = entt::meta_construct(std::next(args.data())); ASSERT_TRUE(any); ASSERT_FALSE((entt::meta_construct(args.data()))); - ASSERT_EQ(any.cast().member, 2); + ASSERT_EQ(any.cast().member, 4); ASSERT_EQ(args[0u].cast().member, 0); ASSERT_TRUE((entt::meta_construct(args.data()))); - ASSERT_EQ(args[0u].cast().member, 2); + ASSERT_EQ(args[0u].cast().member, 4); }