fossillogic · dreamer-coding · Oct 5, 2024 · Oct 4, 2024 · Oct 4, 2024 · Oct 4, 2024
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ Before getting started, make sure you have the following installed:
    # ======================
    [wrap-git]
    url = https://github.com/fossillogic/fossil-test.git
-   revision = v1.0.3
+   revision = v1.0.4
 
    [provide]
    fossil-test = fossil_test_dep

diff --git a/code/include/fossil/xassert.h b/code/include/fossil/xassert.h
diff --git a/code/include/fossil/xassume.h b/code/include/fossil/xassume.h
diff --git a/code/include/fossil/xexpect.h b/code/include/fossil/xexpect.h
diff --git a/code/source/benchmark/benchmark.c → code/logic/benchmark/benchmark.c b/code/source/benchmark/benchmark.c → code/logic/benchmark/benchmark.c
diff --git a/code/source/benchmark/meson.build → code/logic/benchmark/meson.build b/code/source/benchmark/meson.build → code/logic/benchmark/meson.build
diff --git a/code/include/fossil/_common/common.h → code/logic/fossil/_common/common.h b/code/include/fossil/_common/common.h → code/logic/fossil/_common/common.h
diff --git a/code/include/fossil/_common/platform.h → code/logic/fossil/_common/platform.h b/code/include/fossil/_common/platform.h → code/logic/fossil/_common/platform.h
diff --git a/code/include/fossil/benchmark/benchmark.h → code/logic/fossil/benchmark/benchmark.h b/code/include/fossil/benchmark/benchmark.h → code/logic/fossil/benchmark/benchmark.h
diff --git a/code/include/fossil/benchmark/framework.h → code/logic/fossil/benchmark/framework.h b/code/include/fossil/benchmark/framework.h → code/logic/fossil/benchmark/framework.h
diff --git a/code/include/meson.build → code/logic/fossil/meson.build b/code/include/meson.build → code/logic/fossil/meson.build
diff --git a/code/include/fossil/mockup/framework.h → code/logic/fossil/mockup/framework.h b/code/include/fossil/mockup/framework.h → code/logic/fossil/mockup/framework.h
diff --git a/code/include/fossil/mockup/mockup.h → code/logic/fossil/mockup/mockup.h b/code/include/fossil/mockup/mockup.h → code/logic/fossil/mockup/mockup.h
diff --git a/code/include/fossil/xassert/boolean.h → code/logic/fossil/unittest/assert/boolean.h b/code/include/fossil/xassert/boolean.h → code/logic/fossil/unittest/assert/boolean.h
diff --git a/code/include/fossil/xassert/floating.h → code/logic/fossil/unittest/assert/floating.h b/code/include/fossil/xassert/floating.h → code/logic/fossil/unittest/assert/floating.h
diff --git a/code/include/fossil/xassert/letter.h → code/logic/fossil/unittest/assert/letter.h b/code/include/fossil/xassert/letter.h → code/logic/fossil/unittest/assert/letter.h
diff --git a/code/include/fossil/xassert/memory.h → code/logic/fossil/unittest/assert/memory.h b/code/include/fossil/xassert/memory.h → code/logic/fossil/unittest/assert/memory.h
diff --git a/code/include/fossil/xassert/numeric.h → code/logic/fossil/unittest/assert/numeric.h b/code/include/fossil/xassert/numeric.h → code/logic/fossil/unittest/assert/numeric.h
diff --git a/code/include/fossil/xassert/string.h → code/logic/fossil/unittest/assert/string.h b/code/include/fossil/xassert/string.h → code/logic/fossil/unittest/assert/string.h
diff --git a/code/include/fossil/xassert/within.h → code/logic/fossil/unittest/assert/within.h b/code/include/fossil/xassert/within.h → code/logic/fossil/unittest/assert/within.h
diff --git a/code/include/fossil/xassume/boolean.h → code/logic/fossil/unittest/assume/boolean.h b/code/include/fossil/xassume/boolean.h → code/logic/fossil/unittest/assume/boolean.h
diff --git a/code/include/fossil/xassume/floating.h → code/logic/fossil/unittest/assume/floating.h b/code/include/fossil/xassume/floating.h → code/logic/fossil/unittest/assume/floating.h
diff --git a/code/include/fossil/xassume/letter.h → code/logic/fossil/unittest/assume/letter.h b/code/include/fossil/xassume/letter.h → code/logic/fossil/unittest/assume/letter.h
diff --git a/code/include/fossil/xassume/memory.h → code/logic/fossil/unittest/assume/memory.h b/code/include/fossil/xassume/memory.h → code/logic/fossil/unittest/assume/memory.h
diff --git a/code/include/fossil/xassume/numeric.h → code/logic/fossil/unittest/assume/numeric.h b/code/include/fossil/xassume/numeric.h → code/logic/fossil/unittest/assume/numeric.h
diff --git a/code/include/fossil/xassume/string.h → code/logic/fossil/unittest/assume/string.h b/code/include/fossil/xassume/string.h → code/logic/fossil/unittest/assume/string.h
diff --git a/code/include/fossil/xassume/within.h → code/logic/fossil/unittest/assume/within.h b/code/include/fossil/xassume/within.h → code/logic/fossil/unittest/assume/within.h
diff --git a/code/include/fossil/unittest/commands.h → code/logic/fossil/unittest/commands.h b/code/include/fossil/unittest/commands.h → code/logic/fossil/unittest/commands.h
diff --git a/code/include/fossil/unittest/console.h → code/logic/fossil/unittest/console.h b/code/include/fossil/unittest/console.h → code/logic/fossil/unittest/console.h
diff --git a/code/include/fossil/xexpect/boolean.h → code/logic/fossil/unittest/expect/boolean.h b/code/include/fossil/xexpect/boolean.h → code/logic/fossil/unittest/expect/boolean.h
diff --git a/code/include/fossil/xexpect/floating.h → code/logic/fossil/unittest/expect/floating.h b/code/include/fossil/xexpect/floating.h → code/logic/fossil/unittest/expect/floating.h
diff --git a/code/include/fossil/xexpect/letter.h → code/logic/fossil/unittest/expect/letter.h b/code/include/fossil/xexpect/letter.h → code/logic/fossil/unittest/expect/letter.h
diff --git a/code/include/fossil/xexpect/memory.h → code/logic/fossil/unittest/expect/memory.h b/code/include/fossil/xexpect/memory.h → code/logic/fossil/unittest/expect/memory.h
diff --git a/code/include/fossil/xexpect/numeric.h → code/logic/fossil/unittest/expect/numeric.h b/code/include/fossil/xexpect/numeric.h → code/logic/fossil/unittest/expect/numeric.h
diff --git a/code/include/fossil/xexpect/string.h → code/logic/fossil/unittest/expect/string.h b/code/include/fossil/xexpect/string.h → code/logic/fossil/unittest/expect/string.h
diff --git a/code/include/fossil/xexpect/within.h → code/logic/fossil/unittest/expect/within.h b/code/include/fossil/xexpect/within.h → code/logic/fossil/unittest/expect/within.h
diff --git a/code/include/fossil/unittest/framework.h → code/logic/fossil/unittest/framework.h b/code/include/fossil/unittest/framework.h → code/logic/fossil/unittest/framework.h
@@ -15,6 +15,35 @@
 #ifndef FOSSIL_TEST_FRAMEWORK_H
 #define FOSSIL_TEST_FRAMEWORK_H
 
+// Assertion header section of the test framework
+// contains a list of header includes of assertions
+
+#include "assert/boolean.h"
+#include "assert/floating.h"
+#include "assert/numeric.h"
+#include "assert/memory.h"
+#include "assert/string.h"
+#include "assert/letter.h"
+#include "assert/within.h"
+
+#include "expect/boolean.h"
+#include "expect/floating.h"
+#include "expect/numeric.h"
+#include "expect/memory.h"
+#include "expect/string.h"
+#include "expect/letter.h"
+#include "expect/within.h"
+
+#include "assume/boolean.h"
+#include "assume/floating.h"
+#include "assume/numeric.h"
+#include "assume/memory.h"
+#include "assume/string.h"
+#include "assume/letter.h"
+#include "assume/within.h"
+
+// Fossil test specific header section of the test framework
+
 #include "fossil/_common/common.h"
 #include "fossil/_common/platform.h"
 #include "internal.h"

diff --git a/code/include/fossil/unittest/internal.h → code/logic/fossil/unittest/internal.h b/code/include/fossil/unittest/internal.h → code/logic/fossil/unittest/internal.h
diff --git a/code/source/meson.build → code/logic/meson.build b/code/source/meson.build → code/logic/meson.build
@@ -1,3 +1,5 @@
+dir = include_directories('.')
+
 subdir('unittest')
 subdir('mockup')
 subdir('benchmark')
diff --git a/code/source/mockup/meson.build → code/logic/mockup/meson.build b/code/source/mockup/meson.build → code/logic/mockup/meson.build
diff --git a/code/source/mockup/mockup.c → code/logic/mockup/mockup.c b/code/source/mockup/mockup.c → code/logic/mockup/mockup.c
diff --git a/code/source/unittest/commands.c → code/logic/unittest/commands.c b/code/source/unittest/commands.c → code/logic/unittest/commands.c
diff --git a/code/source/unittest/console.c → code/logic/unittest/console.c b/code/source/unittest/console.c → code/logic/unittest/console.c
diff --git a/code/source/unittest/meson.build → code/logic/unittest/meson.build b/code/source/unittest/meson.build → code/logic/unittest/meson.build
diff --git a/code/source/unittest/unittest.c → code/logic/unittest/unittest.c b/code/source/unittest/unittest.c → code/logic/unittest/unittest.c
diff --git a/code/meson.build b/code/meson.build
@@ -1,2 +1,2 @@
-subdir('include')
-subdir('source')
+subdir('logic')
+subdir('tests')
diff --git a/test/generate-runner.py → code/tests/generate-runner.py b/test/generate-runner.py → code/tests/generate-runner.py
diff --git a/test/meson.build → code/tests/meson.build b/test/meson.build → code/tests/meson.build
diff --git a/test/test_bdd.c → code/tests/test_bdd.c b/test/test_bdd.c → code/tests/test_bdd.c
diff --git a/test/test_marks.c → code/tests/test_marks.c b/test/test_marks.c → code/tests/test_marks.c
@@ -14,7 +14,6 @@
  */
 #include <fossil/unittest/framework.h>   // basic test tools
 #include <fossil/benchmark/framework.h>  // benchmark tools
-#include <fossil/xassume.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * *
 // * Fossil Logic Test Utilites

diff --git a/test/test_mocks.c → code/tests/test_mocks.c b/test/test_mocks.c → code/tests/test_mocks.c
@@ -13,8 +13,6 @@
  * -----------------------------------------------------------------------------
  */
 #include <fossil/unittest/framework.h>   // basic test tools
-#include <fossil/xassert.h> // extra asserts
-
 #include <fossil/mockup/framework.h> // library under test
 
 // * * * * * * * * * * * * * * * * * * * * * * * *

diff --git a/test/test_tags.c → code/tests/test_tags.c b/test/test_tags.c → code/tests/test_tags.c
diff --git a/test/test_tdd.c → code/tests/test_tdd.c b/test/test_tdd.c → code/tests/test_tdd.c
diff --git a/test/test_xfixture.c → code/tests/test_xfixture.c b/test/test_xfixture.c → code/tests/test_xfixture.c
diff --git a/meson.build b/meson.build
@@ -1,8 +1,7 @@
 project('Fossil Test', 'c', 'cpp',
     meson_version: '>=1.3.0',
     license: 'MPL-2.0',
-    version: '1.0.3',
+    version: '1.0.4',
     default_options: ['c_std=c18', 'cpp_std=c++20'])
 
 subdir('code')
-subdir('test')