Move AssertionUnit from the extension to messaging and adjust all cma…

…ke files
rdkcentral · Jan 17, 2025 · b3b3824 · b3b3824
1 parent 14fa876
commit b3b3824
Show file tree

Hide file tree

Showing 18 changed files with 10 additions and 408 deletions.
diff --git a/Source/Thunder/Module.h b/Source/Thunder/Module.h
@@ -28,7 +28,6 @@
 #include <plugins/plugins.h>
 #include <websocket/websocket.h>
 #include <messaging/messaging.h>
-#include <assertion/assertion.h>
 
 #ifdef __CORE_WARNING_REPORTING__
 #include <warningreporting/warningreporting.h>

diff --git a/Source/com/CMakeLists.txt b/Source/com/CMakeLists.txt
@@ -51,7 +51,6 @@ target_link_libraries(${TARGET}
         PRIVATE
           ${NAMESPACE}Core::${NAMESPACE}Core
           ${NAMESPACE}Messaging::${NAMESPACE}Messaging
-          ${NAMESPACE}Assertion::${NAMESPACE}Assertion
           CompileSettingsDebug::CompileSettingsDebug
         )
 

diff --git a/Source/com/Module.h b/Source/com/Module.h
@@ -26,8 +26,6 @@
 #include <core/core.h>
 #include <messaging/messaging.h>
 
-#include <assertion/assertion.h>
-
 #ifdef WARNING_REPORTING_ENABLED
 #include <warningreporting/warningreporting.h>
 #endif

diff --git a/Source/core/Trace.cpp b/Source/core/Trace.cpp
@@ -37,10 +37,12 @@ namespace Core {
         if (index > 0) {
             do {
                 index--;
+
                 found = ((fileName[index] == '\\') || (fileName[index] == '/'));
 
             } while ((found == false) && (index != 0));
         }
+
         return (found == false ? fileName : &fileName[index + 1]);
     }
 

diff --git a/Source/core/Trace.h b/Source/core/Trace.h
@@ -24,7 +24,9 @@
 #include "Portability.h"
 #include "AssertionControl.h"
 
+#ifdef __CORE_MESSAGING__
 #include <sstream>
+#endif
 
 #ifndef __WINDOWS__
 #include <syslog.h>

diff --git a/Source/extensions/CMakeLists.txt b/Source/extensions/CMakeLists.txt
@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-option(ASSERTION
-        "Include asserts library in the build." ON)
 option(BLUETOOTH
         "Include bluetooth library in the build." OFF)
 option(BROADCAST
@@ -32,10 +30,6 @@ option(PROCESSCONTAINERS
 option(WARNING_REPORTING
         "Include warning reporting in the build." OFF)
 
-if(ASSERTION)
-    add_subdirectory(assertion)
-endif()
-
 if(BLUETOOTH)
     add_subdirectory(bluetooth)
 endif()

diff --git a/Source/extensions/assertion/CMakeLists.txt b/Source/extensions/assertion/CMakeLists.txt
diff --git a/Source/extensions/assertion/Module.cpp b/Source/extensions/assertion/Module.cpp
diff --git a/Source/extensions/assertion/Module.h b/Source/extensions/assertion/Module.h
diff --git a/Source/extensions/assertion/assertion.h b/Source/extensions/assertion/assertion.h