diff --git a/source/blender/blenkernel/intern/idprop_test.cc b/source/blender/blenkernel/intern/idprop_test.cc index 4a791c28677..fdb78e6fc07 100644 --- a/source/blender/blenkernel/intern/idprop_test.cc +++ b/source/blender/blenkernel/intern/idprop_test.cc @@ -19,11 +19,11 @@ TEST(idproperties, AddToGroup) EXPECT_EQ(IDP_GetPropertyFromGroup(group, "a"), nullptr); EXPECT_TRUE(IDP_AddToGroup(group, idprop::create("a", 3.0f).release())); EXPECT_TRUE(IDP_AddToGroup(group, idprop::create("b", 5).release())); - EXPECT_EQ(IDP_Float(IDP_GetPropertyFromGroup(group, "a")), 3.0f); - EXPECT_EQ(IDP_Int(IDP_GetPropertyFromGroup(group, "b")), 5); + EXPECT_EQ(IDP_float_get(IDP_GetPropertyFromGroup(group, "a")), 3.0f); + EXPECT_EQ(IDP_int_get(IDP_GetPropertyFromGroup(group, "b")), 5); IDProperty *duplicate_prop = idprop::create("a", 10).release(); EXPECT_FALSE(IDP_AddToGroup(group, duplicate_prop)); - EXPECT_EQ(IDP_Float(IDP_GetPropertyFromGroup(group, "a")), 3.0f); + EXPECT_EQ(IDP_float_get(IDP_GetPropertyFromGroup(group, "a")), 3.0f); EXPECT_EQ(IDP_GetPropertyFromGroup(group, "c"), nullptr); IDP_FreeProperty(duplicate_prop); IDP_FreeProperty(group); @@ -33,11 +33,11 @@ TEST(idproperties, ReplaceInGroup) { IDProperty *group = idprop::create_group("test").release(); EXPECT_TRUE(IDP_AddToGroup(group, idprop::create("a", 3.0f).release())); - EXPECT_EQ(IDP_Float(IDP_GetPropertyFromGroup(group, "a")), 3.0f); + EXPECT_EQ(IDP_float_get(IDP_GetPropertyFromGroup(group, "a")), 3.0f); IDP_ReplaceInGroup(group, idprop::create("a", 5.0f).release()); - EXPECT_EQ(IDP_Float(IDP_GetPropertyFromGroup(group, "a")), 5.0f); + EXPECT_EQ(IDP_float_get(IDP_GetPropertyFromGroup(group, "a")), 5.0f); IDP_ReplaceInGroup(group, idprop::create("b", 5).release()); - EXPECT_EQ(IDP_Int(IDP_GetPropertyFromGroup(group, "b")), 5); + EXPECT_EQ(IDP_int_get(IDP_GetPropertyFromGroup(group, "b")), 5); IDP_FreeProperty(group); } @@ -47,7 +47,7 @@ TEST(idproperties, RemoveFromGroup) EXPECT_EQ(IDP_GetPropertyFromGroup(group, "a"), nullptr); IDProperty *prop_a = idprop::create("a", 3.0f).release(); EXPECT_TRUE(IDP_AddToGroup(group, prop_a)); - EXPECT_EQ(IDP_Float(IDP_GetPropertyFromGroup(group, "a")), 3.0f); + EXPECT_EQ(IDP_float_get(IDP_GetPropertyFromGroup(group, "a")), 3.0f); IDP_RemoveFromGroup(group, prop_a); EXPECT_EQ(IDP_GetPropertyFromGroup(group, "a"), nullptr); IDP_FreeProperty(prop_a); @@ -64,9 +64,9 @@ TEST(idproperties, ReplaceGroupInGroup) IDP_AddToGroup(group2, idprop::create("c", 4).release()); IDP_ReplaceGroupInGroup(group1, group2); - EXPECT_EQ(IDP_Int(IDP_GetPropertyFromGroup(group1, "a")), 1); - EXPECT_EQ(IDP_Int(IDP_GetPropertyFromGroup(group1, "b")), 3); - EXPECT_EQ(IDP_Int(IDP_GetPropertyFromGroup(group1, "c")), 4); + EXPECT_EQ(IDP_int_get(IDP_GetPropertyFromGroup(group1, "a")), 1); + EXPECT_EQ(IDP_int_get(IDP_GetPropertyFromGroup(group1, "b")), 3); + EXPECT_EQ(IDP_int_get(IDP_GetPropertyFromGroup(group1, "c")), 4); IDP_FreeProperty(group1); IDP_FreeProperty(group2); @@ -84,9 +84,9 @@ TEST(idproperties, SyncGroupValues) IDP_AddToGroup(group2, idprop::create("x", "value").release()); IDP_SyncGroupValues(group1, group2); - EXPECT_EQ(IDP_Int(IDP_GetPropertyFromGroup(group1, "a")), 3); - EXPECT_EQ(IDP_Int(IDP_GetPropertyFromGroup(group1, "b")), 2); - EXPECT_EQ(IDP_Int(IDP_GetPropertyFromGroup(group1, "x")), 2); + EXPECT_EQ(IDP_int_get(IDP_GetPropertyFromGroup(group1, "a")), 3); + EXPECT_EQ(IDP_int_get(IDP_GetPropertyFromGroup(group1, "b")), 2); + EXPECT_EQ(IDP_int_get(IDP_GetPropertyFromGroup(group1, "x")), 2); EXPECT_EQ(IDP_GetPropertyFromGroup(group1, "c"), nullptr); IDP_FreeProperty(group1);