@micro-os-plus/micro-test-plus 3.1.1 → 3.1.2

package/include/micro-os-plus/test-reporter.h

@@ -23,7 +23,7 @@
 
 // ----------------------------------------------------------------------------
 
-//#include <functional>
+// #include <functional>
 #include <string_view>
 #include <string>
 
@@ -47,6 +47,9 @@ namespace micro_os_plus::micro_test_plus
 {
   // --------------------------------------------------------------------------
 
+  /**
+   * @brief Colours used to highlight pass vs. fail.
+   */
   struct colors
   {
     const char* none = "\033[0m";
@@ -54,6 +57,9 @@ namespace micro_os_plus::micro_test_plus
     const char* fail = "\033[31m";
   };
 
+  /**
+   * @brief The verbosity levels.
+   */
   enum class verbosity
   {
     silent = 0, // Nothing, only return the exit code
@@ -176,9 +182,10 @@ namespace micro_os_plus::micro_test_plus
     /**
      * @brief Output operator to display containers. Iterate all members.
      */
-    template <class T, type_traits::requires_t<
-                           type_traits::is_container_v<
-                               T> and not type_traits::has_npos_v<T>> = 0>
+    template <class T,
+              type_traits::requires_t<type_traits::is_container_v<T>
+                                      and not type_traits::has_npos_v<T>>
+              = 0>
     test_reporter&
     operator<< (T&& t);
 

package/include/micro-os-plus/test-runner.h

@@ -44,7 +44,7 @@ namespace micro_os_plus::micro_test_plus
   // --------------------------------------------------------------------------
 
   /**
-   * @brief The test runner. It maintaines a list of test suites which
+   * @brief The test runner. It maintains a list of test suites which
    * automatically register themselves in their constructors.
    */
   class test_runner
@@ -66,7 +66,7 @@ namespace micro_os_plus::micro_test_plus
 
     /**
      * @brief Pass the main arguments explicitly, if the default
-     * contructor was used.
+     * constructor was used.
      */
     void
     initialize (int argc, char* argv[], const char* name);

package/include/micro-os-plus/test-suite.h

@@ -44,14 +44,14 @@ namespace micro_os_plus::micro_test_plus
   // --------------------------------------------------------------------------
 
   /**
-   * @brief Test suites are classes that represent a named group of
-   * test cases which self registers to the runner.
+   * @brief Base class for all test suites.
    */
   class test_suite_base
   {
   public:
     /**
-     * @brief Construct the default suite used in main().
+     * @brief Construct a test suite.
+     * @param [in] name The test suite name.
      */
     test_suite_base (const char* name);
 
@@ -69,24 +69,38 @@ namespace micro_os_plus::micro_test_plus
 
     /**
      * @brief Run the sequence of test cases in the suite.
+     * @par Parameters
+     *	None.
+     * @par Returns
+     *  Nothing.
      */
     virtual void
     run (void);
 
     /**
-     * @brief Mark the begining of a named test case.
+     * @brief Mark the beginning of a named test case.
+     * @param [in] name The test case name.
+     * @par Returns
+     *  Nothing.
      */
     void
     begin_test_case (const char* name);
 
     /**
      * @brief Mark the end of a test case.
+     * @par Parameters
+     *	None.
+     * @par Returns
+     *  Nothing.
      */
     void
     end_test_case (void);
 
     /**
      * @brief Get the suite name.
+     * @par Parameters
+     *	None.
+     * @return A pointer to the null terminated test suite name.
      */
     [[nodiscard]] constexpr const char*
     name ()
@@ -95,19 +109,30 @@ namespace micro_os_plus::micro_test_plus
     }
 
     /**
-     * @brief Count one more passed test condition.
+     * @brief Count one more passed test conditions.
+     * @par Parameters
+     *	None.
+     * @par Returns
+     *  Nothing.
      */
     void
     increment_successful (void);
 
     /**
-     * @brief Count one more failed test condition.
+     * @brief Count one more failed test conditions.
+     * @par Parameters
+     *	None.
+     * @par Returns
+     *  Nothing.
      */
     void
     increment_failed (void);
 
     /**
      * @brief Get the number of conditions that passed.
+     * @par Parameters
+     *	None.
+     * @return An integer with the number checks that passed.
      */
     [[nodiscard]] constexpr int
     successful_checks (void)
@@ -117,6 +142,9 @@ namespace micro_os_plus::micro_test_plus
 
     /**
      * @brief Get the number of conditions that failed.
+     * @par Parameters
+     *	None.
+     * @return An integer with the number checks that failed.
      */
     [[nodiscard]] constexpr int
     failed_checks (void)
@@ -126,6 +154,9 @@ namespace micro_os_plus::micro_test_plus
 
     /**
      * @brief Get the number of test cases.
+     * @par Parameters
+     *	None.
+     * @return An integer with the number of test cases.
      */
     [[nodiscard]] constexpr int
     test_cases (void)
@@ -135,18 +166,29 @@ namespace micro_os_plus::micro_test_plus
 
     /**
      * @brief Begin the execution of the test suite.
+     * @par Parameters
+     *	None.
+     * @par Returns
+     *  Nothing.
      */
     void
     begin_test_suite (void);
 
     /**
      * @brief Mark the end of the test suite.
+     * @par Parameters
+     *	None.
+     * @par Returns
+     *  Nothing.
      */
     void
     end_test_suite (void);
 
     /**
      * @brief Get the test suite result.
+     * @par Parameters
+     *	None.
+     * @return True if the test suite was successful.
      */
     [[nodiscard]] constexpr bool
     was_successful (void)
@@ -155,6 +197,12 @@ namespace micro_os_plus::micro_test_plus
       return (failed_checks_ == 0 && successful_checks_ != 0);
     }
 
+    /**
+     * @brief If all counter are null, it is unused.
+     * @par Parameters
+     *	None.
+     * @return True if the test suite is not used.
+     */
     [[nodiscard]] constexpr bool
     unused (void)
     {
@@ -197,9 +245,25 @@ namespace micro_os_plus::micro_test_plus
     } current_test_case{};
   };
 
+  /**
+   * @ingroup micro-test-plus-test-suites
+   * @brief Test suites are classes that represent a named group of
+   * test cases which self register to the runner.
+   */
   class test_suite : public test_suite_base
   {
   public:
+    /**
+     * @brief Construct a test suite.
+     * @tparam Callable_T The type of an object that can be called.
+     * @tparam Args_T The type of the callable arguments.
+     * @param [in] name The test case name or description.
+     * A short string used in the report.
+     * @param [in] callable A generic callable object,
+     * invoked to perform the test. Usually a lambda.
+     * @param [in] arguments A possibly empty list of arguments to be
+     * passed to the callable.
+     */
     template <typename Callable_T, typename... Args_T>
     test_suite (const char* name, Callable_T&& callable,
                 Args_T&&... arguments);

package/include/micro-os-plus/type-traits.h

@@ -56,10 +56,18 @@ namespace micro_os_plus::micro_test_plus
       using type = T;
     };
 
+#if defined(__DOXYGEN__)
+    // error: Detected potential recursive class relation between class
+    // micro_os_plus::micro_test_plus::type_traits::function_traits and base
+    // class micro_os_plus::micro_test_plus::type_traits::function_traits<
+    // decltype(&T::operator())>!
+    // https://github.com/doxygen/doxygen/issues/9915
+#else
     template <class T>
     struct function_traits : function_traits<decltype (&T::operator())>
     {
     };
+#endif
 
     template <class R, class... Args_T>
     struct function_traits<R (*) (Args_T...)>
@@ -107,9 +115,8 @@ namespace micro_os_plus::micro_test_plus
     }
 
     template <class T>
-    static constexpr auto is_container_v
-        = is_valid<T> ([] (auto t) -> decltype (t.begin (), t.end (),
-                                                void ()) {});
+    static constexpr auto is_container_v = is_valid<T> (
+        [] (auto t) -> decltype (t.begin (), t.end (), void ()) {});
 
     template <class T>
     static constexpr auto has_npos_v
@@ -134,7 +141,7 @@ namespace micro_os_plus::micro_test_plus
 
 #if defined(__clang__) or defined(_MSC_VER)
     template <class From, class To>
-    static constexpr auto is_convertible_v = __is_convertible_to(From, To);
+    static constexpr auto is_convertible_v = __is_convertible_to (From, To);
 #else
     template <class From, class To>
     constexpr auto
@@ -189,7 +196,8 @@ namespace micro_os_plus::micro_test_plus
         return integral_constant<-N>{};
       }
 
-      [[nodiscard]] constexpr explicit operator value_type () const
+      [[nodiscard]] constexpr explicit
+      operator value_type () const
       {
         return N;
       }
@@ -221,7 +229,8 @@ namespace micro_os_plus::micro_test_plus
         return floating_point_constant<T, N, D, Size, -1>{};
       }
 
-      [[nodiscard]] constexpr explicit operator value_type () const
+      [[nodiscard]] constexpr explicit
+      operator value_type () const
       {
         return value;
       }
@@ -242,7 +251,8 @@ namespace micro_os_plus::micro_test_plus
       {
       }
 
-      [[nodiscard]] constexpr explicit operator T () const
+      [[nodiscard]] constexpr explicit
+      operator T () const
       {
         return value_;
       }
@@ -257,7 +267,7 @@ namespace micro_os_plus::micro_test_plus
     };
 
     template <class T>
-    inline constexpr auto is_op_v = __is_base_of(type_traits::op, T);
+    inline constexpr auto is_op_v = __is_base_of (type_traits::op, T);
 
     /**
      * @brief Class defining a generic value, accessible via a getter.
@@ -271,7 +281,8 @@ namespace micro_os_plus::micro_test_plus
       {
       }
 
-      [[nodiscard]] constexpr explicit operator T () const
+      [[nodiscard]] constexpr explicit
+      operator T () const
       {
         return value_;
       }
@@ -312,7 +323,8 @@ namespace micro_os_plus::micro_test_plus
       {
       }
 
-      [[nodiscard]] constexpr explicit operator T () const
+      [[nodiscard]] constexpr explicit
+      operator T () const
       {
         return value_;
       }

package/meson.build

@@ -14,7 +14,7 @@
 
 # This file is intended to be consumed by applications with:
 #
-# `subdir('xpacks/micro-os-plus-micro-test-plus')`
+# `subdir('xpacks/@micro-os-plus/micro-test-plus')`
 #
 # The result is a library and a dependency that can be referred as:
 #
@@ -29,18 +29,21 @@ message('Processing xPack @micro-os-plus/micro-test-plus...')
 
 # -----------------------------------------------------------------------------
 
-xpack_common_args = []
-xpack_c_args = []
-xpack_cpp_args = []
-xpack_include_directories = []
-xpack_sources = []
-xpack_compile_definitions = []
+_local_compile_args = [] # Common C/C++ args.
+_local_compile_c_args = []
+_local_compile_cpp_args = []
+_local_include_directories = []
+_local_sources = []
+_local_compile_definitions = []
+_local_dependencies = []
+_local_link_args = []
+_local_link_with = []
 
-xpack_include_directories += [
+_local_include_directories += [
   'include',
 ]
 
-xpack_sources += [
+_local_sources += [
   'src/micro-test-plus.cpp',
   'src/test-runner.cpp',
   'src/test-reporter.cpp',
@@ -49,18 +52,21 @@ xpack_sources += [
 
 # https://mesonbuild.com/Reference-manual_functions.html#declare_dependency
 micro_os_plus_micro_test_plus_dependency = declare_dependency(
-  include_directories: include_directories(xpack_include_directories),
-  compile_args: xpack_common_args,
-  sources: files(xpack_sources),
+  include_directories: include_directories(_local_include_directories),
+  compile_args: _local_compile_args,
+  sources: files(_local_sources),
+  dependencies: _local_dependencies,
+  link_args: _local_link_args,
+  link_with: _local_link_with,
 )
+# meson dependencies cannot differentiate c/cpp args; pass them separately.
+micro_os_plus_micro_test_plus_dependency_compile_c_args = _local_compile_c_args
+micro_os_plus_micro_test_plus_dependency_compile_cpp_args = _local_compile_cpp_args
 
-# micro_os_plus_micro_test_plus_dependency_c_args = xpack_c_args
-# micro_os_plus_micro_test_plus_dependency_cpp_args = xpack_cpp_args
-
-foreach name : xpack_include_directories
+foreach name : _local_include_directories
   message('+ -I ' + name)
 endforeach
-foreach name : xpack_sources + xpack_common_args
+foreach name : _local_sources + _local_compile_definitions + _local_compile_args + _local_compile_c_args + _local_compile_cpp_args
   message('+ ' + name)
 endforeach
 message('> micro_os_plus_micro_test_plus_dependency')