rdkcentral · smanes0213 · Mar 4, 2026 · Mar 4, 2026 · Mar 4, 2026 · Mar 4, 2026
diff --git a/.github/workflows/ProxyStubFunctionalTests.yml b/.github/workflows/ProxyStubFunctionalTests.yml
@@ -0,0 +1,99 @@
+name: ProxyStub & JSON-RPC Generator Functional Tests
+
+permissions:
+  contents: read
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ master ]
+    paths:
+      - "ProxyStubGenerator/**"
+      - "JsonGenerator/**"
+      - ".github/workflows/ProxyStubFunctionalTests.yml"
+  pull_request:
+    branches: [ master ]
+    paths:
+      - "ProxyStubGenerator/**"
+      - "JsonGenerator/**"
+      - ".github/workflows/ProxyStubFunctionalTests.yml"
+
+jobs:
+  test:
+    runs-on: ubuntu-24.04
+    name: Build type - ${{ matrix.architecture == '32' && 'x86' || 'x86_64' }}
+    strategy:
+      matrix:
+        architecture: [32, 64]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Prepare apt (add i386 if needed)
+        if: ${{ matrix.architecture == '32' }}
+        run: |
+          sudo dpkg --add-architecture i386
+
+      - name: Update apt indices (with retries)
+        shell: bash
+        run: |
+          set -euo pipefail
+          for attempt in {1..5}; do
+            if sudo apt-get update -o Acquire::Retries=5 -o Acquire::http::Timeout=30; then
+              break
+            fi
+            echo "apt-get update failed (attempt $attempt), retrying..."
+            sleep $((attempt*10))
+          done
+
+      - name: Install system dependencies
+        shell: bash
+        run: |
+          set -euo pipefail
+          export DEBIAN_FRONTEND=noninteractive
+          PKGS="python3-venv python3-pip build-essential cmake ninja-build"
+          if [ "${{ matrix.architecture }}" = "32" ]; then
+            PKGS="$PKGS zlib1g-dev:i386 libssl-dev:i386 gcc-13-multilib g++-13-multilib"
+          else
+            PKGS="$PKGS zlib1g-dev libssl-dev"
+          fi
+          for attempt in {1..4}; do
+            if sudo apt-get install -y --no-install-recommends $PKGS; then
+              break
+            fi
+            echo "apt-get install failed (attempt $attempt), cleaning up & retrying..."
+            sudo apt-get clean
+            sleep $((attempt*15))
+          done
+
+      - name: Set up Python environment
+        run: |
+          python3 -m venv venv
+          source venv/bin/activate
+          pip install --upgrade pip
+          pip install jsonref
+
+      - name: Build Functional Tests
+        run: |
+          source venv/bin/activate
+          cmake \
+            -G Ninja \
+            -S . \
+            -B Build/ThunderTools \
+            -DCMAKE_BUILD_TYPE=Release \
+            -DCMAKE_MESSAGE_LOG_LEVEL=VERBOSE \
+            -DCMAKE_VERBOSE_MAKEFILE=ON \
+            -DENABLE_TESTING=ON \
+            -DFUNCTIONAL_TESTS=ON \
+            -DPROXYSTUB_GENERATOR=$(pwd)/ProxyStubGenerator/StubGenerator.py \
+            -DJSON_GENERATOR=$(pwd)/JsonGenerator/JsonGenerator.py
+          cmake \
+            --build Build/ThunderTools \
+            --target JsonRpcFunctionalTests ComRpcFunctionalTests
+
+      - name: Run ProxyStub Functional Tests
+        run: Build/ThunderTools/tests/FunctionalTests/comrpc/ComRpcFunctionalTests
+
+      - name: Run JSON-RPC Functional Tests
+        run: Build/ThunderTools/tests/FunctionalTests/jsonrpc/JsonRpcFunctionalTests
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,81 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Local Debug ComRpcFunctionalTests",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${config:cmake.buildDirectory}/tests/FunctionalTests/comrpc/ComRpcFunctionalTests",
+            "args": [
+                // "--gtest_filter=TestAsync.*",
+                // "--gtest_filter=-TestInterfaces.*"
+                // "--gtest_repeat=1"
+            ],
+            "stopAtEntry": false,
+            "cwd": "${config:cmake.buildDirectory}",
+            "logging": {
+                "moduleLoad": false,
+                "trace": false
+            },
+            "externalConsole": false,
+            "linux": {
+                "program": "${config:cmake.buildDirectory}/tests/FunctionalTests/comrpc/ComRpcFunctionalTests",
+                "MIMode": "gdb",
+                "miDebuggerPath": "gdb",
+                "setupCommands": [
+                    {
+                        "description": "Enable pretty-printing for gdb",
+                        "text": "-enable-pretty-printing",
+                        "ignoreFailures": true
+                    },
+                    {
+                        "description": "Break on pure virtual call",
+                        "text": "break __cxa_pure_virtual",
+                        "ignoreFailures": false
+                    }
+                ],
+                "sourceFileMap": {},
+                "environment": [],
+                "additionalSOLibSearchPath": "",
+            },
+        },
+        {
+            "name": "Local Debug JsonRpcFunctionalTests",
+            "type": "cppdbg",
+            "request": "launch",
+            "program": "${config:cmake.buildDirectory}/tests/FunctionalTests/jsonrpc/JsonRpcFunctionalTests",
+            "args": [
+                // "--gtest_filter=TestAsync.*",
+                // "--gtest_filter=-TestInterfaces.*"
+                // "--gtest_repeat=1"
+            ],
+            "stopAtEntry": false,
+            "cwd": "${config:cmake.buildDirectory}",
+            "logging": {
+                "moduleLoad": false,
+                "trace": false
+            },
+            "externalConsole": false,
+            "linux": {
+                "program": "${config:cmake.buildDirectory}/tests/FunctionalTests/jsonrpc/JsonRpcFunctionalTests",
+                "MIMode": "gdb",
+                "miDebuggerPath": "gdb",
+                "setupCommands": [
+                    {
+                        "description": "Enable pretty-printing for gdb",
+                        "text": "-enable-pretty-printing",
+                        "ignoreFailures": true
+                    },
+                    {
+                        "description": "Break on pure virtual call",
+                        "text": "break __cxa_pure_virtual",
+                        "ignoreFailures": false
+                    }
+                ],
+                "sourceFileMap": {},
+                "environment": [],
+                "additionalSOLibSearchPath": "",
+            },
+        },
+    ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,10 @@
+{
+    "cmake.configureOnOpen": false,
+    "cmake.configureSettings": {
+        "CMAKE_BUILD_TYPE" : "Release" ,
+        "CMAKE_MESSAGE_LOG_LEVEL" : "VERBOSE" ,
+        "CMAKE_VERBOSE_MAKEFILE" : "ON",
+        "ENABLE_TESTING" : "ON",
+        "FUNCTIONAL_TESTS" : "ON",
+    }
+}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,6 +34,8 @@ option(JSON_GENERATOR_ENABLE_STATS "Globally enable JSON-RPC stats" OFF)
 option(PROXYSTUB_GENERATOR_ENABLE_SECURITY "Globally enable security checks in proxystubs" OFF)
 option(PROXYSTUB_GENERATOR_ENABLE_COHERENCY "Globally enable frame coherency checks in proxystubs" OFF)
 
+option(ENABLE_TESTING "Include the tests to be build" ON)
+
 message(VERBOSE  "GENERATOR_MODULE_INSTALL_PATH: ${GENERATOR_MODULE_INSTALL_PATH}")
 message(VERBOSE  "GENERATOR_INSTALL_PATH: ${GENERATOR_INSTALL_PATH}")
 
@@ -68,3 +70,7 @@ install(DIRECTORY
     FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
     COMPONENT ${NAMESPACE}_Runtime
 )
+
+if(ENABLE_TESTING)
+    add_subdirectory(tests)
+endif()
diff --git a/JsonGenerator/source/rpc_emitter.py b/JsonGenerator/source/rpc_emitter.py
@@ -1303,7 +1303,8 @@ def _Invoke(method, conditional_invoke, sorted_vars, params, response, parent=""
                             emit.Line("%s %s;" % (param.original_type, vector))
 
                         emit.Line("auto %s = %s.Elements();" % (temp, parent + param.cpp_name))
-                        emit.Line("while ((%s.Next() == true) { %s.push_back(%s.Current()); }" % (temp, vector, temp))
+                        # Removed extra paranthesis from the below line leading to compilation failure
+                        emit.Line("while (%s.Next() == true) { %s.push_back(%s.Current()); }" % (temp, vector, temp))
 
                         if param.optional:
                             emit.Line("%s = std::move(%s);" % (param.temp_name, vector))

diff --git a/cmake/FindConfigGenerator.cmake.in b/cmake/FindConfigGenerator.cmake.in
@@ -31,7 +31,10 @@ macro(IncludeConfig)
 endmacro()
 endif(CMAKE_VERSION VERSION_LESS 3.20.0 AND LEGACY_CONFIG_GENERATOR)
 
-set(CONFIG_GENERATOR_PATH "${CMAKE_CURRENT_LIST_DIR}/../ConfigGenerator")
+if(NOT CONFIG_GENERATOR_PATH)
+    set(CONFIG_GENERATOR_PATH "${CMAKE_CURRENT_LIST_DIR}/../ConfigGenerator")
+endif()
+
 set(CONFIG_GENERATOR "${CONFIG_GENERATOR_PATH}/config_generator.py")
 set(CONFIG_COMPARE "${CONFIG_GENERATOR_PATH}/config_compare.py")
 

diff --git a/cmake/FindJsonGenerator.cmake.in b/cmake/FindJsonGenerator.cmake.in
@@ -19,7 +19,9 @@ if(NOT PYTHON_EXECUTABLE)
     find_package(Python3 3.5 REQUIRED QUIET)
 endif()
 
-set(JSON_GENERATOR "${CMAKE_CURRENT_LIST_DIR}/../JsonGenerator/JsonGenerator.py")
+if(NOT JSON_GENERATOR)
+    set(JSON_GENERATOR "${CMAKE_CURRENT_LIST_DIR}/../JsonGenerator/JsonGenerator.py")
+endif()
 
 function(JsonGenerator)
     if (NOT JSON_GENERATOR)

diff --git a/cmake/FindProxyStubGenerator.cmake.in b/cmake/FindProxyStubGenerator.cmake.in
@@ -19,7 +19,9 @@ if(NOT PYTHON_EXECUTABLE)
     find_package(Python3 3.5 REQUIRED QUIET)
 endif()
 
-set(PROXYSTUB_GENERATOR "${CMAKE_CURRENT_LIST_DIR}/../ProxyStubGenerator/StubGenerator.py")
+if(NOT PROXYSTUB_GENERATOR)
+    set(PROXYSTUB_GENERATOR "${CMAKE_CURRENT_LIST_DIR}/../ProxyStubGenerator/StubGenerator.py")
+endif()
 
 function(ProxyStubGenerator)
     if (NOT PROXYSTUB_GENERATOR)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Copyright 2026 Metrological
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+cmake_minimum_required(VERSION 3.15)
+
+option(FUNCTIONAL_TESTS "Enable functional interface tests" OFF)
+
+if(FUNCTIONAL_TESTS)
+    add_subdirectory(FunctionalTests)
+endif()
diff --git a/tests/FunctionalTests/CMakeLists.txt b/tests/FunctionalTests/CMakeLists.txt
@@ -0,0 +1,44 @@
+# Copyright 2026 Metrological
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+option(ENABLE_COM_RPC_TESTS "Enable COM-RPC functional tests" ON)
+option(ENABLE_JSON_RPC_TESTS "Enable JSON-RPC functional tests" ON)
+
+option(TEST_ASYNC        "Enable async pattern tests"           OFF) 
+option(TEST_BUFFERS      "Enable buffer annotations tests"      ON)
+option(TEST_ENUMS        "Enable enum types tests"              ON)
+option(TEST_EVENTS       "Enable event callbacks tests"         ON)
+option(TEST_INTERFACES   "Enable interface passing tests"       OFF)
+option(TEST_ITERATORS    "Enable iterator pattern tests"        ON) 
+option(TEST_OPTIONALS    "Enable optional parameters tests"     ON)
+option(TEST_PRIMITIVES   "Enable primitive types tests"         ON)
+option(TEST_RESTRICTIONS "Enable restrict annotation tests"     ON) 
+option(TEST_STRUCTS      "Enable POD struct tests"              ON)
+
+set(CMAKE_MODULE_PATH "${CMAKE_BINARY_DIR}" CACHE BOOL "" FORCE)
+
+enable_testing()
+
+add_subdirectory(external/googletest)
+add_subdirectory(external/thunder)
+
+add_subdirectory(common)
+
+if(ENABLE_COM_RPC_TESTS)
+    add_subdirectory(comrpc )
+endif()
+
+if(ENABLE_JSON_RPC_TESTS)
+    add_subdirectory(jsonrpc)
+endif()