diff options
author | Daniel Agar <daniel@agar.ca> | 2015-01-07 23:15:12 -0500 |
---|---|---|
committer | Daniel Agar <daniel@agar.ca> | 2015-01-07 23:15:12 -0500 |
commit | a4db73dad894e7b6f6920fcd1184127f9c997201 (patch) | |
tree | 9344cf9805403a666add6d68c8594b02dd11c735 | |
parent | 6ed2f77ca5c713e537c8fd4a9aacd7adc7887f53 (diff) | |
download | px4-firmware-a4db73dad894e7b6f6920fcd1184127f9c997201.tar.gz px4-firmware-a4db73dad894e7b6f6920fcd1184127f9c997201.tar.bz2 px4-firmware-a4db73dad894e7b6f6920fcd1184127f9c997201.zip |
move st24_test to gtest
-rw-r--r-- | unittests/CMakeLists.txt | 2 | ||||
-rw-r--r-- | unittests/st24_test.cpp | 31 |
2 files changed, 5 insertions, 28 deletions
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index c2990c59f..247ddbb3d 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -61,12 +61,10 @@ add_executable(conversion_test conversion_test.cpp ${PX_SRC}/systemcmds/tests/te add_gtest(conversion_test) # sbus2_test -# TODO: move to gtest add_executable(sbus2_test sbus2_test.cpp hrt.cpp) add_gtest(sbus2_test) # st24_test -# TODO: move to gtest add_executable(st24_test st24_test.cpp hrt.cpp ${PX_SRC}/lib/rc/st24.c) add_gtest(st24_test) diff --git a/unittests/st24_test.cpp b/unittests/st24_test.cpp index 0c56df173..89c7ffb1c 100644 --- a/unittests/st24_test.cpp +++ b/unittests/st24_test.cpp @@ -1,4 +1,3 @@ - #include <stdio.h> #include <unistd.h> #include <string.h> @@ -7,30 +6,17 @@ #include <rc/st24.h> #include "../../src/systemcmds/tests/tests.h" -int main(int argc, char *argv[]) -{ - warnx("ST24 test started"); - - char* defaultfile = "testdata/st24_data.txt"; +#include "gtest/gtest.h" - char* filepath = 0; - - if (argc < 2) { - warnx("Too few arguments. Using default file: %s", defaultfile); - filepath = defaultfile; - } else { - filepath = argv[1]; - } +TEST(ST24Test, ST24) { + const char* filepath = "testdata/st24_data.txt"; warnx("loading data from: %s", filepath); FILE *fp; fp = fopen(filepath, "rt"); - - if (!fp) { - errx(1, "failed opening file"); - } + //ASSERT_TRUE(fp); float f; unsigned x; @@ -73,12 +59,5 @@ int main(int argc, char *argv[]) } } - if (ret == EOF) { - warnx("Test finished, reached end of file"); - ret = 0; - } else { - warnx("Test aborted, errno: %d", ret); - } - - return ret; + ASSERT_EQ(EOF, ret); } |