Add section logging to test loggers (#116)

* Add section logging to test loggers * Avoid duplicate section logging * Macro-ise
faasm · Jun 17, 2021 · fe6d33a · fe6d33a
1 parent 0605083
commit fe6d33a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 28 deletions.
diff --git a/tests/dist/main.cpp b/tests/dist/main.cpp
@@ -13,20 +13,7 @@
 
 using namespace faabric::scheduler;
 
-struct LogListener : Catch::TestEventListenerBase
-{
-    using TestEventListenerBase::TestEventListenerBase;
-
-    void testCaseStarting(Catch::TestCaseInfo const& testInfo) override
-    {
-
-        SPDLOG_INFO("---------------------------------------------");
-        SPDLOG_INFO("TEST: {}", testInfo.name);
-        SPDLOG_INFO("---------------------------------------------");
-    }
-};
-
-CATCH_REGISTER_LISTENER(LogListener)
+FAABRIC_CATCH_LOGGER
 
 int main(int argc, char* argv[])
 {

diff --git a/tests/test/main.cpp b/tests/test/main.cpp
@@ -7,20 +7,7 @@
 #include <faabric/util/logging.h>
 #include <faabric/util/testing.h>
 
-struct LogListener : Catch::TestEventListenerBase
-{
-    using TestEventListenerBase::TestEventListenerBase;
-
-    void testCaseStarting(Catch::TestCaseInfo const& testInfo) override
-    {
-
-        SPDLOG_INFO("---------------------------------------------");
-        SPDLOG_INFO("TEST: {}", testInfo.name);
-        SPDLOG_INFO("---------------------------------------------");
-    }
-};
-
-CATCH_REGISTER_LISTENER(LogListener)
+FAABRIC_CATCH_LOGGER
 
 int main(int argc, char* argv[])
 {

diff --git a/tests/utils/faabric_utils.h b/tests/utils/faabric_utils.h
@@ -12,6 +12,30 @@ using namespace faabric;
 
 #define SHORT_TEST_TIMEOUT_MS 1000
 
+#define FAABRIC_CATCH_LOGGER                                                   \
+    struct LogListener : Catch::TestEventListenerBase                          \
+    {                                                                          \
+        using TestEventListenerBase::TestEventListenerBase;                    \
+        void testCaseStarting(Catch::TestCaseInfo const& testInfo) override    \
+        {                                                                      \
+            this->Catch::TestEventListenerBase::testCaseStarting(testInfo);    \
+            SPDLOG_INFO("=============================================");      \
+            SPDLOG_INFO("TEST: {}", testInfo.name);                            \
+            SPDLOG_INFO("=============================================");      \
+        }                                                                      \
+                                                                               \
+        void sectionStarting(Catch::SectionInfo const& sectionInfo) override   \
+        {                                                                      \
+            this->Catch::TestEventListenerBase::sectionStarting(sectionInfo);  \
+            if (sectionInfo.name != currentTestCaseInfo->name) {               \
+                SPDLOG_INFO("---------------------------------------------");  \
+                SPDLOG_INFO("SECTION: {}", sectionInfo.name);                  \
+                SPDLOG_INFO("---------------------------------------------");  \
+            }                                                                  \
+        }                                                                      \
+    };                                                                         \
+    CATCH_REGISTER_LISTENER(LogListener)
+
 namespace tests {
 void cleanFaabric();