Substantial refactoring and minor feature enhancements

README.md

@@ -295,11 +295,13 @@ int factorial(int v)
 
     switch (v)
     {
-        case 0:
-        case 1:
-            return 1;
-        default:
-            return v * factorial(v - 1);
+      case 0:
+      case 1:
+
+          return 1;
+      default:
+
+          return v * factorial(v - 1);
     }
 }
 

examples/c/example.c.factorial/example.c.factorial.c

@@ -5,7 +5,7 @@
  *          test case(s).
  *
  * Created: 7th December 2023
- * Updated: 13th October 2024
+ * Updated: 4th December 2024
  *
  * ////////////////////////////////////////////////////////////////////// */
 
@@ -32,13 +32,13 @@ int factorial(int v)
 
     switch (v)
     {
-        case 0:
-        case 1:
+    case 0:
+    case 1:
 
-            return 1;
-        default:
+        return 1;
+    default:
 
-            return v * factorial(v - 1);
+        return v * factorial(v - 1);
     }
 }
 

include/xtests/terse-api.h

@@ -5,7 +5,7 @@
  *          the assertion macros (and other simplifications).
  *
  * Created: 20th November 2024
- * Updated: 21st November 2024
+ * Updated: 1st December 2024
  *
  * Home:    https://github.com/synesissoftware/xTests/
  *
@@ -50,9 +50,9 @@
 
 #ifndef XTESTS_DOCUMENTATION_SKIP_SECTION
 # define XTESTS_VER_XTESTS_H_XTESTS_TERSE_MAJOR     1
-# define XTESTS_VER_XTESTS_H_XTESTS_TERSE_MINOR     0
+# define XTESTS_VER_XTESTS_H_XTESTS_TERSE_MINOR     1
 # define XTESTS_VER_XTESTS_H_XTESTS_TERSE_REVISION  1
-# define XTESTS_VER_XTESTS_H_XTESTS_TERSE_EDIT      2
+# define XTESTS_VER_XTESTS_H_XTESTS_TERSE_EDIT      3
 #endif /* !XTESTS_DOCUMENTATION_SKIP_SECTION */
 
 
@@ -144,54 +144,82 @@
 
 #ifdef XTESTS_TEST_BOOLEAN_EQUAL
 # define TEST_BOOLEAN_EQUAL                                 XTESTS_TEST_BOOLEAN_EQUAL
+# define TEST_BOOLEAN_EQ                                    XTESTS_TEST_BOOLEAN_EQUAL
 #endif /* XTESTS_TEST_BOOLEAN_EQUAL */
 #ifdef XTESTS_TEST_BOOLEAN_FALSE
 # define TEST_BOOLEAN_FALSE                                 XTESTS_TEST_BOOLEAN_FALSE
 #endif /* XTESTS_TEST_BOOLEAN_FALSE */
 #ifdef XTESTS_TEST_BOOLEAN_NOT_EQUAL
 # define TEST_BOOLEAN_NOT_EQUAL                             XTESTS_TEST_BOOLEAN_NOT_EQUAL
+# define TEST_BOOLEAN_NE                                    XTESTS_TEST_BOOLEAN_NOT_EQUAL
 #endif /* XTESTS_TEST_BOOLEAN_NOT_EQUAL */
 #ifdef XTESTS_TEST_BOOLEAN_TRUE
 # define TEST_BOOLEAN_TRUE                                  XTESTS_TEST_BOOLEAN_TRUE
 #endif /* XTESTS_TEST_BOOLEAN_TRUE */
 #ifdef XTESTS_TEST_CHARACTER_EQUAL
 # define TEST_CHARACTER_EQUAL                               XTESTS_TEST_CHARACTER_EQUAL
+# define TEST_CHAR_EQ                                       XTESTS_TEST_CHARACTER_EQUAL
 #endif /* XTESTS_TEST_CHARACTER_EQUAL */
 #ifdef XTESTS_TEST_CHARACTER_EQUAL_EXACT
 # define TEST_CHARACTER_EQUAL_EXACT                         XTESTS_TEST_CHARACTER_EQUAL_EXACT
 #endif /* XTESTS_TEST_CHARACTER_EQUAL_EXACT */
 #ifdef XTESTS_TEST_CHARACTER_GREATER
 # define TEST_CHARACTER_GREATER                             XTESTS_TEST_CHARACTER_GREATER
+# define TEST_CHAR_GT                                       XTESTS_TEST_CHARACTER_GREATER
 #endif /* XTESTS_TEST_CHARACTER_GREATER */
 #ifdef XTESTS_TEST_CHARACTER_GREATER_OR_EQUAL
 # define TEST_CHARACTER_GREATER_OR_EQUAL                    XTESTS_TEST_CHARACTER_GREATER_OR_EQUAL
+# define TEST_CHAR_GE                                       XTESTS_TEST_CHARACTER_GREATER_OR_EQUAL
 #endif /* XTESTS_TEST_CHARACTER_GREATER_OR_EQUAL */
 #ifdef XTESTS_TEST_CHARACTER_LESS
 # define TEST_CHARACTER_LESS                                XTESTS_TEST_CHARACTER_LESS
+# define TEST_CHAR_LT                                       XTESTS_TEST_CHARACTER_LESS
 #endif /* XTESTS_TEST_CHARACTER_LESS */
 #ifdef XTESTS_TEST_CHARACTER_LESS_OR_EQUAL
 # define TEST_CHARACTER_LESS_OR_EQUAL                       XTESTS_TEST_CHARACTER_LESS_OR_EQUAL
+# define TEST_CHAR_LE                                       XTESTS_TEST_CHARACTER_LESS_OR_EQUAL
 #endif /* XTESTS_TEST_CHARACTER_LESS_OR_EQUAL */
 #ifdef XTESTS_TEST_CHARACTER_NOT_EQUAL
 # define TEST_CHARACTER_NOT_EQUAL                           XTESTS_TEST_CHARACTER_NOT_EQUAL
+# define TEST_CHAR_NE                                       XTESTS_TEST_CHARACTER_NOT_EQUAL
 #endif /* XTESTS_TEST_CHARACTER_NOT_EQUAL */
 #ifdef XTESTS_TEST_ENUM_EQUAL
 # define TEST_ENUM_EQUAL                                    XTESTS_TEST_ENUM_EQUAL
+# define TEST_ENUM_EQ                                       XTESTS_TEST_ENUM_EQUAL
 #endif /* XTESTS_TEST_ENUM_EQUAL */
 #ifdef XTESTS_TEST_ENUM_NOT_EQUAL
 # define TEST_ENUM_NOT_EQUAL                                XTESTS_TEST_ENUM_NOT_EQUAL
+# define TEST_ENUM_NE                                       XTESTS_TEST_ENUM_NOT_EQUAL
 #endif /* XTESTS_TEST_ENUM_NOT_EQUAL */
 #ifdef XTESTS_TEST_FLOATINGPOINT_EQUAL
 # define TEST_FLOATINGPOINT_EQUAL                           XTESTS_TEST_FLOATINGPOINT_EQUAL
+# define TEST_FP_EQ                                         XTESTS_TEST_FLOATINGPOINT_EQUAL
 #endif /* XTESTS_TEST_FLOATINGPOINT_EQUAL */
 #ifdef XTESTS_TEST_FLOATINGPOINT_EQUAL_APPROX
 # define TEST_FLOATINGPOINT_EQUAL_APPROX                    XTESTS_TEST_FLOATINGPOINT_EQUAL_APPROX
 #endif /* XTESTS_TEST_FLOATINGPOINT_EQUAL_APPROX */
 #ifdef XTESTS_TEST_FLOATINGPOINT_EQUAL_EXACT
 # define TEST_FLOATINGPOINT_EQUAL_EXACT                     XTESTS_TEST_FLOATINGPOINT_EQUAL_EXACT
 #endif /* XTESTS_TEST_FLOATINGPOINT_EQUAL_EXACT */
+#ifdef XTESTS_TEST_FLOATINGPOINT_GREATER
+# define TEST_FLOATINGPOINT_GREATER                         XTESTS_TEST_FLOATINGPOINT_GREATER
+# define TEST_FP_GT                                         XTESTS_TEST_FLOATINGPOINT_GREATER
+#endif /* XTESTS_TEST_FLOATINGPOINT_GREATER */
+#ifdef XTESTS_TEST_FLOATINGPOINT_GREATER_OR_EQUAL
+# define TEST_FLOATINGPOINT_GREATER_OR_EQUAL                XTESTS_TEST_FLOATINGPOINT_GREATER_OR_EQUAL
+# define TEST_FP_GE                                         XTESTS_TEST_FLOATINGPOINT_GREATER_OR_EQUAL
+#endif /* XTESTS_TEST_FLOATINGPOINT_GREATER */
+#ifdef XTESTS_TEST_FLOATINGPOINT_LESS
+# define TEST_FLOATINGPOINT_LESS                            XTESTS_TEST_FLOATINGPOINT_LESS
+# define TEST_FP_LT                                         XTESTS_TEST_FLOATINGPOINT_LESS
+#endif /* XTESTS_TEST_FLOATINGPOINT_LESS */
+#ifdef XTESTS_TEST_FLOATINGPOINT_LESS_OR_EQUAL
+# define TEST_FLOATINGPOINT_LESS_OR_EQUAL                   XTESTS_TEST_FLOATINGPOINT_LESS_OR_EQUAL
+# define TEST_FP_LE                                         XTESTS_TEST_FLOATINGPOINT_LESS_OR_EQUAL
+#endif /* XTESTS_TEST_FLOATINGPOINT_GREATER */
 #ifdef XTESTS_TEST_FLOATINGPOINT_NOT_EQUAL
 # define TEST_FLOATINGPOINT_NOT_EQUAL                       XTESTS_TEST_FLOATINGPOINT_NOT_EQUAL
+# define TEST_FP_NE                                         XTESTS_TEST_FLOATINGPOINT_NOT_EQUAL
 #endif /* XTESTS_TEST_FLOATINGPOINT_NOT_EQUAL */
 #ifdef XTESTS_TEST_FLOATINGPOINT_NOT_EQUAL_APPROX
 # define TEST_FLOATINGPOINT_NOT_EQUAL_APPROX                XTESTS_TEST_FLOATINGPOINT_NOT_EQUAL_APPROX
@@ -201,12 +229,15 @@
 #endif /* XTESTS_TEST_FLOATINGPOINT_NOT_EQUAL_EXACT */
 #ifdef XTESTS_TEST_FUNCTION_POINTER_EQUAL
 # define TEST_FUNCTION_POINTER_EQUAL                        XTESTS_TEST_FUNCTION_POINTER_EQUAL
+# define TEST_FNPTR_EQ                                      XTESTS_TEST_FUNCTION_POINTER_EQUAL
 #endif /* XTESTS_TEST_FUNCTION_POINTER_EQUAL */
 #ifdef XTESTS_TEST_FUNCTION_POINTER_NOT_EQUAL
 # define TEST_FUNCTION_POINTER_NOT_EQUAL                    XTESTS_TEST_FUNCTION_POINTER_NOT_EQUAL
+# define TEST_FNPTR_NE                                      XTESTS_TEST_FUNCTION_POINTER_NOT_EQUAL
 #endif /* XTESTS_TEST_FUNCTION_POINTER_NOT_EQUAL */
 #ifdef XTESTS_TEST_INTEGER_EQUAL
 # define TEST_INTEGER_EQUAL                                 XTESTS_TEST_INTEGER_EQUAL
+# define TEST_INT_EQ                                        XTESTS_TEST_INTEGER_EQUAL
 #endif /* XTESTS_TEST_INTEGER_EQUAL */
 #ifdef XTESTS_TEST_INTEGER_EQUAL_ANY_IN_RANGE
 # define TEST_INTEGER_EQUAL_ANY_IN_RANGE                    XTESTS_TEST_INTEGER_EQUAL_ANY_IN_RANGE
@@ -228,18 +259,23 @@
 #endif /* XTESTS_TEST_INTEGER_EQUAL_EXACT */
 #ifdef XTESTS_TEST_INTEGER_GREATER
 # define TEST_INTEGER_GREATER                               XTESTS_TEST_INTEGER_GREATER
+# define TEST_INT_GT                                        XTESTS_TEST_INTEGER_GREATER
 #endif /* XTESTS_TEST_INTEGER_GREATER */
 #ifdef XTESTS_TEST_INTEGER_GREATER_OR_EQUAL
 # define TEST_INTEGER_GREATER_OR_EQUAL                      XTESTS_TEST_INTEGER_GREATER_OR_EQUAL
+# define TEST_INT_GE                                        XTESTS_TEST_INTEGER_GREATER_OR_EQUAL
 #endif /* XTESTS_TEST_INTEGER_GREATER_OR_EQUAL */
 #ifdef XTESTS_TEST_INTEGER_LESS
 # define TEST_INTEGER_LESS                                  XTESTS_TEST_INTEGER_LESS
+# define TEST_INT_LT                                        XTESTS_TEST_INTEGER_LESS
 #endif /* XTESTS_TEST_INTEGER_LESS */
 #ifdef XTESTS_TEST_INTEGER_LESS_OR_EQUAL
 # define TEST_INTEGER_LESS_OR_EQUAL                         XTESTS_TEST_INTEGER_LESS_OR_EQUAL
+# define TEST_INT_LE                                        XTESTS_TEST_INTEGER_LESS_OR_EQUAL
 #endif /* XTESTS_TEST_INTEGER_LESS_OR_EQUAL */
 #ifdef XTESTS_TEST_INTEGER_NOT_EQUAL
 # define TEST_INTEGER_NOT_EQUAL                             XTESTS_TEST_INTEGER_NOT_EQUAL
+# define TEST_INT_NE                                        XTESTS_TEST_INTEGER_NOT_EQUAL
 #endif /* XTESTS_TEST_INTEGER_NOT_EQUAL */
 #ifdef XTESTS_TEST_MULTIBYTE_STRINGS_EQUAL
 # define TEST_MULTIBYTE_STRINGS_EQUAL                       XTESTS_TEST_MULTIBYTE_STRINGS_EQUAL
@@ -255,6 +291,7 @@
 #endif /* XTESTS_TEST_MULTIBYTE_STRING_DOES_NOT_MATCH */
 #ifdef XTESTS_TEST_MULTIBYTE_STRING_EQUAL
 # define TEST_MULTIBYTE_STRING_EQUAL                        XTESTS_TEST_MULTIBYTE_STRING_EQUAL
+# define TEST_MS_EQ                                         XTESTS_TEST_MULTIBYTE_STRING_EQUAL
 #endif /* XTESTS_TEST_MULTIBYTE_STRING_EQUAL */
 #ifdef XTESTS_TEST_MULTIBYTE_STRING_EQUAL_APPROX
 # define TEST_MULTIBYTE_STRING_EQUAL_APPROX                 XTESTS_TEST_MULTIBYTE_STRING_EQUAL_APPROX
@@ -276,6 +313,7 @@
 #endif /* XTESTS_TEST_MULTIBYTE_STRING_NOT_CONTAIN_APPROX */
 #ifdef XTESTS_TEST_MULTIBYTE_STRING_NOT_EQUAL
 # define TEST_MULTIBYTE_STRING_NOT_EQUAL                    XTESTS_TEST_MULTIBYTE_STRING_NOT_EQUAL
+# define TEST_MS_NE                                         XTESTS_TEST_MULTIBYTE_STRING_NOT_EQUAL
 #endif /* XTESTS_TEST_MULTIBYTE_STRING_NOT_EQUAL */
 #ifdef XTESTS_TEST_MULTIBYTE_STRING_NOT_EQUAL_APPROX
 # define TEST_MULTIBYTE_STRING_NOT_EQUAL_APPROX             XTESTS_TEST_MULTIBYTE_STRING_NOT_EQUAL_APPROX
@@ -291,21 +329,27 @@
 #endif /* XTESTS_TEST_MULTIBYTE_STRING_SLICE_EQUAL */
 #ifdef XTESTS_TEST_POINTER_EQUAL
 # define TEST_POINTER_EQUAL                                 XTESTS_TEST_POINTER_EQUAL
+# define TEST_PTR_EQ                                        XTESTS_TEST_POINTER_EQUAL
 #endif /* XTESTS_TEST_POINTER_EQUAL */
 #ifdef XTESTS_TEST_POINTER_GREATER
 # define TEST_POINTER_GREATER                               XTESTS_TEST_POINTER_GREATER
+# define TEST_PTR_GT                                        XTESTS_TEST_POINTER_GREATER
 #endif /* XTESTS_TEST_POINTER_GREATER */
 #ifdef XTESTS_TEST_POINTER_GREATER_OR_EQUAL
 # define TEST_POINTER_GREATER_OR_EQUAL                      XTESTS_TEST_POINTER_GREATER_OR_EQUAL
+# define TEST_PTR_GE                                        XTESTS_TEST_POINTER_GREATER_OR_EQUAL
 #endif /* XTESTS_TEST_POINTER_GREATER_OR_EQUAL */
 #ifdef XTESTS_TEST_POINTER_LESS
 # define TEST_POINTER_LESS                                  XTESTS_TEST_POINTER_LESS
+# define TEST_PTR_LT                                        XTESTS_TEST_POINTER_LESS
 #endif /* XTESTS_TEST_POINTER_LESS */
 #ifdef XTESTS_TEST_POINTER_LESS_OR_EQUAL
 # define TEST_POINTER_LESS_OR_EQUAL                         XTESTS_TEST_POINTER_LESS_OR_EQUAL
+# define TEST_PTR_LE                                        XTESTS_TEST_POINTER_LESS_OR_EQUAL
 #endif /* XTESTS_TEST_POINTER_LESS_OR_EQUAL */
 #ifdef XTESTS_TEST_POINTER_NOT_EQUAL
 # define TEST_POINTER_NOT_EQUAL                             XTESTS_TEST_POINTER_NOT_EQUAL
+# define TEST_PTR_NE                                        XTESTS_TEST_POINTER_NOT_EQUAL
 #endif /* XTESTS_TEST_POINTER_NOT_EQUAL */
 #ifdef XTESTS_TEST_WIDE_STRING_CONTAIN
 # define TEST_WIDE_STRING_CONTAIN                           XTESTS_TEST_WIDE_STRING_CONTAIN
@@ -315,6 +359,7 @@
 #endif /* XTESTS_TEST_WIDE_STRING_CONTAIN_APPROX */
 #ifdef XTESTS_TEST_WIDE_STRING_EQUAL
 # define TEST_WIDE_STRING_EQUAL                             XTESTS_TEST_WIDE_STRING_EQUAL
+# define TEST_WS_EQ                                         XTESTS_TEST_WIDE_STRING_EQUAL
 #endif /* XTESTS_TEST_WIDE_STRING_EQUAL */
 #ifdef XTESTS_TEST_WIDE_STRING_EQUAL_APPROX
 # define TEST_WIDE_STRING_EQUAL_APPROX                      XTESTS_TEST_WIDE_STRING_EQUAL_APPROX
@@ -333,6 +378,7 @@
 #endif /* XTESTS_TEST_WIDE_STRING_NOT_CONTAIN_APPROX */
 #ifdef XTESTS_TEST_WIDE_STRING_NOT_EQUAL
 # define TEST_WIDE_STRING_NOT_EQUAL                         XTESTS_TEST_WIDE_STRING_NOT_EQUAL
+# define TEST_WS_NE                                         XTESTS_TEST_WIDE_STRING_NOT_EQUAL
 #endif /* XTESTS_TEST_WIDE_STRING_NOT_EQUAL */
 #ifdef XTESTS_TEST_WIDE_STRING_NOT_EQUAL_APPROX
 # define TEST_WIDE_STRING_NOT_EQUAL_APPROX                  XTESTS_TEST_WIDE_STRING_NOT_EQUAL_APPROX

include/xtests/util/temp_directory.hpp

@@ -4,7 +4,7 @@
  * Purpose: Definition of the temp_directory class.
  *
  * Created: 1st October 2015
- * Updated: 28th September 2024
+ * Updated: 4th December 2024
  *
  * Home:    https://github.com/synesissoftware/xTests/
  *
@@ -51,8 +51,8 @@
 #ifndef XTESTS_DOCUMENTATION_SKIP_SECTION
 # define XTESTS_VER_XTESTS_UTIL_HPP_TEMP_DIRECTORY_MAJOR    0
 # define XTESTS_VER_XTESTS_UTIL_HPP_TEMP_DIRECTORY_MINOR    2
-# define XTESTS_VER_XTESTS_UTIL_HPP_TEMP_DIRECTORY_REVISION 1
-# define XTESTS_VER_XTESTS_UTIL_HPP_TEMP_DIRECTORY_EDIT     14
+# define XTESTS_VER_XTESTS_UTIL_HPP_TEMP_DIRECTORY_REVISION 2
+# define XTESTS_VER_XTESTS_UTIL_HPP_TEMP_DIRECTORY_EDIT     15
 #endif /* !XTESTS_DOCUMENTATION_SKIP_SECTION */
 
 
@@ -155,8 +155,8 @@ class temp_directory
     /// flags
     explicit temp_directory(Flags flags);
 private:
-    temp_directory(class_type const&);
-    class_type& operator =(class_type const&);
+    temp_directory(class_type const&) STLSOFT_COPY_CONSTRUCTION_PROSCRIBED;
+    void operator =(class_type const&) STLSOFT_COPY_ASSIGNMENT_PROSCRIBED;
 public:
     ~temp_directory() STLSOFT_NOEXCEPT;
 

include/xtests/util/temp_file.hpp

@@ -4,7 +4,7 @@
  * Purpose: Definition of the temp_file class.
  *
  * Created: 8th May 2014
- * Updated: 28th September 2024
+ * Updated: 4th December 2024
  *
  * Home:    https://github.com/synesissoftware/xTests/
  *
@@ -52,7 +52,7 @@
 # define XTESTS_VER_XTESTS_UTIL_HPP_TEMP_FILE_MAJOR     0
 # define XTESTS_VER_XTESTS_UTIL_HPP_TEMP_FILE_MINOR     3
 # define XTESTS_VER_XTESTS_UTIL_HPP_TEMP_FILE_REVISION  1
-# define XTESTS_VER_XTESTS_UTIL_HPP_TEMP_FILE_EDIT      20
+# define XTESTS_VER_XTESTS_UTIL_HPP_TEMP_FILE_EDIT      21
 #endif /* !XTESTS_DOCUMENTATION_SKIP_SECTION */
 
 /* /////////////////////////////////////////////////////////////////////////
@@ -206,8 +206,8 @@ class temp_file
     ,   void*       param
     );
 private:
-    temp_file(class_type const&);               // copy-construction proscribed
-    class_type& operator =(class_type const&);  // copy-assignment proscribed
+    temp_file(class_type const&) STLSOFT_COPY_CONSTRUCTION_PROSCRIBED;
+    void operator =(class_type const&) STLSOFT_COPY_ASSIGNMENT_PROSCRIBED;
 public:
     ~temp_file() STLSOFT_NOEXCEPT;