restructure tests

Author: timhendriks93

test/test_live/test_live.cpp test/animation/test_live/test_live.cpptest/test_live/test_live.cpp renamed to test/animation/test_live/test_live.cpp

@@ -1,5 +1,5 @@
-#include "../SerialMock.h"
 #include "BlenderServoAnimation.h"
+#include "../../SerialMock.h"
 #include <unity.h>
 
 using namespace BlenderServoAnimation;
@@ -30,14 +30,13 @@ void move(byte servoID, int position) {
   lastPositions[servoID].index++;
 }
 
-const int positionsA[5] PROGMEM = {350, 340, 330, 340, 330};
-const int positionsB[5] PROGMEM = {250, 240, 230, 240, 230};
+const int positions[5] PROGMEM = {350, 340, 330, 340, 330};
 
-void test_live(void) {
+void test_multiple_servos(void) {
   Animation animation;
   SerialMock mock;
   Servo servos[] = {
-      Servo(0, positionsA, move),
+      Servo(0, positions, move),
       Servo(1, move),
   };
   animation.addServos(servos, 2);
@@ -66,8 +65,29 @@ void test_live(void) {
   TEST_ASSERT_EQUAL(355, lastPositions[1].positions[1]);
 }
 
+void test_skip(void) {
+  Animation animation;
+  SerialMock mock;
+  Servo servo(0, move);
+  animation.addServo(servo);
+  animation.live(mock);
+  TEST_ASSERT_EQUAL(Animation::MODE_LIVE, animation.getMode());
+
+  byte values[15] = {60, 0, 1, 94, 62, 60, 0, 1, 99, 0, 60, 0, 1, 104, 62};
+
+  for (int i = 0; i < 15; i++) {
+    mock.write(values[i]);
+  }
+
+  animation.run();
+
+  TEST_ASSERT_EQUAL(350, lastPositions[0].positions[0]);
+  TEST_ASSERT_EQUAL(360, lastPositions[0].positions[1]);
+}
+
 int main(int argc, char **argv) {
   UNITY_BEGIN();
-  RUN_TEST(test_live);
+  RUN_TEST(test_multiple_servos);
+  RUN_TEST(test_skip);
   UNITY_END();
 }

…st/test_mode_change/test_mode_change.cpp …on/test_mode_change/test_mode_change.cpptest/test_mode_change/test_mode_change.cpp renamed to test/animation/test_mode_change/test_mode_change.cpp test/test_mode_change/test_mode_change.cpp renamed to test/animation/test_mode_change/test_mode_change.cpp

@@ -1,5 +1,5 @@
-#include "../SerialMock.h"
 #include "BlenderServoAnimation.h"
+#include "../../SerialMock.h"
 #include <unity.h>
 
 using namespace BlenderServoAnimation;
@@ -30,7 +30,33 @@ void onModeChange(byte prevMode, byte newMode) {
   modeIndex++;
 }
 
-void test_mode_change(void) {
+void test_different_mode(void) {
+  Animation animation(FPS, FRAMES);
+
+  animation.onModeChange(onModeChange);
+
+  animation.play();
+  TEST_ASSERT_EQUAL(Animation::MODE_DEFAULT, lastModes[0].prevMode);
+  TEST_ASSERT_EQUAL(Animation::MODE_PLAY, lastModes[0].newMode);
+  animation.pause();
+  TEST_ASSERT_EQUAL(Animation::MODE_PLAY, lastModes[1].prevMode);
+  TEST_ASSERT_EQUAL(Animation::MODE_PAUSE, lastModes[1].newMode);
+}
+
+void test_same_mode(void) {
+  Animation animation(FPS, FRAMES);
+
+  animation.onModeChange(onModeChange);
+
+  animation.loop();
+  TEST_ASSERT_EQUAL(Animation::MODE_DEFAULT, lastModes[0].prevMode);
+  TEST_ASSERT_EQUAL(Animation::MODE_LOOP, lastModes[0].newMode);
+  animation.loop();
+  TEST_ASSERT_EQUAL(Animation::MODE_LOOP, lastModes[1].prevMode);
+  TEST_ASSERT_EQUAL(Animation::MODE_LOOP, lastModes[1].newMode);
+}
+
+void test_all_modes(void) {
   SerialMock mock;
   Animation animation(FPS, FRAMES);
 
@@ -58,6 +84,8 @@ void test_mode_change(void) {
 
 int main(int argc, char **argv) {
   UNITY_BEGIN();
-  RUN_TEST(test_mode_change);
+  RUN_TEST(test_different_mode);
+  RUN_TEST(test_same_mode);
+  RUN_TEST(test_all_modes);
   UNITY_END();
 }

test/test_animation/test_animation.cpp …nimation/test_playback/test_playback.cpptest/test_animation/test_animation.cpp renamed to test/animation/test_playback/test_playback.cpp test/test_animation/test_animation.cpp renamed to test/animation/test_playback/test_playback.cpp

@@ -1,4 +1,3 @@
-#include "../SerialMock.h"
 #include "BlenderServoAnimation.h"
 #include <unity.h>
 
@@ -31,13 +30,13 @@ void move(byte servoID, int position) {
   lastPositions[servoID].index++;
 }
 
-const int positionsA[5] PROGMEM = {350, 340, 330, 340, 330};
+const int positions[5] PROGMEM = {350, 340, 330, 340, 330};
 const int positionsB[5] PROGMEM = {250, 240, 230, 240, 230};
 
 void test_play(void) {
   Animation animation(FPS, FRAMES);
   Servo servos[] = {
-      Servo(1, positionsA, move),
+      Servo(1, positions, move),
       Servo(2, positionsB, move),
       Servo(3, move),
   };
@@ -70,7 +69,7 @@ void test_play(void) {
 
 void test_pause_play(void) {
   Animation animation(FPS, FRAMES);
-  Servo servo(2, positionsA, move);
+  Servo servo(2, positions, move);
   animation.addServo(servo);
   animation.play();
   TEST_ASSERT_EQUAL(Animation::MODE_PLAY, animation.getMode());
@@ -102,7 +101,7 @@ void test_pause_play(void) {
 void test_stop(void) {
   Animation animation(FPS, FRAMES);
   Servo servos[] = {
-      Servo(0, positionsA, move),
+      Servo(0, positions, move),
       Servo(1, positionsB, move),
       Servo(2, move),
   };
@@ -133,7 +132,7 @@ void test_stop(void) {
 void test_loop(void) {
   Animation animation(FPS, FRAMES);
   Servo servos[] = {
-      Servo(1, positionsA, move),
+      Servo(1, positions, move),
       Servo(2, positionsB, move),
       Servo(3, move),
   };
@@ -160,7 +159,7 @@ void test_loop(void) {
 
 void test_pause_loop(void) {
   Animation animation(FPS, FRAMES);
-  Servo servo(2, positionsA, move);
+  Servo servo(2, positions, move);
   animation.addServo(servo);
   animation.loop();
   TEST_ASSERT_EQUAL(Animation::MODE_LOOP, animation.getMode());