Fix contextual classifier failures and cleanup nits for test (#203)

Signed-off-by: varusing <varusing@qti.qualcomm.com>

Author: varunsinghal29

tests/Component/ContextClassificationTest.cpp

@@ -159,6 +159,29 @@ std::vector<TestAppConfig> loadAppConfigs(const std::string& configPath) {
     return apps;
 }
 
+/*
+ * Description: Verifies that the URM classifier model file is properly
+ * loaded and accessible at system startup.
+ */
+URM_TEST(TestModelLoads, {
+    const std::string modelPath = FT_MODEL_PATH;
+
+    // Wait for service to settle
+    std::this_thread::sleep_for(std::chrono::milliseconds(1800));
+
+    // Verify model file exists
+    // fileExists() returns 1 if file exists, 0 if not
+    int8_t modelExists = AuxRoutines::fileExists(modelPath);
+
+    if (modelExists) {
+        std::cout << LOG_BASE << "Model file found at: " << modelPath << std::endl;
+    }
+    else {
+        std::cout << LOG_BASE << "ERROR: Model file not found: " << modelPath << std::endl;
+    }
+
+    E_ASSERT((modelExists == 1));
+})
 
 /*
  * Description:

tests/Component/DeviceInfoTests.cpp

@@ -32,7 +32,7 @@ URM_TEST(TestDeviceClusterCount, {
 
     if(expectedClusterCount == -1) {
         LOG_SKIP("Baseline Could not be fetched for the Target, skipping");
-        return;
+        SKIP;
     }
 
     E_ASSERT((clusterCount == expectedClusterCount));
@@ -48,7 +48,7 @@ URM_TEST(TestDeviceCoreCount, {
 
     if(expectedCoreCount == -1) {
         LOG_SKIP("Baseline Could not be fetched for the Target, skipping");
-        return;
+        SKIP;
     }
 
     E_ASSERT((coreCount == expectedCoreCount));

tests/Integration/CCIntegrationTest.cpp

@@ -18,40 +18,10 @@
 static const std::string FT_MODEL_PATH = CLASSIFIER_CONFIGS_DIR "floret_model_supervised.bin";
 
 
-/*
- * Description: Verifies that the URM classifier model file is properly loaded and accessible
- * at system startup.
- */
-URM_TEST(TestModelLoads, {
-    const std::string modelPath = FT_MODEL_PATH;
-
-    // Wait for URM service to complete initialization and settle
-    // This ensures all service components, including the classifier subsystem,
-    // are fully initialized before we attempt to access the model file
-    std::this_thread::sleep_for(std::chrono::milliseconds(1800));
-
-    // Verify model file exists and is accessible
-    // fileExists() returns file size if successful, -1 if file not found or inaccessible
-    int64_t modelExists = AuxRoutines::fileExists(modelPath);
-
-    // Log the result for debugging
-    if (modelExists > 0) {
-        std::cout << LOG_BASE << "Model file found at: " << modelPath << std::endl;
-        std::cout << LOG_BASE << "Model file size: " << modelExists << " bytes" << std::endl;
-    } else {
-        std::cout << LOG_BASE << "ERROR: Model file not found or inaccessible" << std::endl;
-        std::cout << LOG_BASE << "Expected path: " << modelPath << std::endl;
-        std::cout << LOG_BASE << "Verify model deployment and file permissions" << std::endl;
-    }
-
-    // Assert that model file exists and is accessible (size > 0)
-    E_ASSERT((modelExists > 0));
-})
-
 /**
  * API under test: Tune / Untune
- * - Spawns GStreamer and verifies that the per-app config
- *   correctly tunes the resource node when GStreamer is running
+ * - Spawns GStreamer and verifies that correctly
+ * - tunes the resource node when GStreamer is running
  * - Verifies resource value is set when GStreamer is active
  * - Verifies resource value resets once the request expires
  */
@@ -61,14 +31,6 @@ URM_TEST(TestGstreamerPerAppConfigValidated, {
     // Wait for service to settle
     std::this_thread::sleep_for(std::chrono::milliseconds(1800));
 
-    // Verify model file exists
-    int64_t modelExists = AuxRoutines::fileExists(modelPath);
-    if (modelExists <= 0) {
-        std::cout << LOG_BASE << "Model not found, skipping test" << std::endl;
-        E_ASSERT(false);
-        return;
-    }
-
     std::string testResourceName = "/etc/urm/tests/nodes/target_test_resource1.txt";
     int32_t testResourceOriginalValue = 240;
 
@@ -141,8 +103,8 @@ URM_TEST(TestGstreamerPerAppConfigValidated, {
 
 /**
  * API under test: Tune / Untune
- * - Spawns vi text editor and verifies that the per-app config
- *   correctly tunes the resource node when vi is running
+ * - Spawns vi text editor and verifies that correctly
+ * - tunes the resource node when vi is running
  * - Verifies resource value is set when vi is active
  * - Verifies resource value resets once the request expires
  */
@@ -152,14 +114,6 @@ URM_TEST(TestViPerAppConfigValidated, {
     // Wait for service to settle
     std::this_thread::sleep_for(std::chrono::milliseconds(1800));
 
-    // Verify model file exists
-    int64_t modelExists = AuxRoutines::fileExists(modelPath);
-    if (modelExists <= 0) {
-        std::cout << LOG_BASE << "Model not found, skipping test" << std::endl;
-        E_ASSERT(false);
-        return;
-    }
-
     std::string testResourceName = "/etc/urm/tests/nodes/target_test_resource1.txt";
     int32_t testResourceOriginalValue = 240;