fix tests

timhendriks93 · Feb 3, 2024 · 5b632e6 · 5b632e6
1 parent b97fca6
commit 5b632e6
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 8 deletions.
diff --git a/src/internal/Scene.cpp b/src/internal/Scene.cpp
@@ -73,7 +73,7 @@ bool Scene::isNewFrame(unsigned long currentMicros) {
 }
 
 bool Scene::hasFinished() {
-  return this->frame + 1 == this->frames;
+  return this->frame == this->frames;
 }
 
 byte Scene::getFPS() {

diff --git a/test/animation/test_loop/test_loop.cpp b/test/animation/test_loop/test_loop.cpp
@@ -17,8 +17,6 @@ void test_loop(void) {
   animation.addScene(PROGMEM_DATA, DATA_SIZE, FPS, FRAMES);
 
   TEST_ASSERT_TRUE(animation.hasScenes());
-  TEST_ASSERT_EQUAL(2, animation.countScenes());
-
   TEST_ASSERT_EQUAL(Animation::MODE_DEFAULT, animation.getMode());
 
   animation.loop();

diff --git a/test/animation/test_play/test_play.cpp b/test/animation/test_play/test_play.cpp
@@ -15,14 +15,11 @@ void test_play(void) {
   animation.onPositionChange(move);
 
   TEST_ASSERT_FALSE(animation.hasScenes());
-  TEST_ASSERT_EQUAL(0, animation.countScenes());
   TEST_ASSERT_EQUAL(nullptr, animation.getCurrentScene());
 
   animation.addScene(PROGMEM_DATA, DATA_SIZE, FPS, FRAMES);
 
   TEST_ASSERT_TRUE(animation.hasScenes());
-  TEST_ASSERT_EQUAL(1, animation.countScenes());
-
   TEST_ASSERT_EQUAL(Animation::MODE_DEFAULT, animation.getMode());
 
   animation.play();

diff --git a/test/animation/test_play_random/test_play_random.cpp b/test/animation/test_play_random/test_play_random.cpp
@@ -17,7 +17,6 @@ void test_play_random(void) {
   animation.addScene(PROGMEM_DATA, DATA_SIZE, FPS, FRAMES);
   animation.addScene(PROGMEM_DATA, DATA_SIZE, FPS, FRAMES);
 
-  TEST_ASSERT_EQUAL(3, animation.countScenes());
   TEST_ASSERT_EQUAL(Animation::MODE_DEFAULT, animation.getMode());
 
   When(OverloadedMethod(ArduinoFake(), random, long(long))).Return(1, 0, 2);

diff --git a/test/animation/test_play_single/test_play_single.cpp b/test/animation/test_play_single/test_play_single.cpp
@@ -17,7 +17,6 @@ void test_play_single(void) {
   animation.addScene(PROGMEM_DATA, DATA_SIZE, FPS, FRAMES);
   animation.addScene(PROGMEM_DATA, DATA_SIZE, FPS, FRAMES);
 
-  TEST_ASSERT_EQUAL(3, animation.countScenes());
   TEST_ASSERT_EQUAL(Animation::MODE_DEFAULT, animation.getMode());
 
   animation.playSingle(2);