#61: refactor tests for latest Boost (1.84) support

vpiotr · vpiotr · commit 1884faab9f40 · 2024-02-24T15:43:28.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,23 @@ if(BUILD_TESTING)
 
     if(Boost_FOUND)
         include_directories(${Boost_INCLUDE_DIRS} include)
-        add_executable(test_runner include/decimal.h tests/runner.cpp)
+        add_executable(test_runner include/decimal.h
+                tests/runner.cpp
+                tests/decimalTest.cpp
+                tests/decimalTestAbout.cpp
+                tests/decimalTestArithmetic.cpp
+                tests/decimalTestDiv.cpp
+                tests/decimalTestEdgeCases.cpp
+                tests/decimalTestModulo.cpp
+                tests/decimalTestMult.cpp
+                tests/decimalTestMultDiv.cpp
+                tests/decimalTestRounding.cpp
+                tests/decimalTestRoundOth.cpp
+                tests/decimalTestString.cpp
+                tests/decimalTestTypeLevel.cpp
+                tests/decimalTestUtils.cpp
+                tests/decimalTestWithExponent.cpp
+                tests/decimalTestUtils.h)
         target_include_directories(test_runner PRIVATE ${BOOST_INCLUDE_DIRS})
     endif()
 
diff --git a/README.md b/README.md
@@ -7,11 +7,11 @@ Author: Piotr Likus
 
 Created: 03/01/2011
 
-Modified: 19/07/2021
+Modified: 24/02/2024
 
 Licence: BSD
 
-Version: 1.19
+Version: 1.20
 
 
 This data type is designed to perform calculation with on-fly  roundings
@@ -164,6 +164,11 @@ In order to test the library:
     # to execute specific runner
     ./test_runner
 
+    # to list all test cases during runner execution
+    ./test_runner --log_level=test_suite
+
+    # to execute tests via ctest
+    ctest -v
 
 # Other information
 For more examples please see \test directory.
@@ -181,7 +186,7 @@ http://www.doxygen.org/
 Tested compilers:
 
 - VS2019 Community (MSVC++ 14.2)
-- gcc 9.3.0
+- gcc 11.4.0
 
 Uses C++11 by default, define DEC_NO_CPP11 symbol if your compiler does not support this standard.
 To use custom namespace, define DEC_NAMESPACE symbol which should contain your target namespace for decimal type.
diff --git a/include/decimal.h b/include/decimal.h
@@ -44,6 +44,7 @@
 #include <iomanip>
 #include <sstream>
 #include <locale>
+#include <cmath>
 
 #ifndef DEC_TYPE_LEVEL
 #define DEC_TYPE_LEVEL 2
diff --git a/tests/decimalTest.cpp b/tests/decimalTest.cpp
@@ -8,6 +8,9 @@
 /////////////////////////////////////////////////////////////////////////////
 
 #include "decimal.h"
+
+
+#include <boost/test/unit_test.hpp>
 #include <boost/integer_traits.hpp>
 
 #ifndef DEC_NO_CPP11
diff --git a/tests/decimalTestAbout.cpp b/tests/decimalTestAbout.cpp
@@ -1,9 +1,10 @@
 //
-// Test features mentioned in project README
+// Demo of features mentioned in project README
 // Created by piotr on 7/19/21.
 //
 
 #include "decimal.h"
+#include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_CASE(decimalAbout) {
     using namespace dec;
diff --git a/tests/decimalTestArithmetic.cpp b/tests/decimalTestArithmetic.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "decimal.h"
+#include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_CASE(decimalArithmetic)
 {
diff --git a/tests/decimalTestDiv.cpp b/tests/decimalTestDiv.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "decimal.h"
+#include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_CASE(decimalDivInt)
 {
diff --git a/tests/decimalTestEdgeCases.cpp b/tests/decimalTestEdgeCases.cpp
@@ -3,7 +3,15 @@
 //
 
 #include "decimal.h"
-#include "decimalTestUtils.cpp"
+#include "decimalTestUtils.h"
+#include <boost/test/unit_test.hpp>
+
+#include <boost/integer_traits.hpp>
+
+#ifndef DEC_NO_CPP11
+#include <type_traits>
+#endif
+
 
 BOOST_AUTO_TEST_CASE(decimalHighEndVals)
         {
diff --git a/tests/decimalTestModulo.cpp b/tests/decimalTestModulo.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "decimal.h"
+#include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_CASE(testModOperInt) {
         BOOST_CHECK_EQUAL(dec::decimal_cast<2>(15) % 4, 3);
diff --git a/tests/decimalTestMult.cpp b/tests/decimalTestMult.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "decimal.h"
+#include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_CASE(decimalMultiplyPrec)
 {
diff --git a/tests/decimalTestMultDiv.cpp b/tests/decimalTestMultDiv.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "decimal.h"
+#include <boost/test/unit_test.hpp>
 
 class mult_div_tester {
 public:
diff --git a/tests/decimalTestRoundOth.cpp b/tests/decimalTestRoundOth.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "decimal.h"
+#include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_CASE(testFloor) {
     BOOST_CHECK_EQUAL(dec::decimal_cast<2>(2).floor(), 2);
diff --git a/tests/decimalTestRounding.cpp b/tests/decimalTestRounding.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "decimal.h"
+#include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_CASE(decimalRounding)
 {
diff --git a/tests/decimalTestString.cpp b/tests/decimalTestString.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "decimal.h"
+#include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_CASE(decimalString)
 {
diff --git a/tests/decimalTestTypeLevel.cpp b/tests/decimalTestTypeLevel.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "decimal.h"
+#include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_CASE(decimalTypeLevel)
 {
diff --git a/tests/decimalTestUtils.h b/tests/decimalTestUtils.h
@@ -0,0 +1,10 @@
+//
+// Created by piotr on 2/24/24.
+//
+
+#ifndef DECIMAL_FOR_CPP_DECIMALTESTUTILS_H
+#define DECIMAL_FOR_CPP_DECIMALTESTUTILS_H
+
+std::string uint_to_string(unsigned int arg);
+
+#endif //DECIMAL_FOR_CPP_DECIMALTESTUTILS_H
diff --git a/tests/decimalTestWithExponent.cpp b/tests/decimalTestWithExponent.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "decimal.h"
+#include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_CASE(decimalWithExponent)
 {
diff --git a/tests/runner.cpp b/tests/runner.cpp
@@ -19,18 +19,32 @@ extern int putenv(char*);
 #include <boost/test/included/unit_test.hpp>
 using namespace boost::unit_test;
 
-BOOST_AUTO_TEST_SUITE ( test )
-#include "decimalTest.cpp"
-#include "decimalTestAbout.cpp"
-#include "decimalTestArithmetic.cpp"
-#include "decimalTestDiv.cpp"
-#include "decimalTestEdgeCases.cpp"
-#include "decimalTestModulo.cpp"
-#include "decimalTestMult.cpp"
-#include "decimalTestMultDiv.cpp"
-#include "decimalTestRounding.cpp"
-#include "decimalTestRoundOth.cpp"
-#include "decimalTestString.cpp"
-#include "decimalTestTypeLevel.cpp"
-#include "decimalTestWithExponent.cpp"
-BOOST_AUTO_TEST_SUITE_END( )
+#include "decimal.h"
+
+BOOST_AUTO_TEST_CASE(decimalBasicTest) {
+    using namespace dec;
+    using namespace std;
+
+    // the following declares currency variable with 2 decimal points
+    // initialized with integer value (can be also floating-point)
+    decimal<2> value(143125);
+
+    // displays: Value #1 is: 143125.00
+    cout << "Value #1 is: " << value << endl;
+}
+
+//BOOST_AUTO_TEST_SUITE ( test )
+//#include "decimalTest.cpp"
+//#include "decimalTestAbout.cpp"
+//#include "decimalTestArithmetic.cpp"
+//#include "decimalTestDiv.cpp"
+//#include "decimalTestEdgeCases.cpp"
+//#include "decimalTestModulo.cpp"
+//#include "decimalTestMult.cpp"
+//#include "decimalTestMultDiv.cpp"
+//#include "decimalTestRounding.cpp"
+//#include "decimalTestRoundOth.cpp"
+//#include "decimalTestString.cpp"
+//#include "decimalTestTypeLevel.cpp"
+//#include "decimalTestWithExponent.cpp"
+//BOOST_AUTO_TEST_SUITE_END( )

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`//`
`4`	`4`
`5`	`5`	`#include "decimal.h"`
	`6`	`+#include <boost/test/unit_test.hpp>`
`6`	`7`
`7`	`8`	`BOOST_AUTO_TEST_CASE(decimalArithmetic)`
`8`	`9`	`{`