start converting testbench to Catch unit tests

src/CMakeLists.txt

@@ -3,7 +3,7 @@ include_directories(${Qt5Widgets_INCLUDE_DIRS} ${QtQml_INCLUDE_DIRS})
 add_definitions(${Qt5Widgets_DEFINITIONS} ${QtQml_DEFINITIONS} ${${Qt5Quick_DEFINITIONS}})
 
 # decn library
-add_library(decn decn/decn.c)
+add_subdirectory(decn)
 
 # calculator
 add_library(calc qt_main.cpp calc.c utils.c lcd_emulator.c key.c)
@@ -13,9 +13,3 @@ target_link_libraries(calc Qt5::Widgets)
 # tests
 add_executable(keytest key.c)
 target_compile_definitions(keytest PRIVATE KEY_TEST_APP=1)
-
-add_executable(decn_test decn/decn_test.c utils.c)
-target_link_libraries(decn_test decn)
-
-# decn prototyping
-add_subdirectory(decn/proto)

src/decn/CMakeLists.txt

@@ -0,0 +1,12 @@
+
+# decn library
+add_library(decn decn.c)
+
+add_executable(decn_test decn_test.c ../utils.c)
+target_link_libraries(decn_test decn)
+
+add_executable(decn_tests catch_main.cpp decn_tests.cpp ../utils.c)
+target_link_libraries(decn_tests decn mpfr)
+
+# decn prototyping
+add_subdirectory(proto)

src/decn/catch_main.cpp

@@ -0,0 +1,24 @@
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+/*
+ * catch_main.cpp
+ *
+ * Unit tests using https://github.com/catchorg/Catch2
+ *
+ *  Created on: Nov 14, 2019
+ */
+
+
+#define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do this in one cpp file
+#include "catch.hpp"

src/decn/decn_tests.cpp

@@ -0,0 +1,180 @@
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+/*
+ * decn_tests.cpp
+ *
+ * Unit tests using https://github.com/catchorg/Catch2
+ *
+ *  Created on: Nov 14, 2019
+ */
+
+
+#include <string.h>
+#include <boost/multiprecision/mpfr.hpp>
+#include <catch.hpp>
+#include "decn.h"
+
+
+namespace bmp = boost::multiprecision;
+using Catch::Matchers::Equals;
+
+
+
+char Buf[DECN_BUF_SIZE];
+
+
+TEST_CASE("build decn"){
+	build_dec80("0.0009234567890123456", 7);
+	decn_to_str_complete(&AccDecn);
+	CHECK_THAT(Buf, Equals("9234.567890123456"));
+
+	build_dec80("9.234567890123456", 3);
+	decn_to_str_complete(&AccDecn);
+	CHECK_THAT(Buf, Equals("9234.567890123456"));
+
+	negate_decn(&AccDecn);
+	decn_to_str_complete(&AccDecn);
+	CHECK_THAT(Buf, Equals("-9234.567890123456"));
+}
+
+TEST_CASE("small fractions >= 1/10"){
+	build_dec80("0.333", 0);
+	build_decn_at(&BDecn,   "3.33", -1);
+	decn_to_str_complete(&AccDecn);
+	CHECK_THAT(Buf, Equals("0.333"));
+	decn_to_str_complete(&BDecn);
+	CHECK_THAT(Buf, Equals("0.333"));
+	negate_decn(&BDecn);
+	add_decn();
+	decn_to_str_complete(&AccDecn);
+	CHECK_THAT(Buf, Equals("0"));
+}
+
+TEST_CASE("add"){
+	dec80 tmp_copy;
+	build_dec80("-9.234567890123456", 3);
+	copy_decn(&tmp_copy, &AccDecn); //save
+	build_dec80("-92.3456789012345678", 1);
+	copy_decn(&BDecn, &AccDecn);
+	copy_decn(&AccDecn, &tmp_copy); //restore
+	copy_decn(&tmp_copy, &BDecn); //save
+	decn_to_str_complete(&BDecn);
+	CHECK_THAT(Buf, Equals("-923.456789012345678")); //b
+
+	decn_to_str_complete(&AccDecn);
+	CHECK_THAT(Buf, Equals("-9234.567890123456")); //-acc
+
+	//compare result of b - acc
+	add_decn();
+	decn_to_str_complete(&AccDecn);
+	CHECK_THAT(Buf, Equals("-10158.0246791358016")); //b-acc
+
+	//new acc for acc - b test
+	decn_to_str_complete(&AccDecn);
+	copy_decn(&BDecn, &tmp_copy); //restore
+	negate_decn(&BDecn);
+	decn_to_str_complete(&BDecn);
+	CHECK_THAT(Buf, Equals("923.456789012345678")); //-b
+
+	add_decn();
+	decn_to_str_complete(&AccDecn);
+	//compare result of new acc - b
+	CHECK_THAT(Buf, Equals("-9234.567890123456")); //acc-b
+}
+
+TEST_CASE("multiply"){
+	build_dec80("92.34567890123456", 2);
+	build_decn_at(&BDecn,   "-92.3456789012345678", 1);
+	decn_to_str_complete(&AccDecn);
+	CHECK_THAT(Buf, Equals("9234.567890123456")); //acc
+	decn_to_str_complete(&BDecn);
+	CHECK_THAT(Buf, Equals("-923.456789012345678")); //b
+	mult_decn();
+	decn_to_str_complete(&AccDecn);
+	CHECK_THAT(Buf, Equals("-8527724.41172991849")); //acc*b
+}
+
+
+static void div_test(
+	//input
+	const char* a_str, int a_exp,
+	const char* b_str, int b_exp
+)
+{
+	CAPTURE(a_str); CAPTURE(a_exp);
+	CAPTURE(b_str); CAPTURE(b_exp);
+	//do division
+	build_dec80(a_str, a_exp);
+	build_decn_at(&BDecn,   b_str, b_exp);
+// 	decn_to_str_complete(&AccDecn);
+// 	printf(" acc: %s\n", Buf);
+// 	decn_to_str_complete(&BDecn);
+// 	printf("   b: %s\n", Buf);
+	div_decn();
+	decn_to_str_complete(&AccDecn);
+	CAPTURE(Buf);  // acc / b
+
+	//calculate actual result
+	bmp::mpfr_float::default_precision(50);
+	bmp::mpfr_float calculated(Buf);
+	std::string a_full_str(a_str);
+	a_full_str += "e" + std::to_string(a_exp);
+	std::string b_full_str(b_str);
+	b_full_str += "e" + std::to_string(b_exp);;
+// 	CAPTURE(a_full_str);
+// 	CAPTURE(b_full_str);
+	bmp::mpfr_float a_actual(a_full_str);
+	bmp::mpfr_float b_actual(b_full_str);
+	a_actual /= b_actual;
+	bmp::mpfr_float rel_diff = abs((a_actual - calculated) / a_actual);
+	CHECK(rel_diff < 1e-17);
+}
+
+TEST_CASE("division"){
+	div_test(
+		"3.14", 60,
+		"-1.5", -2
+	);
+
+	div_test(
+		"4", 0,
+		"4", 0
+	);
+
+	div_test(
+		"1", 0,
+		"3", 0
+	);
+
+	div_test(
+		"500", 0,
+		"99", 0
+	);
+
+	div_test(
+		"500", 0,
+		"2", 0
+	);
+
+	div_test(
+		"3", 0,
+		"25", -15
+	);
+
+	div_test(
+		"0.02", 0,
+		"0.03", 0
+	);
+
+}