Skip to content

Commit b3de5d7

Browse files
parag-pvparag-pv
committed
Pulling in changes from PR #315 
1 parent d34b44d commit b3de5d7

14 files changed

+974
-40
lines changed

‎src/sdks/core/src/cpp/sdk/cpptest/CMakeLists.txt‎

Lines changed: 48 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,69 @@ endif ()
3939

4040
find_package(WPEFramework CONFIG REQUIRED)
4141
find_package(${NAMESPACE}Core CONFIG REQUIRED)
42+
find_package(Firebolt CONFIG REQUIRED)
43+
find_package(${FIREBOLT_NAMESPACE}SDK CONFIG REQUIRED)
44+
45+
# Manually add the library
46+
add_library(nlohmann_json_schema_validator SHARED IMPORTED)
47+
set_target_properties(nlohmann_json_schema_validator PROPERTIES
48+
IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../build/build/_deps/nlohmann_json_schema_validator-src/libnlohmann_json_schema_validator.a
49+
)
50+
add_library(gmock_main SHARED IMPORTED)
51+
set_target_properties(gmock_main PROPERTIES
52+
IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../build/lib/libgmock.a
53+
)
54+
add_library(gtest SHARED IMPORTED)
55+
set_target_properties(gtest PROPERTIES
56+
IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../build/lib/libgtest.a
57+
)
58+
59+
add_library(gtest_main SHARED IMPORTED)
60+
set_target_properties(gtest_main PROPERTIES
61+
IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../build/lib/libgtest_main.a
62+
)
63+
64+
include_directories(${CMAKE_SOURCE_DIR}/build/_deps/json-src/include)
4265

4366
set(TESTAPP TestFireboltCore)
4467

4568
message("Setup ${TESTAPP}")
4669

47-
add_executable(${TESTAPP} CoreSDKTest.cpp Main.cpp)
70+
if(UNIT_TEST STREQUAL "ON")
71+
add_definitions(-DUNIT_TEST)
72+
73+
file(GLOB UNIT_TESTS "unit/*")
74+
75+
add_executable(${TESTAPP}
76+
CoreSDKTest.cpp
77+
Unit.cpp
78+
${UNIT_TESTS}
79+
)
80+
else()
81+
add_executable(${TESTAPP}
82+
CoreSDKTest.cpp
83+
Main.cpp
84+
)
85+
endif()
4886

4987
target_link_libraries(${TESTAPP}
5088
PRIVATE
5189
${NAMESPACE}Core::${NAMESPACE}Core
5290
${FIREBOLT_NAMESPACE}SDK::${FIREBOLT_NAMESPACE}SDK
5391
nlohmann_json_schema_validator
92+
gmock_main
5493
gtest_main
94+
gtest
5595
)
5696

5797
target_include_directories(${TESTAPP}
5898
PRIVATE
59-
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include/>
99+
$<BUILD_INTERFACE:${FIREBOLT_PATH}/usr/include/${FIREBOLT_NAMESPACE}SDK>
100+
$<BUILD_INTERFACE:${FIREBOLT_PATH}/usr/include/>
101+
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/../build/_deps/nlohmann_json-src/include/>
102+
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/../build/_deps/nlohmann_json_schema_validator-src/src/>
103+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SRC_DIR}/>
104+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SRC_DIR}/../>
60105
)
61106

62107
if (POLYMORPHICS_REDUCER_METHODS)
@@ -76,37 +121,4 @@ add_custom_command(
76121
COMMENT "=================== Installing TestApp ======================"
77122
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/${FIREBOLT_NAMESPACE}/usr/bin
78123
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${TESTAPP} ${CMAKE_BINARY_DIR}/${FIREBOLT_NAMESPACE}/usr/bin
79-
)
80-
81-
if(ENABLE_UNIT_TESTS)
82-
set(UNIT_TESTS_APP FireboltCoreUnitTests)
83-
84-
message("Setup ${UNIT_TESTS_APP}")
85-
86-
add_definitions(-DUNIT_TEST)
87-
88-
file(GLOB UNIT_TESTS "unit/*")
89-
90-
add_executable(${UNIT_TESTS_APP}
91-
CoreSDKTest.cpp
92-
Unit.cpp
93-
${UNIT_TESTS}
94-
)
95-
96-
link_directories(${CMAKE_SOURCE_DIR}/../../Thunder/install/usr/lib/)
97-
target_link_libraries(${UNIT_TESTS_APP}
98-
PRIVATE
99-
${NAMESPACE}Core::${NAMESPACE}Core
100-
${FIREBOLT_NAMESPACE}SDK::${FIREBOLT_NAMESPACE}SDK
101-
nlohmann_json_schema_validator
102-
gtest_main
103-
)
104-
105-
target_include_directories(${UNIT_TESTS_APP}
106-
PRIVATE
107-
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include/>
108-
)
109-
110-
include(GoogleTest)
111-
gtest_discover_tests(${UNIT_TESTS_APP})
112-
endif()
124+
)

‎src/sdks/core/src/cpp/sdk/cpptest/build.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ usage()
66
echo " -s sysroot path"
77
echo " -f firebolt path"
88
echo " -c clear build"
9+
echo " -u : unit tests"
910
echo " -h : help"
1011
echo
1112
echo "usage: "
@@ -16,13 +17,14 @@ TestPath="."
1617
FireboltPath=${FIREBOLT_PATH}
1718
SysrootPath=${SYSROOT_PATH}
1819
ClearBuild="N"
19-
while getopts t:s:f:ch flag
20+
while getopts t:s:f:c:uh flag
2021
do
2122
case "${flag}" in
2223
t) TestPath="${OPTARG}";;
2324
s) SysrootPath="${OPTARG}";;
2425
f) FireboltPath="${OPTARG}";;
2526
c) ClearBuild="Y";;
27+
u) UnitTest="ON";;
2628
h) usage && exit 1;;
2729
esac
2830
done
@@ -36,6 +38,6 @@ echo "TestPath"
3638
echo "${TestPath}"
3739
echo "FireboltPath"
3840
echo ${FireboltPath}
39-
cmake -B${TestPath}/build -S${TestPath} -DSYSROOT_PATH=${SysrootPath} -DFIREBOLT_PATH=${FireboltPath}
41+
cmake -B${TestPath}/build -S${TestPath} -DSYSROOT_PATH=${SysrootPath} -DFIREBOLT_PATH=${FireboltPath} -DUNIT_TEST=${UnitTest}
4042
# -DPOLYMORPHICS_METHODS=ON // Enable this to test
4143
cmake --build ${TestPath}/build

‎src/sdks/core/src/cpp/sdk/cpptest/unit/accessibilityTest.cpp‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class AccessibilityTest : public ::testing::Test {
5050
};
5151

5252
TEST_F(AccessibilityTest, ClosedCaptions)
53-
{
53+
{
5454
nlohmann::json_abi_v3_11_3::json expectedValues = nlohmann::json::parse(jsonEngine->get_value("Accessibility.closedCaptions"));
5555

5656
auto closedCaptionSettings = Firebolt::IFireboltAccessor::Instance().AccessibilityInterface().closedCaptions(&error);
@@ -151,3 +151,36 @@ TEST_F(AccessibilityTest, AudioDescriptionSettings)
151151

152152
EXPECT_EQ(audioDescriptionSettings.enabled, expectedValues["enabled"]);
153153
}
154+
155+
156+
// TEST_F(AccessibilityTest, onClosedCaptionsSettingsChanged)
157+
// {
158+
// Firebolt::Error error = Firebolt::Error::None;
159+
// auto actual_value = jsonEngine->get_value("Accessibility.onClosedCaptionsSettingsChanged");
160+
// actual_value = actual_value.substr(1, actual_value.length() - 2);
161+
// auto value = Firebolt::IFireboltAccessor::Instance().AccessibilityInterface().onClosedCaptionsSettingsChanged(&error);
162+
// EXPECT_EQ(error, Firebolt::Error::None);
163+
// EXPECT_EQ(value, actual_value);
164+
// }
165+
166+
167+
// TEST_F(AccessibilityTest, onVoiceGuidanceSettingsChanged)
168+
// {
169+
// Firebolt::Error error = Firebolt::Error::None;
170+
// auto actual_value = jsonEngine->get_value("Accessibility.onVoiceGuidanceSettingsChanged");
171+
// actual_value = actual_value.substr(1, actual_value.length() - 2);
172+
// auto value = Firebolt::IFireboltAccessor::Instance().AccessibilityInterface().onVoiceGuidanceSettingsChanged(&error);
173+
// EXPECT_EQ(error, Firebolt::Error::None);
174+
// EXPECT_EQ(value, actual_value);
175+
// }
176+
177+
178+
// TEST_F(AccessibilityTest, onAudioDescriptionSettingsChanged)
179+
// {
180+
// Firebolt::Error error = Firebolt::Error::None;
181+
// auto actual_value = jsonEngine->get_value("Accessibility.onAudioDescriptionSettingsChanged");
182+
// actual_value = actual_value.substr(1, actual_value.length() - 2);
183+
// auto value = Firebolt::IFireboltAccessor::Instance().AccessibilityInterface().onAudioDescriptionSettingsChanged(&error);
184+
// EXPECT_EQ(error, Firebolt::Error::None);
185+
// EXPECT_EQ(value, actual_value);
186+
// }

‎src/sdks/core/src/cpp/sdk/cpptest/unit/advertisingTest.cpp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,3 +97,13 @@ TEST_F(AdvertisingTest, TestAdvertisingAppBundleId)
9797
EXPECT_EQ(error, Firebolt::Error::None);
9898
EXPECT_EQ(value, REMOVE_QUOTES(actual_value));
9999
}
100+
101+
102+
// TEST_F(AdvertisingTest, TestAdvertisingonPolicyChanged)
103+
// {
104+
// auto expectedValues = jsonEngine->get_value("Advertising.onPolicyChanged");
105+
106+
// auto value = Firebolt::IFireboltAccessor::Instance().AdvertisingInterface().onPolicyChanged(&error);
107+
// EXPECT_EQ(error, Firebolt::Error::None);
108+
// EXPECT_EQ(value, expectedValues);
109+
// }

‎src/sdks/core/src/cpp/sdk/cpptest/unit/capabilitiesTest.cpp‎

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ TEST_F(CapabilitiesTest, Supported)
2323
nlohmann::json_abi_v3_11_3::json expectedValues = nlohmann::json::parse(jsonEngine->get_value("Capabilities.supported"));
2424

2525

26-
bool supported = Firebolt::IFireboltAccessor::Instance().CapabilitiesInterface().supported("example", &error);
26+
bool supported = Firebolt::IFireboltAccessor::Instance().CapabilitiesInterface().supported("xrn:firebolt:capability:wifi:scan", &error);
2727

2828
EXPECT_EQ(error, Firebolt::Error::None);
2929
EXPECT_EQ(supported, expectedValues);
@@ -154,3 +154,58 @@ TEST_F(CapabilitiesTest, TestCapabilitiesinfo) {
154154

155155
EXPECT_EQ(error, Firebolt::Error::None);
156156
}
157+
158+
159+
// TEST_F(CapabilitiesTest, TestCapabilitiesrequest)
160+
// {
161+
// Firebolt::Error error = Firebolt::Error::None;
162+
// auto actual_value = jsonEngine->get_value("Capabilities.request");
163+
// actual_value = actual_value.substr(1, actual_value.length() - 2);
164+
// auto value = Firebolt::IFireboltAccessor::Instance().CapabilitiesInterface().request(&error);
165+
// EXPECT_EQ(error, Firebolt::Error::None);
166+
// EXPECT_EQ(value, actual_value);
167+
// }
168+
169+
170+
// TEST_F(CapabilitiesTest, TestCapabilitiesonAvailable)
171+
// {
172+
// Firebolt::Error error = Firebolt::Error::None;
173+
// auto actual_value = jsonEngine->get_value("Capabilities.onAvailable");
174+
// actual_value = actual_value.substr(1, actual_value.length() - 2);
175+
// auto value = Firebolt::IFireboltAccessor::Instance().CapabilitiesInterface().onAvailable(&error);
176+
// EXPECT_EQ(error, Firebolt::Error::None);
177+
// EXPECT_EQ(value, actual_value);
178+
// }
179+
180+
181+
// TEST_F(CapabilitiesTest, TestCapabilitiesonUnavailable)
182+
// {
183+
// Firebolt::Error error = Firebolt::Error::None;
184+
// auto actual_value = jsonEngine->get_value("Capabilities.onUnavailable");
185+
// actual_value = actual_value.substr(1, actual_value.length() - 2);
186+
// auto value = Firebolt::IFireboltAccessor::Instance().CapabilitiesInterface().onUnavailable(&error);
187+
// EXPECT_EQ(error, Firebolt::Error::None);
188+
// EXPECT_EQ(value, actual_value);
189+
// }
190+
191+
192+
// TEST_F(CapabilitiesTest, TestCapabilitiesonGranted)
193+
// {
194+
// Firebolt::Error error = Firebolt::Error::None;
195+
// auto actual_value = jsonEngine->get_value("Capabilities.onGranted");
196+
// actual_value = actual_value.substr(1, actual_value.length() - 2);
197+
// auto value = Firebolt::IFireboltAccessor::Instance().CapabilitiesInterface().onGranted(&error);
198+
// EXPECT_EQ(error, Firebolt::Error::None);
199+
// EXPECT_EQ(value, actual_value);
200+
// }
201+
202+
203+
// TEST_F(CapabilitiesTest, TestCapabilitiesonRevoked)
204+
// {
205+
// Firebolt::Error error = Firebolt::Error::None;
206+
// auto actual_value = jsonEngine->get_value("Capabilities.onRevoked");
207+
// actual_value = actual_value.substr(1, actual_value.length() - 2);
208+
// auto value = Firebolt::IFireboltAccessor::Instance().CapabilitiesInterface().onRevoked(&error);
209+
// EXPECT_EQ(error, Firebolt::Error::None);
210+
// EXPECT_EQ(value, actual_value);
211+
// }

‎src/sdks/core/src/cpp/sdk/cpptest/unit/deviceTest.cpp‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,17 @@ TEST_F(DeviceTest, TestDeviceMake)
113113
EXPECT_EQ(value, REMOVE_QUOTES(actual_value));
114114
}
115115

116+
// TEST_F(DeviceTest, TestDeviceversion)
117+
// {
118+
// Firebolt::Error error = Firebolt::Error::None;
119+
// nlohmann::json expectedValues = nlohmann::json::parse(jsonEngine->get_value("Device.version"));
120+
121+
// std::string actualValueStr = Firebolt::IFireboltAccessor::Instance().DeviceInterface().version(&error);
122+
// nlohmann::json actualValue = nlohmann::json::parse(actualValueStr);
123+
124+
// EXPECT_EQ(error, Firebolt::Error::None);
125+
// EXPECT_EQ(actualValue, expectedValues);
126+
// }
116127

117128
TEST_F(DeviceTest, TestDevicehdcp)
118129
{
@@ -284,3 +295,91 @@ TEST_F(DeviceTest, TestDeviceName)
284295
EXPECT_EQ(error, Firebolt::Error::None);
285296
EXPECT_EQ(value, REMOVE_QUOTES(actual_value));
286297
}
298+
299+
300+
// TEST_F(DeviceTest, TestDeviceonDeviceNameChanged)
301+
// {
302+
// Firebolt::Error error = Firebolt::Error::None;
303+
// auto actual_value = jsonEngine->get_value("Device.onDeviceNameChanged");
304+
// actual_value = actual_value.substr(1, actual_value.length() - 2);
305+
// auto value = Firebolt::IFireboltAccessor::Instance().DeviceInterface().onDeviceNameChanged(&error);
306+
// EXPECT_EQ(error, Firebolt::Error::None);
307+
// EXPECT_EQ(value, actual_value);
308+
// }
309+
310+
311+
// TEST_F(DeviceTest, TestDeviceonNameChanged)
312+
// {
313+
// Firebolt::Error error = Firebolt::Error::None;
314+
// auto actual_value = jsonEngine->get_value("Device.onNameChanged");
315+
// actual_value = actual_value.substr(1, actual_value.length() - 2);
316+
// auto value = Firebolt::IFireboltAccessor::Instance().DeviceInterface().onNameChanged(&error);
317+
// EXPECT_EQ(error, Firebolt::Error::None);
318+
// EXPECT_EQ(value, actual_value);
319+
// }
320+
321+
322+
// TEST_F(DeviceTest, TestDeviceonHdcpChanged)
323+
// {
324+
// Firebolt::Error error = Firebolt::Error::None;
325+
// auto actual_value = jsonEngine->get_value("Device.onHdcpChanged");
326+
// actual_value = actual_value.substr(1, actual_value.length() - 2);
327+
// auto value = Firebolt::IFireboltAccessor::Instance().DeviceInterface().onHdcpChanged(&error);
328+
// EXPECT_EQ(error, Firebolt::Error::None);
329+
// EXPECT_EQ(value, actual_value);
330+
// }
331+
332+
333+
// TEST_F(DeviceTest, TestDeviceonHdrChanged)
334+
// {
335+
// Firebolt::Error error = Firebolt::Error::None;
336+
// auto actual_value = jsonEngine->get_value("Device.onHdrChanged");
337+
// actual_value = actual_value.substr(1, actual_value.length() - 2);
338+
// auto value = Firebolt::IFireboltAccessor::Instance().DeviceInterface().onHdrChanged(&error);
339+
// EXPECT_EQ(error, Firebolt::Error::None);
340+
// EXPECT_EQ(value, actual_value);
341+
// }
342+
343+
344+
// TEST_F(DeviceTest, TestDeviceonAudioChanged)
345+
// {
346+
// Firebolt::Error error = Firebolt::Error::None;
347+
// auto actual_value = jsonEngine->get_value("Device.onAudioChanged");
348+
// actual_value = actual_value.substr(1, actual_value.length() - 2);
349+
// auto value = Firebolt::IFireboltAccessor::Instance().DeviceInterface().onAudioChanged(&error);
350+
// EXPECT_EQ(error, Firebolt::Error::None);
351+
// EXPECT_EQ(value, actual_value);
352+
// }
353+
354+
355+
// TEST_F(DeviceTest, TestDeviceonScreenResolutionChanged)
356+
// {
357+
// Firebolt::Error error = Firebolt::Error::None;
358+
// auto actual_value = jsonEngine->get_value("Device.onScreenResolutionChanged");
359+
// actual_value = actual_value.substr(1, actual_value.length() - 2);
360+
// auto value = Firebolt::IFireboltAccessor::Instance().DeviceInterface().onScreenResolutionChanged(&error);
361+
// EXPECT_EQ(error, Firebolt::Error::None);
362+
// EXPECT_EQ(value, actual_value);
363+
// }
364+
365+
366+
// TEST_F(DeviceTest, TestDeviceonVideoResolutionChanged)
367+
// {
368+
// Firebolt::Error error = Firebolt::Error::None;
369+
// auto actual_value = jsonEngine->get_value("Device.onVideoResolutionChanged");
370+
// actual_value = actual_value.substr(1, actual_value.length() - 2);
371+
// auto value = Firebolt::IFireboltAccessor::Instance().DeviceInterface().onVideoResolutionChanged(&error);
372+
// EXPECT_EQ(error, Firebolt::Error::None);
373+
// EXPECT_EQ(value, actual_value);
374+
// }
375+
376+
377+
// TEST_F(DeviceTest, TestDeviceonNetworkChanged)
378+
// {
379+
// Firebolt::Error error = Firebolt::Error::None;
380+
// auto actual_value = jsonEngine->get_value("Device.onNetworkChanged");
381+
// actual_value = actual_value.substr(1, actual_value.length() - 2);
382+
// auto value = Firebolt::IFireboltAccessor::Instance().DeviceInterface().onNetworkChanged(&error);
383+
// EXPECT_EQ(error, Firebolt::Error::None);
384+
// EXPECT_EQ(value, actual_value);
385+
// }

0 commit comments

Comments
 (0)