Skip to content

Commit affa9d5

Browse files
agampa263agampa263
authored
Merge branch 'rdkcentral:sprint/24Q4' into sprint/24Q4
2 parents 4f1f43d + 19a898b commit affa9d5

File tree

7 files changed

+1480
-321
lines changed

7 files changed

+1480
-321
lines changed

‎Tests/L2Tests/L2TestsPlugin/tests/UserSettings_L2Test.cpp‎

Lines changed: 57 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,14 @@ class AsyncHandlerMock_UserSetting
4949
MOCK_METHOD(void, onCaptionsChanged, (const bool enabled));
5050
MOCK_METHOD(void, onPreferredCaptionsLanguagesChanged, (const string preferredLanguages));
5151
MOCK_METHOD(void, onPreferredClosedCaptionServiceChanged, (const string service));
52-
MOCK_METHOD(void, onPinControlChanged, (const bool enabled));
52+
MOCK_METHOD(void, onPinControlChanged, (const bool pinControl));
5353
MOCK_METHOD(void, onViewingRestrictionsChanged, (const string viewingRestrictions));
5454
MOCK_METHOD(void, onViewingRestrictionsWindowChanged, (const string viewingRestrictionsWindow));
55-
MOCK_METHOD(void, onLiveWatershedChanged, (const bool enabled));
56-
MOCK_METHOD(void, onPlaybackWatershedChanged, (const bool enabled));
57-
MOCK_METHOD(void, onBlockNotRatedContentChanged, (const bool enabled));
58-
MOCK_METHOD(void, onPinOnPurchaseChanged, (const bool enabled));
55+
MOCK_METHOD(void, onLiveWatershedChanged, (const bool liveWatershed));
56+
MOCK_METHOD(void, onPlaybackWatershedChanged, (const bool playbackWatershed));
57+
MOCK_METHOD(void, onBlockNotRatedContentChanged, (const bool blockNotRatedContent));
58+
MOCK_METHOD(void, onPinOnPurchaseChanged, (const bool pinOnPurchase));
59+
5960
};
6061

6162
class NotificationHandler : public Exchange::IUserSettings::INotification {
@@ -149,11 +150,11 @@ class NotificationHandler : public Exchange::IUserSettings::INotification {
149150
m_condition_variable.notify_one();
150151
}
151152

152-
void OnPinControlChanged(const bool enabled) override
153+
void OnPinControlChanged(const bool pinControl) override
153154
{
154155
TEST_LOG("OnPinControlChanged event triggered ***\n");
155156
std::unique_lock<std::mutex> lock(m_mutex);
156-
std::string str = enabled ? "true" : "false";
157+
std::string str = pinControl ? "true" : "false";
157158

158159
TEST_LOG("OnPinControlChanged received: %s\n", str.c_str());
159160
/* Notify the requester thread. */
@@ -185,47 +186,47 @@ class NotificationHandler : public Exchange::IUserSettings::INotification {
185186

186187
}
187188

188-
void OnLiveWatershedChanged(const bool enabled) override
189+
void OnLiveWatershedChanged(const bool liveWatershed) override
189190
{
190191
TEST_LOG("OnLiveWatershedChanged event triggered ***\n");
191192
std::unique_lock<std::mutex> lock(m_mutex);
192-
std::string str = enabled ? "true" : "false";
193+
std::string str = liveWatershed ? "true" : "false";
193194

194195
TEST_LOG("OnLiveWatershedChanged received: %s\n", str.c_str());
195196
/* Notify the requester thread. */
196197
m_event_signalled |= UserSettings_onLiveWatershedChanged;
197198
m_condition_variable.notify_one();
198199
}
199200

200-
void OnPlaybackWatershedChanged(const bool enabled) override
201+
void OnPlaybackWatershedChanged(const bool playbackWatershed) override
201202
{
202203
TEST_LOG("OnPlaybackWatershedChanged event triggered ***\n");
203204
std::unique_lock<std::mutex> lock(m_mutex);
204-
std::string str = enabled ? "true" : "false";
205+
std::string str = playbackWatershed ? "true" : "false";
205206

206207
TEST_LOG("OnPlaybackWatershedChanged received: %s\n", str.c_str());
207208
/* Notify the requester thread. */
208209
m_event_signalled |= UserSettings_onPlaybackWatershedChanged;
209210
m_condition_variable.notify_one();
210211
}
211212

212-
void OnBlockNotRatedContentChanged(const bool enabled) override
213+
void OnBlockNotRatedContentChanged(const bool blockNotRatedContent) override
213214
{
214215
TEST_LOG("OnBlockNotRatedContentChanged event triggered ***\n");
215216
std::unique_lock<std::mutex> lock(m_mutex);
216-
std::string str = enabled ? "true" : "false";
217+
std::string str = blockNotRatedContent ? "true" : "false";
217218

218219
TEST_LOG("OnBlockNotRatedContentChanged received: %s\n", str.c_str());
219220
/* Notify the requester thread. */
220221
m_event_signalled |= UserSettings_onBlockNotRatedContentChanged;
221222
m_condition_variable.notify_one();
222223
}
223224

224-
void OnPinOnPurchaseChanged(const bool enabled) override
225+
void OnPinOnPurchaseChanged(const bool pinOnPurchase) override
225226
{
226227
TEST_LOG("OnPinOnPurchaseChanged event triggered ***\n");
227228
std::unique_lock<std::mutex> lock(m_mutex);
228-
std::string str = enabled ? "true" : "false";
229+
std::string str = pinOnPurchase ? "true" : "false";
229230

230231
TEST_LOG("OnPinOnPurchaseChanged received: %s\n", str.c_str());
231232
/* Notify the requester thread. */
@@ -267,13 +268,13 @@ class UserSettingTest : public L2TestMocks {
267268
void onCaptionsChanged(bool enabled);
268269
void onPreferredCaptionsLanguagesChanged(const string preferredLanguages);
269270
void onPreferredClosedCaptionServiceChanged(const string service);
270-
void onPinControlChanged(const bool enabled);
271+
void onPinControlChanged(const bool pinControl);
271272
void onViewingRestrictionsChanged(const string viewingRestrictions);
272273
void onViewingRestrictionsWindowChanged(const string viewingRestrictionsWindow);
273-
void onLiveWatershedChanged(const bool enabled);
274-
void onPlaybackWatershedChanged(const bool enabled);
275-
void onBlockNotRatedContentChanged(const bool enabled);
276-
void onPinOnPurchaseChanged(const bool enabled);
274+
void onLiveWatershedChanged(const bool liveWatershed);
275+
void onPlaybackWatershedChanged(const bool playbackWatershed);
276+
void onBlockNotRatedContentChanged(const bool blockNotRatedContent);
277+
void onPinOnPurchaseChanged(const bool pinOnPurchase);
277278

278279
uint32_t WaitForRequestStatus(uint32_t timeout_ms,UserSettingsL2test_async_events_t expected_status);
279280
uint32_t CreateUserSettingInterfaceObjectUsingComRPCConnection();
@@ -463,11 +464,11 @@ void UserSettingTest::onPreferredClosedCaptionServiceChanged(const string servic
463464
m_condition_variable.notify_one();
464465
}
465466

466-
void UserSettingTest::onPinControlChanged(bool enabled)
467+
void UserSettingTest::onPinControlChanged(bool pinControl)
467468
{
468469
TEST_LOG("OnPinControlChanged event triggered ***\n");
469470
std::unique_lock<std::mutex> lock(m_mutex);
470-
std::string str = enabled ? "true" : "false";
471+
std::string str = pinControl ? "true" : "false";
471472

472473
TEST_LOG("OnPinControlChanged received: %s\n", str.c_str());
473474
/* Notify the requester thread. */
@@ -499,47 +500,47 @@ void UserSettingTest::onViewingRestrictionsWindowChanged(const string viewingRes
499500

500501
}
501502

502-
void UserSettingTest::onLiveWatershedChanged(const bool enabled)
503+
void UserSettingTest::onLiveWatershedChanged(const bool liveWatershed)
503504
{
504505
TEST_LOG("OnLiveWatershedChanged event triggered ***\n");
505506
std::unique_lock<std::mutex> lock(m_mutex);
506-
std::string str = enabled ? "true" : "false";
507+
std::string str = liveWatershed ? "true" : "false";
507508

508509
TEST_LOG("OnLiveWatershedChanged received: %s\n", str.c_str());
509510
/* Notify the requester thread. */
510511
m_event_signalled |= UserSettings_onLiveWatershedChanged;
511512
m_condition_variable.notify_one();
512513
}
513514

514-
void UserSettingTest::onPlaybackWatershedChanged(const bool enabled)
515+
void UserSettingTest::onPlaybackWatershedChanged(const bool playbackWatershed)
515516
{
516517
TEST_LOG("OnPlaybackWatershedChanged event triggered ***\n");
517518
std::unique_lock<std::mutex> lock(m_mutex);
518-
std::string str = enabled ? "true" : "false";
519+
std::string str = playbackWatershed ? "true" : "false";
519520

520521
TEST_LOG("OnPlaybackWatershedChanged received: %s\n", str.c_str());
521522
/* Notify the requester thread. */
522523
m_event_signalled |= UserSettings_onPlaybackWatershedChanged;
523524
m_condition_variable.notify_one();
524525
}
525526

526-
void UserSettingTest::onBlockNotRatedContentChanged(const bool enabled)
527+
void UserSettingTest::onBlockNotRatedContentChanged(const bool blockNotRatedContent)
527528
{
528529
TEST_LOG("OnBlockNotRatedContentChanged event triggered ***\n");
529530
std::unique_lock<std::mutex> lock(m_mutex);
530-
std::string str = enabled ? "true" : "false";
531+
std::string str = blockNotRatedContent ? "true" : "false";
531532

532533
TEST_LOG("OnBlockNotRatedContentChanged received: %s\n", str.c_str());
533534
/* Notify the requester thread. */
534535
m_event_signalled |= UserSettings_onBlockNotRatedContentChanged;
535536
m_condition_variable.notify_one();
536537
}
537538

538-
void UserSettingTest::onPinOnPurchaseChanged(const bool enabled)
539+
void UserSettingTest::onPinOnPurchaseChanged(const bool pinOnPurchase)
539540
{
540541
TEST_LOG("OnPinOnPurchaseChanged event triggered ***\n");
541542
std::unique_lock<std::mutex> lock(m_mutex);
542-
std::string str = enabled ? "true" : "false";
543+
std::string str = pinOnPurchase ? "true" : "false";
543544

544545
TEST_LOG("OnPinOnPurchaseChanged received: %s\n", str.c_str());
545546
/* Notify the requester thread. */
@@ -893,6 +894,12 @@ TEST_F(UserSettingTest, SetAndGetMethodsUsingJsonRpcConnectionSuccessCase)
893894
uint32_t signalled = UserSettings_StateInvalid;
894895

895896
bool enabled = true;
897+
bool pinControl = true;
898+
bool liveWatershed = true;
899+
bool playbackWatershed = true;
900+
bool blockNotRatedContent = true;
901+
bool pinOnPurchase = true;
902+
896903
string preferredLanguages = "en";
897904
string presentationLanguage = "fra";
898905
string preferredCaptionsLanguages = "en,es";
@@ -1059,16 +1066,16 @@ TEST_F(UserSettingTest, SetAndGetMethodsUsingJsonRpcConnectionSuccessCase)
10591066
status = jsonrpc.Subscribe<JsonObject>(JSON_TIMEOUT,
10601067
_T("onPinControlChanged"),
10611068
[this, &async_handler](const JsonObject& parameters) {
1062-
bool enabled = parameters["enabled"].Boolean();
1063-
async_handler.onPinControlChanged(enabled);
1069+
bool pinControl = parameters["pinControl"].Boolean();
1070+
async_handler.onPinControlChanged(pinControl);
10641071
});
10651072
EXPECT_EQ(Core::ERROR_NONE, status);
10661073

1067-
EXPECT_CALL(async_handler, onPinControlChanged(MatchRequestStatusBool(enabled)))
1074+
EXPECT_CALL(async_handler, onPinControlChanged(MatchRequestStatusBool(pinControl)))
10681075
.WillOnce(Invoke(this, &UserSettingTest::onPinControlChanged));
10691076

10701077
JsonObject paramsPinControl;
1071-
paramsPinControl["enabled"] = true;
1078+
paramsPinControl["pinControl"] = true;
10721079
status = InvokeServiceMethod("org.rdk.UserSettings", "setPinControl", paramsPinControl, result_json);
10731080
EXPECT_EQ(status,Core::ERROR_NONE);
10741081

@@ -1139,16 +1146,16 @@ TEST_F(UserSettingTest, SetAndGetMethodsUsingJsonRpcConnectionSuccessCase)
11391146
status = jsonrpc.Subscribe<JsonObject>(JSON_TIMEOUT,
11401147
_T("onLiveWatershedChanged"),
11411148
[this, &async_handler](const JsonObject& parameters) {
1142-
bool enabled = parameters["enabled"].Boolean();
1143-
async_handler.onLiveWatershedChanged(enabled);
1149+
bool liveWatershed = parameters["liveWatershed"].Boolean();
1150+
async_handler.onLiveWatershedChanged(liveWatershed);
11441151
});
11451152
EXPECT_EQ(Core::ERROR_NONE, status);
11461153

1147-
EXPECT_CALL(async_handler, onLiveWatershedChanged(MatchRequestStatusBool(enabled)))
1154+
EXPECT_CALL(async_handler, onLiveWatershedChanged(MatchRequestStatusBool(liveWatershed)))
11481155
.WillOnce(Invoke(this, &UserSettingTest::onLiveWatershedChanged));
11491156

11501157
JsonObject paramsLiveWatershed;
1151-
paramsLiveWatershed["enabled"] = true;
1158+
paramsLiveWatershed["liveWatershed"] = true;
11521159
status = InvokeServiceMethod("org.rdk.UserSettings", "setLiveWatershed", paramsLiveWatershed, result_json);
11531160
EXPECT_EQ(status,Core::ERROR_NONE);
11541161

@@ -1167,16 +1174,16 @@ TEST_F(UserSettingTest, SetAndGetMethodsUsingJsonRpcConnectionSuccessCase)
11671174
status = jsonrpc.Subscribe<JsonObject>(JSON_TIMEOUT,
11681175
_T("onPlaybackWatershedChanged"),
11691176
[this, &async_handler](const JsonObject& parameters) {
1170-
bool enabled = parameters["enabled"].Boolean();
1171-
async_handler.onPlaybackWatershedChanged(enabled);
1177+
bool playbackWatershed = parameters["playbackWatershed"].Boolean();
1178+
async_handler.onPlaybackWatershedChanged(playbackWatershed);
11721179
});
11731180
EXPECT_EQ(Core::ERROR_NONE, status);
11741181

1175-
EXPECT_CALL(async_handler, onPlaybackWatershedChanged(MatchRequestStatusBool(enabled)))
1182+
EXPECT_CALL(async_handler, onPlaybackWatershedChanged(MatchRequestStatusBool(playbackWatershed)))
11761183
.WillOnce(Invoke(this, &UserSettingTest::onPlaybackWatershedChanged));
11771184

11781185
JsonObject paramsPlaybackWatershed;
1179-
paramsPlaybackWatershed["enabled"] = true;
1186+
paramsPlaybackWatershed["playbackWatershed"] = true;
11801187
status = InvokeServiceMethod("org.rdk.UserSettings", "setPlaybackWatershed", paramsPlaybackWatershed, result_json);
11811188
EXPECT_EQ(status,Core::ERROR_NONE);
11821189

@@ -1195,16 +1202,16 @@ TEST_F(UserSettingTest, SetAndGetMethodsUsingJsonRpcConnectionSuccessCase)
11951202
status = jsonrpc.Subscribe<JsonObject>(JSON_TIMEOUT,
11961203
_T("onBlockNotRatedContentChanged"),
11971204
[this, &async_handler](const JsonObject& parameters) {
1198-
bool enabled = parameters["enabled"].Boolean();
1199-
async_handler.onBlockNotRatedContentChanged(enabled);
1205+
bool blockNotRatedContent = parameters["blockNotRatedContent"].Boolean();
1206+
async_handler.onBlockNotRatedContentChanged(blockNotRatedContent);
12001207
});
12011208
EXPECT_EQ(Core::ERROR_NONE, status);
12021209

1203-
EXPECT_CALL(async_handler, onBlockNotRatedContentChanged(MatchRequestStatusBool(enabled)))
1210+
EXPECT_CALL(async_handler, onBlockNotRatedContentChanged(MatchRequestStatusBool(blockNotRatedContent)))
12041211
.WillOnce(Invoke(this, &UserSettingTest::onBlockNotRatedContentChanged));
12051212

12061213
JsonObject paramsBlockNotRatedContent;
1207-
paramsBlockNotRatedContent["enabled"] = true;
1214+
paramsBlockNotRatedContent["blockNotRatedContent"] = true;
12081215
status = InvokeServiceMethod("org.rdk.UserSettings", "setBlockNotRatedContent", paramsBlockNotRatedContent, result_json);
12091216
EXPECT_EQ(status,Core::ERROR_NONE);
12101217

@@ -1223,16 +1230,16 @@ TEST_F(UserSettingTest, SetAndGetMethodsUsingJsonRpcConnectionSuccessCase)
12231230
status = jsonrpc.Subscribe<JsonObject>(JSON_TIMEOUT,
12241231
_T("onPinOnPurchaseChanged"),
12251232
[this, &async_handler](const JsonObject& parameters) {
1226-
bool enabled = parameters["enabled"].Boolean();
1227-
async_handler.onPinOnPurchaseChanged(enabled);
1233+
bool pinOnPurchase = parameters["pinOnPurchase"].Boolean();
1234+
async_handler.onPinOnPurchaseChanged(pinOnPurchase);
12281235
});
12291236
EXPECT_EQ(Core::ERROR_NONE, status);
12301237

1231-
EXPECT_CALL(async_handler, onPinOnPurchaseChanged(MatchRequestStatusBool(enabled)))
1238+
EXPECT_CALL(async_handler, onPinOnPurchaseChanged(MatchRequestStatusBool(pinOnPurchase)))
12321239
.WillOnce(Invoke(this, &UserSettingTest::onPinOnPurchaseChanged));
12331240

12341241
JsonObject paramsPinOnPurchase;
1235-
paramsPinOnPurchase["enabled"] = true;
1242+
paramsPinOnPurchase["pinOnPurchase"] = true;
12361243
status = InvokeServiceMethod("org.rdk.UserSettings", "setPinOnPurchase", paramsPinOnPurchase, result_json);
12371244
EXPECT_EQ(status,Core::ERROR_NONE);
12381245

0 commit comments

Comments
 (0)