Commit b3254fbc authored by Nicolas Carion's avatar Nicolas Carion

[Timeline2][Model] Refactor method name for track and clip count

parent 493ba61f
...@@ -38,17 +38,17 @@ TimelineModel::~TimelineModel() ...@@ -38,17 +38,17 @@ TimelineModel::~TimelineModel()
} }
} }
int TimelineModel::getTracksCount()
int TimelineModel::getTracksNumber()
{ {
int count = m_tractor.count(); int count = m_tractor.count();
Q_ASSERT(count >= 0); Q_ASSERT(count >= 0);
Q_ASSERT(count == static_cast<int>(m_allTracks.size())); Q_ASSERT(count == static_cast<int>(m_allTracks.size()));
return count; return count;
} }
int TimelineModel::getClipsNumber()
int TimelineModel::getClipsCount() const
{ {
return m_allClips.size(); return static_cast<int>(m_allClips.size());
} }
void TimelineModel::deleteTrackById(int id) void TimelineModel::deleteTrackById(int id)
......
...@@ -42,10 +42,10 @@ public: ...@@ -42,10 +42,10 @@ public:
~TimelineModel(); ~TimelineModel();
/* @brief returns the number of tracks */ /* @brief returns the number of tracks */
int getTracksNumber(); int getTracksCount();
/* @brief returns the number of clips */ /* @brief returns the number of clips */
int getClipsNumber(); int getClipsCount() const;
/* @brief Delete track based on its id */ /* @brief Delete track based on its id */
void deleteTrackById(int id); void deleteTrackById(int id);
......
...@@ -16,23 +16,23 @@ TEST_CASE("Basic creation/deletion of a track", "[TrackModel]") ...@@ -16,23 +16,23 @@ TEST_CASE("Basic creation/deletion of a track", "[TrackModel]")
std::shared_ptr<TimelineModel> timeline = std::make_shared<TimelineModel>(); std::shared_ptr<TimelineModel> timeline = std::make_shared<TimelineModel>();
int id1 = TrackModel::construct(timeline); int id1 = TrackModel::construct(timeline);
REQUIRE(timeline->getTracksNumber() == 1); REQUIRE(timeline->getTracksCount() == 1);
int id2 = TrackModel::construct(timeline); int id2 = TrackModel::construct(timeline);
REQUIRE(timeline->getTracksNumber() == 2); REQUIRE(timeline->getTracksCount() == 2);
int id3 = TrackModel::construct(timeline); int id3 = TrackModel::construct(timeline);
REQUIRE(timeline->getTracksNumber() == 3); REQUIRE(timeline->getTracksCount() == 3);
// Test deletion // Test deletion
timeline->deleteTrackById(id1); timeline->deleteTrackById(id1);
REQUIRE(timeline->getTracksNumber() == 2); REQUIRE(timeline->getTracksCount() == 2);
timeline->deleteTrackById(id2); timeline->deleteTrackById(id2);
REQUIRE(timeline->getTracksNumber() == 1); REQUIRE(timeline->getTracksCount() == 1);
timeline->deleteTrackById(id3); timeline->deleteTrackById(id3);
REQUIRE(timeline->getTracksNumber() == 0); REQUIRE(timeline->getTracksCount() == 0);
} }
...@@ -47,21 +47,21 @@ TEST_CASE("Basic creation/deletion of a clip", "[ClipModel]") ...@@ -47,21 +47,21 @@ TEST_CASE("Basic creation/deletion of a clip", "[ClipModel]")
std::shared_ptr<Mlt::Producer> producer = std::make_shared<Mlt::Producer>(profile, "test"); std::shared_ptr<Mlt::Producer> producer = std::make_shared<Mlt::Producer>(profile, "test");
std::shared_ptr<Mlt::Producer> producer2 = std::make_shared<Mlt::Producer>(profile, "test2"); std::shared_ptr<Mlt::Producer> producer2 = std::make_shared<Mlt::Producer>(profile, "test2");
REQUIRE(timeline->getClipsNumber() == 0); REQUIRE(timeline->getClipsCount() == 0);
int id1 = ClipModel::construct(timeline, producer); int id1 = ClipModel::construct(timeline, producer);
REQUIRE(timeline->getClipsNumber() == 1); REQUIRE(timeline->getClipsCount() == 1);
int id2 = ClipModel::construct(timeline, producer2); int id2 = ClipModel::construct(timeline, producer2);
REQUIRE(timeline->getClipsNumber() == 2); REQUIRE(timeline->getClipsCount() == 2);
int id3 = ClipModel::construct(timeline, producer); int id3 = ClipModel::construct(timeline, producer);
REQUIRE(timeline->getClipsNumber() == 3); REQUIRE(timeline->getClipsCount() == 3);
// Test deletion // Test deletion
timeline->deleteClipById(id2); timeline->deleteClipById(id2);
REQUIRE(timeline->getClipsNumber() == 2); REQUIRE(timeline->getClipsCount() == 2);
timeline->deleteClipById(id3); timeline->deleteClipById(id3);
REQUIRE(timeline->getClipsNumber() == 1); REQUIRE(timeline->getClipsCount() == 1);
timeline->deleteClipById(id1); timeline->deleteClipById(id1);
REQUIRE(timeline->getClipsNumber() == 0); REQUIRE(timeline->getClipsCount() == 0);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment