extend test coverage

Author: Strooom

Diff for: lib/nci/ncipacket.cpp

@@ -12,7 +12,15 @@ const char* toString(nciMessageId messageId) {
             return "CORE_INIT_CMD";
         case nciMessageId::CORE_INIT_RSP:
             return "CORE_INIT_RSP";
-        case nciMessageId::RF_DISCOVER_CMD:
+        case nciMessageId::CORE_GET_CONFIG_CMD:
+            return "CORE_GET_CONFIG_CMD";
+        case nciMessageId::CORE_GET_CONFIG_RSP:
+            return "CORE_GET_CONFIG_RSP";
+        case nciMessageId::CORE_SET_CONFIG_CMD:
+            return "CORE_SET_CONFIG_CMD";
+        case nciMessageId::CORE_SET_CONFIG_RSP:
+            return "CORE_SET_CONFIG_RSP";
+            case nciMessageId::RF_DISCOVER_CMD:
             return "RF_DISCOVER_CMD";
         case nciMessageId::RF_DISCOVER_RSP:
             return "RF_DISCOVER_RSP";
@@ -22,14 +30,6 @@ const char* toString(nciMessageId messageId) {
             return "RF_INTF_ACTIVATED_NTF";
         case nciMessageId::RF_DEACTIVATE_RSP:
             return "RF_DEACTIVATE_RSP";
-        case nciMessageId::CORE_GET_CONFIG_CMD:
-            return "CORE_GET_CONFIG_CMD";
-        case nciMessageId::CORE_GET_CONFIG_RSP:
-            return "CORE_GET_CONFIG_RSP";
-        case nciMessageId::CORE_SET_CONFIG_CMD:
-            return "CORE_SET_CONFIG_CMD";
-        case nciMessageId::CORE_SET_CONFIG_RSP:
-            return "CORE_SET_CONFIG_RSP";
         default:
             return "Unknown Message";
     }

Diff for: lib/nci/ncistate.cpp

@@ -13,7 +13,7 @@ const char* toString(nciState state) {
         case nciState::waitForCoreResetNotification:
             return "waitForCoreResetNotification";
         case nciState::waitForCoreInitResponse:
-            return "waitforCoreInitResponse";
+            return "waitForCoreInitResponse";
         case nciState::waitForGetConfigResponse:
             return "waitForGetConfigResponse";
         case nciState::waitForSetConfigResponse:
@@ -31,7 +31,7 @@ const char* toString(nciState state) {
         case nciState::error:
             return "error";
         case nciState::test:
-            return "Test";
+            return "test";
         default:
             return "unknown nciState";
     }

Diff for: test/generic/test_ncipacket/test.cpp

@@ -22,6 +22,13 @@ void test_dummy() {
     TEST_ASSERT_EQUAL_STRING("CORE_RESET_NTF", toString(nciMessageId::CORE_RESET_NTF));
     TEST_ASSERT_EQUAL_STRING("CORE_INIT_CMD", toString(nciMessageId::CORE_INIT_CMD));
     TEST_ASSERT_EQUAL_STRING("CORE_INIT_RSP", toString(nciMessageId::CORE_INIT_RSP));
+    
+    TEST_ASSERT_EQUAL_STRING("CORE_GET_CONFIG_CMD", toString(nciMessageId::CORE_GET_CONFIG_CMD));
+    TEST_ASSERT_EQUAL_STRING("CORE_GET_CONFIG_RSP", toString(nciMessageId::CORE_GET_CONFIG_RSP));
+    TEST_ASSERT_EQUAL_STRING("CORE_SET_CONFIG_CMD", toString(nciMessageId::CORE_SET_CONFIG_CMD));
+    TEST_ASSERT_EQUAL_STRING("CORE_SET_CONFIG_RSP", toString(nciMessageId::CORE_SET_CONFIG_RSP));
+
+    TEST_ASSERT_EQUAL_STRING("RF_DISCOVER_CMD", toString(nciMessageId::RF_DISCOVER_CMD));
     TEST_ASSERT_EQUAL_STRING("RF_DISCOVER_RSP", toString(nciMessageId::RF_DISCOVER_RSP));
     TEST_ASSERT_EQUAL_STRING("RF_DISCOVER_NTF", toString(nciMessageId::RF_DISCOVER_NTF));
     TEST_ASSERT_EQUAL_STRING("RF_INTF_ACTIVATED_NTF", toString(nciMessageId::RF_INTF_ACTIVATED_NTF));

Diff for: test/generic/test_ncistate/test.cpp

@@ -13,17 +13,17 @@ void tearDown(void) {        // after each test
 void test_dummy() {
     TEST_ASSERT_EQUAL_STRING("boot", toString(nciState::boot));
     TEST_ASSERT_EQUAL_STRING("venResetActive", toString(nciState::venResetActive));
-//    TEST_ASSERT_EQUAL_STRING("waitForResetDone", toString(nciState::waitForResetDone));
+    TEST_ASSERT_EQUAL_STRING("waitForHwReset", toString(nciState::waitForHwReset));
     TEST_ASSERT_EQUAL_STRING("waitForCoreResetResponse", toString(nciState::waitForCoreResetResponse));
     TEST_ASSERT_EQUAL_STRING("waitForCoreResetNotification", toString(nciState::waitForCoreResetNotification));
-    // TEST_ASSERT_EQUAL_STRING("waitforCoreInitResponse", toString(nciState::waitforCoreInitResponse));
-    // TEST_ASSERT_EQUAL_STRING("waitForConfigResponse", toString(nciState::waitForConfigResponse));
+    TEST_ASSERT_EQUAL_STRING("waitForCoreInitResponse", toString(nciState::waitForCoreInitResponse));
+    TEST_ASSERT_EQUAL_STRING("waitForGetConfigResponse", toString(nciState::waitForGetConfigResponse));
+    TEST_ASSERT_EQUAL_STRING("waitForSetConfigResponse", toString(nciState::waitForSetConfigResponse));
     TEST_ASSERT_EQUAL_STRING("waitForDiscoverResponse", toString(nciState::waitForDiscoverResponse));
-    //TEST_ASSERT_EQUAL_STRING("waitForDiscoverNotification", toString(nciState::waitForDiscoverNotification));
-    //TEST_ASSERT_EQUAL_STRING("waitForRfDeactivationResponse", toString(nciState::waitForRfDeactivationResponse));
-    //TEST_ASSERT_EQUAL_STRING("waitForRfDeactivationNotification", toString(nciState::waitForRfDeactivationNotification));
+    TEST_ASSERT_EQUAL_STRING("waitForRfInterfaceActivatedNotification", toString(nciState::waitForRfInterfaceActivatedNotification));
     TEST_ASSERT_EQUAL_STRING("waitForRestartDiscovery", toString(nciState::waitForRestartDiscovery));
     TEST_ASSERT_EQUAL_STRING("error", toString(nciState::error));
+    TEST_ASSERT_EQUAL_STRING("test", toString(nciState::test));
     TEST_ASSERT_EQUAL_STRING("unknown nciState", toString(static_cast<nciState>(0xFF)));
 }