PR comments

Author: damcav64

.github/scripts/run-cpp-test.sh

@@ -76,6 +76,13 @@ npm start &
 mock_pid=$!
 echo "Mock started at pid: $mock_pid"
 
+# Setup cleanup trap to ensure mock server is always stopped
+cleanup() {
+  echo "Cleaning up mock server (pid: $mock_pid)"
+  kill-rec $mock_pid 2>/dev/null || true
+}
+trap cleanup EXIT
+
 sleep 1
 try=0
 maxTries=10
@@ -88,9 +95,11 @@ done
 
 echo "Starting cpp_test with -mock and -auto flags"
 cd "$(dirname "$testExe")"
+
+# Capture exit code without triggering set -e
+set +e
 "./$(basename "$testExe")" -mock -auto
 exitCode=$?
-
-kill-rec $mock_pid
+set -e
 
 exit $exitCode

build.sh

@@ -24,7 +24,7 @@ params=
 buildType="Debug"
 cleanFirst=false
 
-while [ ! -z $1 ]; do
+while [ -n "${1:-}" ]; do
   case $1 in
   --clean) cleanFirst=true;;
   --release) buildType="Release";;

test/api_test_app/CMakeLists.txt

@@ -128,7 +128,7 @@ else()
             ${CURL_TARGET}
             ${THREADS_TARGET}
     )
-       set(SOURCE_ROOT ${CMAKE_SOURCE_DIR}/../..)
+    set(SOURCE_ROOT ${CMAKE_SOURCE_DIR}/../..)
 endif ()
 
 target_include_directories(${API_TEST_APP}

test/api_test_app/cpp/chooseInterface.h

@@ -19,13 +19,13 @@
 #pragma once
 
 #include "fireboltDemoBase.h"
+#include <limits>
 
 class ChooseInterface : public FireboltDemoBase
 {
 public:
     ChooseInterface();
     ~ChooseInterface();
-    // std::vector<std::string> methods() const { return names_; }
 
     void runOption(const int index);
     void autoRun();

test/api_test_app/cpp/deviceDemo.cpp

@@ -38,7 +38,7 @@ void DeviceDemo::runOption(const int index)
 
     std::cout << "Running Device method: " << key << std::endl;
 
-    if (key == "Device.class")
+    if (key == "Device.deviceClass")
     {
         Result<DeviceClass> r = Firebolt::IFireboltAccessor::Instance().DeviceInterface().deviceClass();
         if (validateResult(r))

test/api_test_app/cpp/presentationDemo.h

@@ -28,7 +28,4 @@ class PresentationDemo : public FireboltDemoBase
     PresentationDemo();
     ~PresentationDemo() = default;
     void runOption(const int index);
-
-private:
-    // void triggerPresentationStateChange();
 };

test/api_test_app/cpp/texttospeechDemo.cpp

@@ -104,17 +104,7 @@ void TextToSpeechDemo::runOption(const int index)
             std::cout << "Current state for speech ID '" << speechId << "': " << (int)state << std::endl;
         }
     }
-    else if (key == "TextToSpeech.speechRate")
-    {
-        SpeechId speechId = chooseSpeechIdFromConsole();
-        Result<SpeechStateResponse> r = IFireboltAccessor::Instance().TextToSpeechInterface().getSpeechState(speechId);
-        if (validateResult(r))
-        {
-            const auto& ttsStatus = r.value().ttsStatus;
-            std::cout << "Current TTS status for speech ID '" << speechId << "': " << ttsStatus << std::endl;
-        }
-    }
-    else if (key == "TextToSpeech.subscribeOnWillSpeak")
+    else if (key == "TextToSpeech.onWillSpeak")
     {
         auto callback = [&](const TextToSpeech::SpeechIdEvent& event)
         { std::cout << "Will Speak notification received for Speech ID: " << event.speechId << std::endl; };