From b2449db6f92a89055a256406065c053ea69d58f1 Mon Sep 17 00:00:00 2001 From: Magnus Date: Thu, 1 Dec 2022 08:44:56 +0100 Subject: [PATCH] Update test structure --- platformio.ini | 14 +++++------ src/tests calc.cpp | 33 ++++++++++++++++++++++++++ src/tests templating.cpp | 33 ++++++++++++++++++++++++++ src/tests.cpp | 51 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 123 insertions(+), 8 deletions(-) create mode 100644 src/tests calc.cpp create mode 100644 src/tests templating.cpp diff --git a/platformio.ini b/platformio.ini index 0b28fc5..a446fb3 100644 --- a/platformio.ini +++ b/platformio.ini @@ -103,7 +103,7 @@ lib_deps = board = ${common_env_data.board} build_type = release board_build.filesystem = littlefs -build_src_filter = +<*> - +build_src_filter = +<*> - [env:gravity-unit] upload_speed = ${common_env_data.upload_speed} @@ -156,7 +156,7 @@ board_build.embed_txtfiles = html/about.min.htm html/index.min.htm html/test.min.htm -build_src_filter = +<*> - +build_src_filter = +<*> - [env:gravity32c3-release] framework = ${common_env_data.framework} @@ -190,7 +190,7 @@ board_build.embed_txtfiles = html/about.min.htm html/index.min.htm html/test.min.htm -build_src_filter = +<*> - +build_src_filter = +<*> - [env:gravity32c3v1-release] framework = ${common_env_data.framework} @@ -225,7 +225,7 @@ board_build.embed_txtfiles = html/about.min.htm html/index.min.htm html/test.min.htm -build_src_filter = +<*> - +build_src_filter = +<*> - [env:gravity32s2-release] framework = ${common_env_data.framework} @@ -258,7 +258,7 @@ board_build.embed_txtfiles = html/about.min.htm html/index.min.htm html/test.min.htm -build_src_filter = +<*> - +build_src_filter = +<*> - [env:gravity32c3-debug] framework = ${common_env_data.framework} @@ -307,7 +307,7 @@ board_build.embed_txtfiles = html/about.min.htm html/index.min.htm html/test.min.htm -build_src_filter = +<*> - +build_src_filter = +<*> - # This is a version for the floaty hardware. No DSB18 sensor and no battery measurement. [env:gravity32lite-release] @@ -342,4 +342,4 @@ board_build.embed_txtfiles = html/about.min.htm html/index.min.htm html/test.min.htm -build_src_filter = +<*> - +build_src_filter = +<*> - diff --git a/src/tests calc.cpp b/src/tests calc.cpp new file mode 100644 index 0000000..13e8564 --- /dev/null +++ b/src/tests calc.cpp @@ -0,0 +1,33 @@ +/* +MIT License + +Copyright (c) 2022 Magnus + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + */ +#include +#include +#include + +test(incorrect) { + int x = 1; + assertNotEqual(x, 1); +} + +// EOF \ No newline at end of file diff --git a/src/tests templating.cpp b/src/tests templating.cpp new file mode 100644 index 0000000..a03e49c --- /dev/null +++ b/src/tests templating.cpp @@ -0,0 +1,33 @@ +/* +MIT License + +Copyright (c) 2022 Magnus + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + */ +#include +#include +#include + +test(correct) { + int x = 1; + assertEqual(x, 1); +} + +// EOF \ No newline at end of file diff --git a/src/tests.cpp b/src/tests.cpp index f48b983..a90451b 100644 --- a/src/tests.cpp +++ b/src/tests.cpp @@ -21,12 +21,61 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include #include +#include + +using aunit::TestRunner; +using aunit::Printer; +using aunit::Verbosity; + +/* + // Boolean + assertEqual(a, b) + assertNotEqual(a, b) + assertLess(a, b) + assertMore(a, b) + assertLessOrEqual(a, b) + assertMoreOrEqual(a, b) + + // String + assertStringCaseEqual(a, b) + assertStringCaseNotEqual(a, b) + assertNear(a, b, error) + assertNotNear(a, b, error) + checkTestDone(name) + checkTestNotDone(name) + checkTestPass(name) + checkTestNotPass(name) + checkTestFail(name) + checkTestNotFail(name) + checkTestSkip(name) + checkTestNotSkip(name) + checkTestExpire(name) [*] + checkTestNotExpire(name) [*] + assertTestDone(name) + assertTestNotDone(name) + assertTestPass(name) + assertTestNotPass(name) + assertTestFail(name) + assertTestNotFail(name) + assertTestSkip(name) + assertTestNotSkip(name) + assertTestExpire(name) [*] + assertTestNotExpire(name) [*] +*/ void setup() { + Serial.begin(115200); + Serial.println("Gravitymon - Unit Test Build"); + delay(2000); + Printer::setPrinter(&Serial); + TestRunner::setVerbosity(Verbosity::kAll); } void loop() { + TestRunner::run(); + delay(10); } -// EOF +// EOF \ No newline at end of file