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:
@@ -6,164 +6,164 @@ using namespace olive::core;
|
||||
|
||||
TEST(CoreTimeRange, ConstructAndAccess)
|
||||
{
|
||||
TimeRange r(rational(1), rational(5));
|
||||
EXPECT_EQ(r.in(), rational(1));
|
||||
EXPECT_EQ(r.out(), rational(5));
|
||||
EXPECT_EQ(r.length(), rational(4));
|
||||
TimeRange r(Rational(1), Rational(5));
|
||||
EXPECT_EQ(r.in(), Rational(1));
|
||||
EXPECT_EQ(r.out(), Rational(5));
|
||||
EXPECT_EQ(r.length(), Rational(4));
|
||||
}
|
||||
|
||||
TEST(CoreTimeRange, NormalizationSwapsReversedBounds)
|
||||
{
|
||||
TimeRange r(rational(5), rational(1));
|
||||
EXPECT_EQ(r.in(), rational(1));
|
||||
EXPECT_EQ(r.out(), rational(5));
|
||||
TimeRange r(Rational(5), Rational(1));
|
||||
EXPECT_EQ(r.in(), Rational(1));
|
||||
EXPECT_EQ(r.out(), Rational(5));
|
||||
}
|
||||
|
||||
TEST(CoreTimeRange, SettersNormalize)
|
||||
{
|
||||
TimeRange r(rational(0), rational(10));
|
||||
r.set_in(rational(15));
|
||||
EXPECT_EQ(r.in(), rational(10));
|
||||
EXPECT_EQ(r.out(), rational(15));
|
||||
TimeRange r(Rational(0), Rational(10));
|
||||
r.set_in(Rational(15));
|
||||
EXPECT_EQ(r.in(), Rational(10));
|
||||
EXPECT_EQ(r.out(), Rational(15));
|
||||
|
||||
r.set_out(rational(2));
|
||||
EXPECT_EQ(r.in(), rational(2));
|
||||
EXPECT_EQ(r.out(), rational(10));
|
||||
r.set_out(Rational(2));
|
||||
EXPECT_EQ(r.in(), Rational(2));
|
||||
EXPECT_EQ(r.out(), Rational(10));
|
||||
}
|
||||
|
||||
TEST(CoreTimeRange, ContainsRational)
|
||||
{
|
||||
TimeRange r(rational(0), rational(10));
|
||||
EXPECT_TRUE(r.Contains(rational(5)));
|
||||
EXPECT_FALSE(r.Contains(rational(10)));
|
||||
EXPECT_FALSE(r.Contains(rational(-1)));
|
||||
TimeRange r(Rational(0), Rational(10));
|
||||
EXPECT_TRUE(r.contains(Rational(5)));
|
||||
EXPECT_FALSE(r.contains(Rational(10)));
|
||||
EXPECT_FALSE(r.contains(Rational(-1)));
|
||||
}
|
||||
|
||||
TEST(CoreTimeRange, ContainsRange)
|
||||
{
|
||||
TimeRange outer(rational(0), rational(10));
|
||||
TimeRange inner(rational(2), rational(8));
|
||||
TimeRange partial(rational(5), rational(15));
|
||||
TimeRange outer(Rational(0), Rational(10));
|
||||
TimeRange inner(Rational(2), Rational(8));
|
||||
TimeRange partial(Rational(5), Rational(15));
|
||||
|
||||
EXPECT_TRUE(outer.Contains(inner));
|
||||
EXPECT_FALSE(outer.Contains(partial));
|
||||
EXPECT_TRUE(outer.contains(inner));
|
||||
EXPECT_FALSE(outer.contains(partial));
|
||||
}
|
||||
|
||||
TEST(CoreTimeRange, OverlapsWith)
|
||||
{
|
||||
TimeRange a(rational(0), rational(10));
|
||||
TimeRange b(rational(5), rational(15));
|
||||
TimeRange c(rational(10), rational(20));
|
||||
TimeRange a(Rational(0), Rational(10));
|
||||
TimeRange b(Rational(5), Rational(15));
|
||||
TimeRange c(Rational(10), Rational(20));
|
||||
|
||||
EXPECT_TRUE(a.OverlapsWith(b));
|
||||
EXPECT_TRUE(a.overlaps_with(b));
|
||||
// By default bounds are inclusive, so [0,10] and [10,20] touch and overlap
|
||||
EXPECT_TRUE(a.OverlapsWith(c));
|
||||
EXPECT_FALSE(a.OverlapsWith(c, false, false));
|
||||
EXPECT_TRUE(a.overlaps_with(c));
|
||||
EXPECT_FALSE(a.overlaps_with(c, false, false));
|
||||
}
|
||||
|
||||
TEST(CoreTimeRange, CombineAndIntersect)
|
||||
{
|
||||
TimeRange a(rational(0), rational(10));
|
||||
TimeRange b(rational(5), rational(15));
|
||||
TimeRange a(Rational(0), Rational(10));
|
||||
TimeRange b(Rational(5), Rational(15));
|
||||
|
||||
TimeRange combined = a.Combined(b);
|
||||
EXPECT_EQ(combined.in(), rational(0));
|
||||
EXPECT_EQ(combined.out(), rational(15));
|
||||
TimeRange combined = a.combined(b);
|
||||
EXPECT_EQ(combined.in(), Rational(0));
|
||||
EXPECT_EQ(combined.out(), Rational(15));
|
||||
|
||||
TimeRange intersect = a.Intersected(b);
|
||||
EXPECT_EQ(intersect.in(), rational(5));
|
||||
EXPECT_EQ(intersect.out(), rational(10));
|
||||
TimeRange intersect = a.intersected(b);
|
||||
EXPECT_EQ(intersect.in(), Rational(5));
|
||||
EXPECT_EQ(intersect.out(), Rational(10));
|
||||
}
|
||||
|
||||
TEST(CoreTimeRange, Arithmetic)
|
||||
{
|
||||
TimeRange r(rational(0), rational(10));
|
||||
TimeRange shifted = r + rational(5);
|
||||
EXPECT_EQ(shifted.in(), rational(5));
|
||||
EXPECT_EQ(shifted.out(), rational(15));
|
||||
TimeRange r(Rational(0), Rational(10));
|
||||
TimeRange shifted = r + Rational(5);
|
||||
EXPECT_EQ(shifted.in(), Rational(5));
|
||||
EXPECT_EQ(shifted.out(), Rational(15));
|
||||
|
||||
shifted -= rational(3);
|
||||
EXPECT_EQ(shifted.in(), rational(2));
|
||||
EXPECT_EQ(shifted.out(), rational(12));
|
||||
shifted -= Rational(3);
|
||||
EXPECT_EQ(shifted.in(), Rational(2));
|
||||
EXPECT_EQ(shifted.out(), Rational(12));
|
||||
}
|
||||
|
||||
TEST(CoreTimeRange, Split)
|
||||
{
|
||||
TimeRange r(rational(0), rational(10));
|
||||
auto pieces = r.Split(3);
|
||||
TimeRange r(Rational(0), Rational(10));
|
||||
auto pieces = r.split(3);
|
||||
ASSERT_EQ(pieces.size(), 4u);
|
||||
EXPECT_EQ(pieces.front().in(), rational(0));
|
||||
EXPECT_EQ(pieces.front().in(), Rational(0));
|
||||
}
|
||||
|
||||
TEST(CoreTimeRangeList, InsertMergesOverlapping)
|
||||
{
|
||||
TimeRangeList list;
|
||||
list.insert(TimeRange(rational(0), rational(5)));
|
||||
list.insert(TimeRange(rational(3), rational(8)));
|
||||
list.insert(TimeRange(rational(10), rational(12)));
|
||||
list.insert(TimeRange(Rational(0), Rational(5)));
|
||||
list.insert(TimeRange(Rational(3), Rational(8)));
|
||||
list.insert(TimeRange(Rational(10), Rational(12)));
|
||||
|
||||
EXPECT_EQ(list.size(), 2);
|
||||
EXPECT_EQ(list.first().in(), rational(0));
|
||||
EXPECT_EQ(list.first().out(), rational(8));
|
||||
EXPECT_EQ(list.first().in(), Rational(0));
|
||||
EXPECT_EQ(list.first().out(), Rational(8));
|
||||
}
|
||||
|
||||
TEST(CoreTimeRangeList, RemoveSplitsRange)
|
||||
{
|
||||
TimeRangeList list;
|
||||
list.insert(TimeRange(rational(0), rational(10)));
|
||||
list.remove(TimeRange(rational(3), rational(7)));
|
||||
list.insert(TimeRange(Rational(0), Rational(10)));
|
||||
list.remove(TimeRange(Rational(3), Rational(7)));
|
||||
|
||||
EXPECT_EQ(list.size(), 2);
|
||||
EXPECT_EQ(list.first().out(), rational(3));
|
||||
EXPECT_EQ(list.last().in(), rational(7));
|
||||
EXPECT_EQ(list.first().out(), Rational(3));
|
||||
EXPECT_EQ(list.last().in(), Rational(7));
|
||||
}
|
||||
|
||||
TEST(CoreTimeRangeList, Shift)
|
||||
{
|
||||
TimeRangeList list;
|
||||
list.insert(TimeRange(rational(0), rational(5)));
|
||||
list.shift(rational(10));
|
||||
list.insert(TimeRange(Rational(0), Rational(5)));
|
||||
list.shift(Rational(10));
|
||||
|
||||
EXPECT_EQ(list.first().in(), rational(10));
|
||||
EXPECT_EQ(list.first().out(), rational(15));
|
||||
EXPECT_EQ(list.first().in(), Rational(10));
|
||||
EXPECT_EQ(list.first().out(), Rational(15));
|
||||
}
|
||||
|
||||
TEST(CoreTimeRangeList, TrimInAndOut)
|
||||
{
|
||||
TimeRangeList list;
|
||||
list.insert(TimeRange(rational(10), rational(20)));
|
||||
list.trim_in(rational(5));
|
||||
EXPECT_EQ(list.first().in(), rational(15));
|
||||
EXPECT_EQ(list.first().out(), rational(20));
|
||||
list.insert(TimeRange(Rational(10), Rational(20)));
|
||||
list.trim_in(Rational(5));
|
||||
EXPECT_EQ(list.first().in(), Rational(15));
|
||||
EXPECT_EQ(list.first().out(), Rational(20));
|
||||
|
||||
list.trim_out(rational(-5));
|
||||
list.trim_out(Rational(-5));
|
||||
// set_out(out + diff) = 20 + (-5) = 15
|
||||
EXPECT_EQ(list.first().out(), rational(15));
|
||||
EXPECT_EQ(list.first().out(), Rational(15));
|
||||
}
|
||||
|
||||
TEST(CoreTimeRangeList, Intersects)
|
||||
{
|
||||
TimeRangeList list;
|
||||
list.insert(TimeRange(rational(0), rational(10)));
|
||||
list.insert(TimeRange(rational(20), rational(30)));
|
||||
list.insert(TimeRange(Rational(0), Rational(10)));
|
||||
list.insert(TimeRange(Rational(20), Rational(30)));
|
||||
|
||||
TimeRangeList result =
|
||||
list.Intersects(TimeRange(rational(5), rational(25)));
|
||||
list.intersects(TimeRange(Rational(5), Rational(25)));
|
||||
EXPECT_EQ(result.size(), 2);
|
||||
EXPECT_EQ(result.first().in(), rational(5));
|
||||
EXPECT_EQ(result.first().out(), rational(10));
|
||||
EXPECT_EQ(result.first().in(), Rational(5));
|
||||
EXPECT_EQ(result.first().out(), Rational(10));
|
||||
}
|
||||
|
||||
TEST(CoreTimeRangeListFrameIterator, IteratesFrames)
|
||||
{
|
||||
TimeRangeList list;
|
||||
// 5 seconds at 25fps = 125 frames
|
||||
list.insert(TimeRange(rational(0), rational(5)));
|
||||
TimeRangeListFrameIterator it(list, rational(1, 25));
|
||||
list.insert(TimeRange(Rational(0), Rational(5)));
|
||||
TimeRangeListFrameIterator it(list, Rational(1, 25));
|
||||
|
||||
rational out;
|
||||
Rational out;
|
||||
int count = 0;
|
||||
while (it.GetNext(&out)) {
|
||||
while (it.get_next(&out)) {
|
||||
count++;
|
||||
}
|
||||
|
||||
@@ -174,12 +174,12 @@ TEST(CoreTimeRangeListFrameIterator, IteratesFrames)
|
||||
TEST(CoreTimeRangeListFrameIterator, HasNext)
|
||||
{
|
||||
TimeRangeList list;
|
||||
list.insert(TimeRange(rational(0), rational(1)));
|
||||
TimeRangeListFrameIterator it(list, rational(1, 25));
|
||||
list.insert(TimeRange(Rational(0), Rational(1)));
|
||||
TimeRangeListFrameIterator it(list, Rational(1, 25));
|
||||
|
||||
EXPECT_TRUE(it.HasNext());
|
||||
rational out;
|
||||
while (it.GetNext(&out)) {
|
||||
EXPECT_TRUE(it.has_next());
|
||||
Rational out;
|
||||
while (it.get_next(&out)) {
|
||||
}
|
||||
EXPECT_FALSE(it.HasNext());
|
||||
EXPECT_FALSE(it.has_next());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user