3 files changed, 66 insertions(+), 76 deletions(-)

M enabled_unittests
M module-db/tests/CMakeLists.txt
M module-services/service-db/test/CMakeLists.txt

@@ 37,16 37,19 @@ TESTS_LIST["catch2-cellular-parse-result"]="
     CSCA parser test;
     CSCA set data;
     QECCNUM parser;
+    CLCC parser;
+    CLCC set data;
+    CLCC conversion methods;
+"
+#---------
+TESTS_LIST["catch2-cellular-qmbn"]="
+    Quectel MBN test;
 "
 #---------
 TESTS_LIST["catch2-cellular-request-factory"]="
     Emergency handling;
     MMI requests;
 "
-#---------    
-TESTS_LIST["catch2-cellular-qmbn"]="
-    Quectel MBN test;
-"
 #---------
 TESTS_LIST["catch2-cellular-response"]="
     Response COPS;


@@ 55,7 58,7 @@ TESTS_LIST["catch2-cellular-response"]="
     Response CLCK;
     Response CCWA?;
     Response CCFC;
-    Response QCFG IMS;    
+    Response QCFG IMS;
 "
 #---------
 TESTS_LIST["catch2-cellular-simcard"]="


@@ 75,15 78,7 @@ TESTS_LIST["catch2-cellular-URC"]="
     Urc RESPONSE;
     +Qind: SMS DONE;
     +Qiurc: TCP Context and connection message;
-"
-#---------
-TESTS_LIST["catch2-cellular-parse-result"]="
-    CSCA parser test;
-    CSCA set data;
-    QECCNUM parser;
-    CLCC parser;
-    CLCC set data;
-    CLCC conversion methods;
+    RING;
 "
 #---------
 TESTS_LIST["catch2-commands-queue-tests"]="


@@ 95,33 90,30 @@ TESTS_LIST["catch2-context-pool-tests"]="
 "
 #---------
 TESTS_LIST["catch2-db"]="
-    SMS Table tests;
-    Threads Table tests;
-    Contacts Table tests;
-    Contacts Name Table tests;
-    Contacts Number Table tests;
-    Contacts Ringtones Table tests;
-    Contacts address Table tests;
-    Contact Groups tests;
+    Alarms Record tests;
     Alarms Table tests;
-    SMS Templates Table tests;
-    Calllog Table tests;
-#    Notifications Table tests;
-#    Events Table tests;
-    Notes Record tests;
-    Notes Table tests;
     Calllog Record tests;
+    Calllog Table tests;
+    Contact Groups tests;
+    Contacts address Table tests;
+    Contacts Name Table tests;
+    Contacts Number Table tests;
     Contact Record db tests;
     Test contact name formatting;
     Test converting contact data to string;
     Contact record numbers update;
-    SMS Record tests;
-    Thread Record tests;
-    Alarms Record tests;
-    SMS templates Record tests;
-#    Notifications Record tests;
+    Contacts Ringtones Table tests;
+    Contacts Table tests;
     Events Record tests;
+    Notes Record tests;
+    Notes Table tests;
     Query interface;
+    SMS Record tests;
+    SMS Table tests;
+    SMS templates Record tests;
+    SMS Templates Table tests;
+    Thread Record tests;
+    Threads Table tests;
 "
 #---------
 TESTS_LIST["catch2-db-initializer"]="


@@ 129,6 121,16 @@ TESTS_LIST["catch2-db-initializer"]="
     Database initialization scripts;
 "
 #---------
+TESTS_LIST["catch2-dependency-graph-tests"]="
+    Given Dependency Graph When topological sort empty graph then verify if result is empty;
+    Given Dependency Graph When topological sort without dependencies then verify order;
+    Given Dependency Graph When topological sort simple case then verify order;
+    Given Dependency Graph When topological sort all depending on one then verify order;
+    Given Dependency Graph When topological sort advanced case then verify order 1;
+    Given Dependency Graph When topological sort advanced case then verify order 2;
+    Given Dependency Graph When topological sort on directed cyclic graph then verify order;
+"
+#---------
 TESTS_LIST["catch2-gui"]="
     Test BoundingBox intersect;
     Are fonts loaded;


@@ 189,10 191,13 @@ TESTS_LIST["catch2-gui-text"]="
     TextLineCursor - addition and deletion with scroll;
 "
 #---------
+TESTS_LIST["catch2-PowerManager"]="
+    Power Manager CPU sentinels governor test;
+"
+#---------
 TESTS_LIST["catch2-service-db"]="
     DB_API;
     Settings Messages;
-#    FileIndexer;
 "
 #---------
 TESTS_LIST["catch2-service-db-settings"]="


@@ 213,10 218,6 @@ TESTS_LIST["catch2-service-evtmgr"]="
     ScreenLightControlFunctions;
 "
 #---------
-TESTS_LIST["catch2-PowerManager"]="
-    Power Manager CPU sentinels governor test;
-"
-#---------
 TESTS_LIST["catch2-StatefulController-tests"]="
     Given StatefulController when turn on then turned on;
     Given StatefulController when error during device registration then turned off;


@@ 231,11 232,6 @@ TESTS_LIST["catch2-StatefulController-tests"]="
     Given StatefulController when processing command failed then restarted and turned on;
 "
 #---------
-TESTS_LIST["catch2-unittest_parse_CSCA"]="
-    CSCA parser test;
-    CSCA set data;
-"
-#---------
 TESTS_LIST["catch2-unittest_ATStream"]="
     Channel Test- AT return parser;
 "


@@ 372,9 368,3 @@ TESTS_LIST["catch2-vfs-littlefs"]="
     littlefs: Basic API test;
 "
 #---------
-TESTS_LIST["catch2-utils-parserIcs"]="
-"
-#---------
-TESTS_LIST["catch2-utils-time_display"]="
-    Time display parser;
-"

@@ 6,32 6,32 @@ add_catch2_executable(
     NAME
         db
     SRCS
-        "${CMAKE_CURRENT_SOURCE_DIR}/tests-main.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/DbInitializer.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/SMSTable_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/ThreadsTable_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/ContactsTable_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/ContactsNameTable_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/ContactsNumberTable_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/ContactsRingtonesTable_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/ContactsAddressTable_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/ContactGroups_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/AlarmsTable_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/SMSTemplateTable_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/CalllogTable_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/NotificationsTable_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/EventsTable_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/NotesRecord_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/NotesTable_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/CalllogRecord_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/ContactsRecord_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/SMSRecord_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/ThreadRecord_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/AlarmsRecord_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/SMSTemplateRecord_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/NotificationsRecord_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/EventsRecord_tests.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/QueryInterface.cpp"
+        AlarmsRecord_tests.cpp
+        AlarmsTable_tests.cpp
+        CalllogRecord_tests.cpp
+        CalllogTable_tests.cpp
+        ContactGroups_tests.cpp
+        ContactsAddressTable_tests.cpp
+        ContactsNameTable_tests.cpp
+        ContactsNumberTable_tests.cpp
+        ContactsRecord_tests.cpp
+        ContactsRingtonesTable_tests.cpp
+        ContactsTable_tests.cpp
+        DbInitializer.cpp
+        EventsRecord_tests.cpp
+        #EventsTable_tests.cpp
+        NotesRecord_tests.cpp
+        NotesTable_tests.cpp
+        #NotificationsRecord_tests.cpp
+        #NotificationsTable_tests.cpp
+        QueryInterface.cpp
+        SMSRecord_tests.cpp
+        SMSTable_tests.cpp
+        SMSTemplateRecord_tests.cpp
+        SMSTemplateTable_tests.cpp
+        ThreadRecord_tests.cpp
+        ThreadsTable_tests.cpp
+        tests-main.cpp
         
     LIBS
         module-db

@@ 6,7 6,7 @@ add_catch2_executable(
             main.cpp
             test-service-db-api.cpp
             test-service-db-settings-messages.cpp
-            test-service-db-file_indexer.cpp
+            #test-service-db-file_indexer.cpp
         LIBS
             service-audio
             module-vfs