diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-08 17:08:30 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-08 17:08:30 +0100 |
commit | fb151a855f22e407eaa49db42851c90b6f1333f5 (patch) | |
tree | bda3de1a91b72d3ff9b06919c261b3ec37cfa83d /unittests/st24_test.cpp | |
parent | bb0d04212f31051fe4b71848c0a3b8adeb9b6e39 (diff) | |
parent | aa2a00b56a0be0e20abfa54c311575f9e055f212 (diff) | |
download | px4-firmware-fb151a855f22e407eaa49db42851c90b6f1333f5.tar.gz px4-firmware-fb151a855f22e407eaa49db42851c90b6f1333f5.tar.bz2 px4-firmware-fb151a855f22e407eaa49db42851c90b6f1333f5.zip |
Merge remote-tracking branch 'upstream/master' into ros
Diffstat (limited to 'unittests/st24_test.cpp')
-rw-r--r-- | unittests/st24_test.cpp | 31 |
1 files changed, 5 insertions, 26 deletions
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); } |