style: unify identifier naming per updated conventions
Automated with clang-tidy readability-identifier-naming (config added to .clang-tidy) plus scripted passes, per the updated rules now documented in CONTRIBUTING.md: - types (class/struct/enum/alias/template params): PascalCase - functions, variables, members: snake_case (incl. rational -> Rational) - private/protected members: trailing underscore; static member variables likewise (instance_, available_themes_) - constants and enum values: snake_case (kLinear -> k_linear, F32P -> f32p); ALL_CAPS reserved for macros - macros: OAK_ prefix (OLIVE_ADD_TEST/OLIVE_ASSERT/OLIVE_CONFIG -> OAK_ADD_TEST/OAK_ASSERT/OAK_CONFIG, GL_PREAMBLE -> OAK_GL_PREAMBLE, include guards -> OAK_*) - file names: all lowercase (Current/Plugin/OliveHost/OliveClip/ OlivePluginInstance -> current/plugin/olivehost/oliveclip/ oliveplugininstance) - getters share the member name sans underscore, setters set_foo() - Qt and third-party (OpenFX) virtual overrides and framework callbacks keep their original names (exempt in .clang-tidy) Manual follow-ups required where automation could not reach: - string-based QMetaObject/SIGNAL/SLOT references updated to renamed methods (AddTask, CreatedFile, DeleteSpecificFile, moveSelectionUp, ...) - macro bodies referencing renamed methods (OLIVE_CONFIG, NODE_DEFAULT_DESTRUCTOR, MANAGEDDISPLAYWIDGET_*) - self-shadowing locals renamed where signals/methods became same-named (size_changed, worker_count, selected_items, import param, filters) - third_party OFX member/namespace usages restored (OFX::Host::*, _created, _clipPrefsDirty, createInstance, clearPersistentMessage) - STL protocol aliases restored (const_iterator) with .clang-tidy ignore rules; qHash overloads restored Full build and test suite pass: ctest 4/4, ~1960 gtest cases green.
This commit is contained in:
@@ -9,18 +9,18 @@
|
||||
TEST(NodeValue, VectorRoundTrip)
|
||||
{
|
||||
QVector2D v2(1.5f, -2.0f);
|
||||
QString encoded = olive::NodeValue::ValueToString(
|
||||
olive::NodeValue::kVec2, QVariant::fromValue(v2), false);
|
||||
QVariant decoded = olive::NodeValue::StringToValue(olive::NodeValue::kVec2,
|
||||
QString encoded = olive::NodeValue::value_to_string(
|
||||
olive::NodeValue::k_vec2, QVariant::fromValue(v2), false);
|
||||
QVariant decoded = olive::NodeValue::string_to_value(olive::NodeValue::k_vec2,
|
||||
encoded, false);
|
||||
QVector2D v2_out = decoded.value<QVector2D>();
|
||||
EXPECT_FLOAT_EQ(v2_out.x(), v2.x());
|
||||
EXPECT_FLOAT_EQ(v2_out.y(), v2.y());
|
||||
|
||||
QVector3D v3(1.0f, 2.0f, 3.0f);
|
||||
encoded = olive::NodeValue::ValueToString(olive::NodeValue::kVec3,
|
||||
encoded = olive::NodeValue::value_to_string(olive::NodeValue::k_vec3,
|
||||
QVariant::fromValue(v3), false);
|
||||
decoded = olive::NodeValue::StringToValue(olive::NodeValue::kVec3, encoded,
|
||||
decoded = olive::NodeValue::string_to_value(olive::NodeValue::k_vec3, encoded,
|
||||
false);
|
||||
QVector3D v3_out = decoded.value<QVector3D>();
|
||||
EXPECT_FLOAT_EQ(v3_out.x(), v3.x());
|
||||
@@ -28,9 +28,9 @@ TEST(NodeValue, VectorRoundTrip)
|
||||
EXPECT_FLOAT_EQ(v3_out.z(), v3.z());
|
||||
|
||||
QVector4D v4(1.0f, 2.0f, 3.0f, 4.0f);
|
||||
encoded = olive::NodeValue::ValueToString(olive::NodeValue::kVec4,
|
||||
encoded = olive::NodeValue::value_to_string(olive::NodeValue::k_vec4,
|
||||
QVariant::fromValue(v4), false);
|
||||
decoded = olive::NodeValue::StringToValue(olive::NodeValue::kVec4, encoded,
|
||||
decoded = olive::NodeValue::string_to_value(olive::NodeValue::k_vec4, encoded,
|
||||
false);
|
||||
QVector4D v4_out = decoded.value<QVector4D>();
|
||||
EXPECT_FLOAT_EQ(v4_out.x(), v4.x());
|
||||
@@ -43,53 +43,53 @@ TEST(NodeValue, BinaryRoundTrip)
|
||||
{
|
||||
QByteArray data("OliveTest");
|
||||
QString encoded =
|
||||
olive::NodeValue::ValueToString(olive::NodeValue::kBinary, data, false);
|
||||
QVariant decoded = olive::NodeValue::StringToValue(
|
||||
olive::NodeValue::kBinary, encoded, false);
|
||||
olive::NodeValue::value_to_string(olive::NodeValue::k_binary, data, false);
|
||||
QVariant decoded = olive::NodeValue::string_to_value(
|
||||
olive::NodeValue::k_binary, encoded, false);
|
||||
EXPECT_EQ(decoded.toByteArray(), data);
|
||||
}
|
||||
|
||||
TEST(NodeValue, TypeClassification)
|
||||
{
|
||||
EXPECT_TRUE(
|
||||
olive::NodeValue::type_can_be_interpolated(olive::NodeValue::kFloat));
|
||||
olive::NodeValue::type_can_be_interpolated(olive::NodeValue::k_float));
|
||||
EXPECT_TRUE(
|
||||
olive::NodeValue::type_can_be_interpolated(olive::NodeValue::kColor));
|
||||
olive::NodeValue::type_can_be_interpolated(olive::NodeValue::k_color));
|
||||
EXPECT_FALSE(
|
||||
olive::NodeValue::type_can_be_interpolated(olive::NodeValue::kInt));
|
||||
olive::NodeValue::type_can_be_interpolated(olive::NodeValue::k_int));
|
||||
|
||||
EXPECT_TRUE(olive::NodeValue::type_is_numeric(olive::NodeValue::kInt));
|
||||
EXPECT_TRUE(olive::NodeValue::type_is_numeric(olive::NodeValue::kFloat));
|
||||
EXPECT_FALSE(olive::NodeValue::type_is_numeric(olive::NodeValue::kText));
|
||||
EXPECT_TRUE(olive::NodeValue::type_is_numeric(olive::NodeValue::k_int));
|
||||
EXPECT_TRUE(olive::NodeValue::type_is_numeric(olive::NodeValue::k_float));
|
||||
EXPECT_FALSE(olive::NodeValue::type_is_numeric(olive::NodeValue::k_text));
|
||||
|
||||
EXPECT_TRUE(olive::NodeValue::type_is_vector(olive::NodeValue::kVec2));
|
||||
EXPECT_TRUE(olive::NodeValue::type_is_vector(olive::NodeValue::kVec3));
|
||||
EXPECT_FALSE(olive::NodeValue::type_is_vector(olive::NodeValue::kFloat));
|
||||
EXPECT_TRUE(olive::NodeValue::type_is_vector(olive::NodeValue::k_vec2));
|
||||
EXPECT_TRUE(olive::NodeValue::type_is_vector(olive::NodeValue::k_vec3));
|
||||
EXPECT_FALSE(olive::NodeValue::type_is_vector(olive::NodeValue::k_float));
|
||||
|
||||
EXPECT_TRUE(olive::NodeValue::type_is_buffer(olive::NodeValue::kTexture));
|
||||
EXPECT_TRUE(olive::NodeValue::type_is_buffer(olive::NodeValue::kSamples));
|
||||
EXPECT_FALSE(olive::NodeValue::type_is_buffer(olive::NodeValue::kColor));
|
||||
EXPECT_TRUE(olive::NodeValue::type_is_buffer(olive::NodeValue::k_texture));
|
||||
EXPECT_TRUE(olive::NodeValue::type_is_buffer(olive::NodeValue::k_samples));
|
||||
EXPECT_FALSE(olive::NodeValue::type_is_buffer(olive::NodeValue::k_color));
|
||||
}
|
||||
|
||||
TEST(NodeValue, DataTypeNameRoundTrip)
|
||||
{
|
||||
for (int i = olive::NodeValue::kNone; i < olive::NodeValue::kDataTypeCount;
|
||||
for (int i = olive::NodeValue::k_none; i < olive::NodeValue::k_data_type_count;
|
||||
++i) {
|
||||
auto type = static_cast<olive::NodeValue::Type>(i);
|
||||
QString name = olive::NodeValue::GetDataTypeName(type);
|
||||
QString name = olive::NodeValue::get_data_type_name(type);
|
||||
if (name.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
EXPECT_EQ(olive::NodeValue::GetDataTypeFromName(name), type)
|
||||
EXPECT_EQ(olive::NodeValue::get_data_type_from_name(name), type)
|
||||
<< name.toStdString();
|
||||
}
|
||||
}
|
||||
|
||||
TEST(NodeValue, ConstructionAndAccessors)
|
||||
{
|
||||
olive::NodeValue val(olive::NodeValue::kInt, static_cast<int64_t>(42));
|
||||
EXPECT_EQ(val.type(), olive::NodeValue::kInt);
|
||||
EXPECT_EQ(val.toInt(), 42);
|
||||
olive::NodeValue val(olive::NodeValue::k_int, static_cast<int64_t>(42));
|
||||
EXPECT_EQ(val.type(), olive::NodeValue::k_int);
|
||||
EXPECT_EQ(val.to_int(), 42);
|
||||
EXPECT_TRUE(val);
|
||||
|
||||
val.set_tag(QStringLiteral("tag"));
|
||||
@@ -99,36 +99,36 @@ TEST(NodeValue, ConstructionAndAccessors)
|
||||
TEST(NodeValueTable, PushAndGet)
|
||||
{
|
||||
olive::NodeValueTable table;
|
||||
olive::NodeValue v(olive::NodeValue::kFloat, 3.14);
|
||||
table.Push(v);
|
||||
olive::NodeValue v(olive::NodeValue::k_float, 3.14);
|
||||
table.push(v);
|
||||
|
||||
EXPECT_EQ(table.Count(), 1);
|
||||
EXPECT_EQ(table.count(), 1);
|
||||
EXPECT_FALSE(table.isEmpty());
|
||||
EXPECT_TRUE(table.Has(olive::NodeValue::kFloat));
|
||||
EXPECT_TRUE(table.has(olive::NodeValue::k_float));
|
||||
|
||||
olive::NodeValue got = table.Get(olive::NodeValue::kFloat);
|
||||
EXPECT_DOUBLE_EQ(got.toDouble(), 3.14);
|
||||
olive::NodeValue got = table.get(olive::NodeValue::k_float);
|
||||
EXPECT_DOUBLE_EQ(got.to_double(), 3.14);
|
||||
}
|
||||
|
||||
TEST(NodeValueTable, TakeRemovesValue)
|
||||
{
|
||||
olive::NodeValueTable table;
|
||||
table.Push(
|
||||
olive::NodeValue(olive::NodeValue::kInt, static_cast<int64_t>(1)));
|
||||
table.Push(
|
||||
olive::NodeValue(olive::NodeValue::kInt, static_cast<int64_t>(2)));
|
||||
table.push(
|
||||
olive::NodeValue(olive::NodeValue::k_int, static_cast<int64_t>(1)));
|
||||
table.push(
|
||||
olive::NodeValue(olive::NodeValue::k_int, static_cast<int64_t>(2)));
|
||||
|
||||
olive::NodeValue taken = table.Take(olive::NodeValue::kInt);
|
||||
EXPECT_EQ(taken.toInt(), 2);
|
||||
EXPECT_EQ(table.Count(), 1);
|
||||
olive::NodeValue taken = table.take(olive::NodeValue::k_int);
|
||||
EXPECT_EQ(taken.to_int(), 2);
|
||||
EXPECT_EQ(table.count(), 1);
|
||||
}
|
||||
|
||||
TEST(NodeValueTable, ClearEmptiesTable)
|
||||
{
|
||||
olive::NodeValueTable table;
|
||||
table.Push(
|
||||
olive::NodeValue(olive::NodeValue::kText, QStringLiteral("hello")));
|
||||
table.Clear();
|
||||
table.push(
|
||||
olive::NodeValue(olive::NodeValue::k_text, QStringLiteral("hello")));
|
||||
table.clear();
|
||||
EXPECT_TRUE(table.isEmpty());
|
||||
EXPECT_EQ(table.Count(), 0);
|
||||
EXPECT_EQ(table.count(), 0);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user