Skip to content

Commit 9c53189

Browse files
anand-kyanand-ky
authored
Merge pull request rdkcentral#5957 from Dosakaya/main
SERXIONE-6655: Xumo Content Store - Age Ratings
2 parents b6a59ba + d279aee commit 9c53189

File tree

7 files changed

+351
-346
lines changed

7 files changed

+351
-346
lines changed

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

Lines changed: 57 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,14 @@ class AsyncHandlerMock_UserSetting
5151
MOCK_METHOD(void, onPreferredCaptionsLanguagesChanged, (const string preferredLanguages));
5252
MOCK_METHOD(void, onPreferredClosedCaptionServiceChanged, (const string service));
5353
MOCK_METHOD(void, onPrivacyModeChanged, (const string privacyMode));
54-
MOCK_METHOD(void, onPinControlChanged, (const bool enabled));
54+
MOCK_METHOD(void, onPinControlChanged, (const bool pinControl));
5555
MOCK_METHOD(void, onViewingRestrictionsChanged, (const string viewingRestrictions));
5656
MOCK_METHOD(void, onViewingRestrictionsWindowChanged, (const string viewingRestrictionsWindow));
57-
MOCK_METHOD(void, onLiveWatershedChanged, (const bool enabled));
58-
MOCK_METHOD(void, onPlaybackWatershedChanged, (const bool enabled));
59-
MOCK_METHOD(void, onBlockNotRatedContentChanged, (const bool enabled));
60-
MOCK_METHOD(void, onPinOnPurchaseChanged, (const bool enabled));
57+
MOCK_METHOD(void, onLiveWatershedChanged, (const bool liveWatershed));
58+
MOCK_METHOD(void, onPlaybackWatershedChanged, (const bool playbackWatershed));
59+
MOCK_METHOD(void, onBlockNotRatedContentChanged, (const bool blockNotRatedContent));
60+
MOCK_METHOD(void, onPinOnPurchaseChanged, (const bool pinOnPurchase));
61+
6162
};
6263

6364
class NotificationHandler : public Exchange::IUserSettings::INotification {
@@ -162,11 +163,11 @@ class NotificationHandler : public Exchange::IUserSettings::INotification {
162163
m_condition_variable.notify_one();
163164
}
164165

165-
void OnPinControlChanged(const bool enabled) override
166+
void OnPinControlChanged(const bool pinControl) override
166167
{
167168
TEST_LOG("OnPinControlChanged event triggered ***\n");
168169
std::unique_lock<std::mutex> lock(m_mutex);
169-
std::string str = enabled ? "true" : "false";
170+
std::string str = pinControl ? "true" : "false";
170171

171172
TEST_LOG("OnPinControlChanged received: %s\n", str.c_str());
172173
/* Notify the requester thread. */
@@ -198,47 +199,47 @@ class NotificationHandler : public Exchange::IUserSettings::INotification {
198199

199200
}
200201

201-
void OnLiveWatershedChanged(const bool enabled) override
202+
void OnLiveWatershedChanged(const bool liveWatershed) override
202203
{
203204
TEST_LOG("OnLiveWatershedChanged event triggered ***\n");
204205
std::unique_lock<std::mutex> lock(m_mutex);
205-
std::string str = enabled ? "true" : "false";
206+
std::string str = liveWatershed ? "true" : "false";
206207

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

213-
void OnPlaybackWatershedChanged(const bool enabled) override
214+
void OnPlaybackWatershedChanged(const bool playbackWatershed) override
214215
{
215216
TEST_LOG("OnPlaybackWatershedChanged event triggered ***\n");
216217
std::unique_lock<std::mutex> lock(m_mutex);
217-
std::string str = enabled ? "true" : "false";
218+
std::string str = playbackWatershed ? "true" : "false";
218219

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

225-
void OnBlockNotRatedContentChanged(const bool enabled) override
226+
void OnBlockNotRatedContentChanged(const bool blockNotRatedContent) override
226227
{
227228
TEST_LOG("OnBlockNotRatedContentChanged event triggered ***\n");
228229
std::unique_lock<std::mutex> lock(m_mutex);
229-
std::string str = enabled ? "true" : "false";
230+
std::string str = blockNotRatedContent ? "true" : "false";
230231

231232
TEST_LOG("OnBlockNotRatedContentChanged received: %s\n", str.c_str());
232233
/* Notify the requester thread. */
233234
m_event_signalled |= UserSettings_onBlockNotRatedContentChanged;
234235
m_condition_variable.notify_one();
235236
}
236237

237-
void OnPinOnPurchaseChanged(const bool enabled) override
238+
void OnPinOnPurchaseChanged(const bool pinOnPurchase) override
238239
{
239240
TEST_LOG("OnPinOnPurchaseChanged event triggered ***\n");
240241
std::unique_lock<std::mutex> lock(m_mutex);
241-
std::string str = enabled ? "true" : "false";
242+
std::string str = pinOnPurchase ? "true" : "false";
242243

243244
TEST_LOG("OnPinOnPurchaseChanged received: %s\n", str.c_str());
244245
/* Notify the requester thread. */
@@ -280,13 +281,13 @@ class UserSettingTest : public L2TestMocks {
280281
void onCaptionsChanged(bool enabled);
281282
void onPreferredCaptionsLanguagesChanged(const string preferredLanguages);
282283
void onPreferredClosedCaptionServiceChanged(const string service);
283-
void onPinControlChanged(const bool enabled);
284+
void onPinControlChanged(const bool pinControl);
284285
void onViewingRestrictionsChanged(const string viewingRestrictions);
285286
void onViewingRestrictionsWindowChanged(const string viewingRestrictionsWindow);
286-
void onLiveWatershedChanged(const bool enabled);
287-
void onPlaybackWatershedChanged(const bool enabled);
288-
void onBlockNotRatedContentChanged(const bool enabled);
289-
void onPinOnPurchaseChanged(const bool enabled);
287+
void onLiveWatershedChanged(const bool liveWatershed);
288+
void onPlaybackWatershedChanged(const bool playbackWatershed);
289+
void onBlockNotRatedContentChanged(const bool blockNotRatedContent);
290+
void onPinOnPurchaseChanged(const bool pinOnPurchase);
290291

291292
uint32_t WaitForRequestStatus(uint32_t timeout_ms,UserSettingsL2test_async_events_t expected_status);
292293
uint32_t CreateUserSettingInterfaceObjectUsingComRPCConnection();
@@ -476,11 +477,11 @@ void UserSettingTest::onPreferredClosedCaptionServiceChanged(const string servic
476477
m_condition_variable.notify_one();
477478
}
478479

479-
void UserSettingTest::onPinControlChanged(bool enabled)
480+
void UserSettingTest::onPinControlChanged(bool pinControl)
480481
{
481482
TEST_LOG("OnPinControlChanged event triggered ***\n");
482483
std::unique_lock<std::mutex> lock(m_mutex);
483-
std::string str = enabled ? "true" : "false";
484+
std::string str = pinControl ? "true" : "false";
484485

485486
TEST_LOG("OnPinControlChanged received: %s\n", str.c_str());
486487
/* Notify the requester thread. */
@@ -512,47 +513,47 @@ void UserSettingTest::onViewingRestrictionsWindowChanged(const string viewingRes
512513

513514
}
514515

515-
void UserSettingTest::onLiveWatershedChanged(const bool enabled)
516+
void UserSettingTest::onLiveWatershedChanged(const bool liveWatershed)
516517
{
517518
TEST_LOG("OnLiveWatershedChanged event triggered ***\n");
518519
std::unique_lock<std::mutex> lock(m_mutex);
519-
std::string str = enabled ? "true" : "false";
520+
std::string str = liveWatershed ? "true" : "false";
520521

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

527-
void UserSettingTest::onPlaybackWatershedChanged(const bool enabled)
528+
void UserSettingTest::onPlaybackWatershedChanged(const bool playbackWatershed)
528529
{
529530
TEST_LOG("OnPlaybackWatershedChanged event triggered ***\n");
530531
std::unique_lock<std::mutex> lock(m_mutex);
531-
std::string str = enabled ? "true" : "false";
532+
std::string str = playbackWatershed ? "true" : "false";
532533

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

539-
void UserSettingTest::onBlockNotRatedContentChanged(const bool enabled)
540+
void UserSettingTest::onBlockNotRatedContentChanged(const bool blockNotRatedContent)
540541
{
541542
TEST_LOG("OnBlockNotRatedContentChanged event triggered ***\n");
542543
std::unique_lock<std::mutex> lock(m_mutex);
543-
std::string str = enabled ? "true" : "false";
544+
std::string str = blockNotRatedContent ? "true" : "false";
544545

545546
TEST_LOG("OnBlockNotRatedContentChanged received: %s\n", str.c_str());
546547
/* Notify the requester thread. */
547548
m_event_signalled |= UserSettings_onBlockNotRatedContentChanged;
548549
m_condition_variable.notify_one();
549550
}
550551

551-
void UserSettingTest::onPinOnPurchaseChanged(const bool enabled)
552+
void UserSettingTest::onPinOnPurchaseChanged(const bool pinOnPurchase)
552553
{
553554
TEST_LOG("OnPinOnPurchaseChanged event triggered ***\n");
554555
std::unique_lock<std::mutex> lock(m_mutex);
555-
std::string str = enabled ? "true" : "false";
556+
std::string str = pinOnPurchase ? "true" : "false";
556557

557558
TEST_LOG("OnPinOnPurchaseChanged received: %s\n", str.c_str());
558559
/* Notify the requester thread. */
@@ -906,6 +907,12 @@ TEST_F(UserSettingTest, SetAndGetMethodsUsingJsonRpcConnectionSuccessCase)
906907
uint32_t signalled = UserSettings_StateInvalid;
907908

908909
bool enabled = true;
910+
bool pinControl = true;
911+
bool liveWatershed = true;
912+
bool playbackWatershed = true;
913+
bool blockNotRatedContent = true;
914+
bool pinOnPurchase = true;
915+
909916
string preferredLanguages = "en";
910917
string presentationLanguage = "fra";
911918
string preferredCaptionsLanguages = "en,es";
@@ -1072,16 +1079,16 @@ TEST_F(UserSettingTest, SetAndGetMethodsUsingJsonRpcConnectionSuccessCase)
10721079
status = jsonrpc.Subscribe<JsonObject>(JSON_TIMEOUT,
10731080
_T("onPinControlChanged"),
10741081
[this, &async_handler](const JsonObject& parameters) {
1075-
bool enabled = parameters["enabled"].Boolean();
1076-
async_handler.onPinControlChanged(enabled);
1082+
bool pinControl = parameters["pinControl"].Boolean();
1083+
async_handler.onPinControlChanged(pinControl);
10771084
});
10781085
EXPECT_EQ(Core::ERROR_NONE, status);
10791086

1080-
EXPECT_CALL(async_handler, onPinControlChanged(MatchRequestStatusBool(enabled)))
1087+
EXPECT_CALL(async_handler, onPinControlChanged(MatchRequestStatusBool(pinControl)))
10811088
.WillOnce(Invoke(this, &UserSettingTest::onPinControlChanged));
10821089

10831090
JsonObject paramsPinControl;
1084-
paramsPinControl["enabled"] = true;
1091+
paramsPinControl["pinControl"] = true;
10851092
status = InvokeServiceMethod("org.rdk.UserSettings", "setPinControl", paramsPinControl, result_json);
10861093
EXPECT_EQ(status,Core::ERROR_NONE);
10871094

@@ -1152,16 +1159,16 @@ TEST_F(UserSettingTest, SetAndGetMethodsUsingJsonRpcConnectionSuccessCase)
11521159
status = jsonrpc.Subscribe<JsonObject>(JSON_TIMEOUT,
11531160
_T("onLiveWatershedChanged"),
11541161
[this, &async_handler](const JsonObject& parameters) {
1155-
bool enabled = parameters["enabled"].Boolean();
1156-
async_handler.onLiveWatershedChanged(enabled);
1162+
bool liveWatershed = parameters["liveWatershed"].Boolean();
1163+
async_handler.onLiveWatershedChanged(liveWatershed);
11571164
});
11581165
EXPECT_EQ(Core::ERROR_NONE, status);
11591166

1160-
EXPECT_CALL(async_handler, onLiveWatershedChanged(MatchRequestStatusBool(enabled)))
1167+
EXPECT_CALL(async_handler, onLiveWatershedChanged(MatchRequestStatusBool(liveWatershed)))
11611168
.WillOnce(Invoke(this, &UserSettingTest::onLiveWatershedChanged));
11621169

11631170
JsonObject paramsLiveWatershed;
1164-
paramsLiveWatershed["enabled"] = true;
1171+
paramsLiveWatershed["liveWatershed"] = true;
11651172
status = InvokeServiceMethod("org.rdk.UserSettings", "setLiveWatershed", paramsLiveWatershed, result_json);
11661173
EXPECT_EQ(status,Core::ERROR_NONE);
11671174

@@ -1180,16 +1187,16 @@ TEST_F(UserSettingTest, SetAndGetMethodsUsingJsonRpcConnectionSuccessCase)
11801187
status = jsonrpc.Subscribe<JsonObject>(JSON_TIMEOUT,
11811188
_T("onPlaybackWatershedChanged"),
11821189
[this, &async_handler](const JsonObject& parameters) {
1183-
bool enabled = parameters["enabled"].Boolean();
1184-
async_handler.onPlaybackWatershedChanged(enabled);
1190+
bool playbackWatershed = parameters["playbackWatershed"].Boolean();
1191+
async_handler.onPlaybackWatershedChanged(playbackWatershed);
11851192
});
11861193
EXPECT_EQ(Core::ERROR_NONE, status);
11871194

1188-
EXPECT_CALL(async_handler, onPlaybackWatershedChanged(MatchRequestStatusBool(enabled)))
1195+
EXPECT_CALL(async_handler, onPlaybackWatershedChanged(MatchRequestStatusBool(playbackWatershed)))
11891196
.WillOnce(Invoke(this, &UserSettingTest::onPlaybackWatershedChanged));
11901197

11911198
JsonObject paramsPlaybackWatershed;
1192-
paramsPlaybackWatershed["enabled"] = true;
1199+
paramsPlaybackWatershed["playbackWatershed"] = true;
11931200
status = InvokeServiceMethod("org.rdk.UserSettings", "setPlaybackWatershed", paramsPlaybackWatershed, result_json);
11941201
EXPECT_EQ(status,Core::ERROR_NONE);
11951202

@@ -1208,16 +1215,16 @@ TEST_F(UserSettingTest, SetAndGetMethodsUsingJsonRpcConnectionSuccessCase)
12081215
status = jsonrpc.Subscribe<JsonObject>(JSON_TIMEOUT,
12091216
_T("onBlockNotRatedContentChanged"),
12101217
[this, &async_handler](const JsonObject& parameters) {
1211-
bool enabled = parameters["enabled"].Boolean();
1212-
async_handler.onBlockNotRatedContentChanged(enabled);
1218+
bool blockNotRatedContent = parameters["blockNotRatedContent"].Boolean();
1219+
async_handler.onBlockNotRatedContentChanged(blockNotRatedContent);
12131220
});
12141221
EXPECT_EQ(Core::ERROR_NONE, status);
12151222

1216-
EXPECT_CALL(async_handler, onBlockNotRatedContentChanged(MatchRequestStatusBool(enabled)))
1223+
EXPECT_CALL(async_handler, onBlockNotRatedContentChanged(MatchRequestStatusBool(blockNotRatedContent)))
12171224
.WillOnce(Invoke(this, &UserSettingTest::onBlockNotRatedContentChanged));
12181225

12191226
JsonObject paramsBlockNotRatedContent;
1220-
paramsBlockNotRatedContent["enabled"] = true;
1227+
paramsBlockNotRatedContent["blockNotRatedContent"] = true;
12211228
status = InvokeServiceMethod("org.rdk.UserSettings", "setBlockNotRatedContent", paramsBlockNotRatedContent, result_json);
12221229
EXPECT_EQ(status,Core::ERROR_NONE);
12231230

@@ -1236,16 +1243,16 @@ TEST_F(UserSettingTest, SetAndGetMethodsUsingJsonRpcConnectionSuccessCase)
12361243
status = jsonrpc.Subscribe<JsonObject>(JSON_TIMEOUT,
12371244
_T("onPinOnPurchaseChanged"),
12381245
[this, &async_handler](const JsonObject& parameters) {
1239-
bool enabled = parameters["enabled"].Boolean();
1240-
async_handler.onPinOnPurchaseChanged(enabled);
1246+
bool pinOnPurchase = parameters["pinOnPurchase"].Boolean();
1247+
async_handler.onPinOnPurchaseChanged(pinOnPurchase);
12411248
});
12421249
EXPECT_EQ(Core::ERROR_NONE, status);
12431250

1244-
EXPECT_CALL(async_handler, onPinOnPurchaseChanged(MatchRequestStatusBool(enabled)))
1251+
EXPECT_CALL(async_handler, onPinOnPurchaseChanged(MatchRequestStatusBool(pinOnPurchase)))
12451252
.WillOnce(Invoke(this, &UserSettingTest::onPinOnPurchaseChanged));
12461253

12471254
JsonObject paramsPinOnPurchase;
1248-
paramsPinOnPurchase["enabled"] = true;
1255+
paramsPinOnPurchase["pinOnPurchase"] = true;
12491256
status = InvokeServiceMethod("org.rdk.UserSettings", "setPinOnPurchase", paramsPinOnPurchase, result_json);
12501257
EXPECT_EQ(status,Core::ERROR_NONE);
12511258

0 commit comments

Comments
 (0)