From 8032de8d1aec497e7d0c74abc3cf2a335b8bb653 Mon Sep 17 00:00:00 2001 From: "jaesick.shin" Date: Thu, 29 Sep 2016 10:04:43 +0900 Subject: [PATCH] Modify coding idiom and unittest, Add function declaration. this patch include 1. modify coding idiom. 2. modify unittest about delay time. 3. add function declaration about NSSetResourceSecurity. Change-Id: Id992c731f057580c060ccf08daee54ba6656250d Signed-off-by: jaesick.shin Reviewed-on: https://gerrit.iotivity.org/gerrit/12517 Reviewed-by: Uze Choi Tested-by: Uze Choi --- service/notification/src/common/NSUtil.c | 3 ++- service/notification/src/provider/NSProviderMemoryCache.c | 6 ++++-- service/notification/src/provider/NSProviderResource.c | 10 ++++++---- service/notification/src/provider/NSProviderSubscription.c | 4 ++-- service/notification/src/provider/NSProviderSubscription.h | 3 ++- service/notification/src/provider/NSProviderSystem.h | 1 + service/notification/src/provider/NSProviderTopic.c | 3 ++- service/notification/unittest/NSProviderTest.cpp | 12 ++++++------ 8 files changed, 25 insertions(+), 17 deletions(-) diff --git a/service/notification/src/common/NSUtil.c b/service/notification/src/common/NSUtil.c index 17b4d03..14ca14b 100755 --- a/service/notification/src/common/NSUtil.c +++ b/service/notification/src/common/NSUtil.c @@ -274,7 +274,8 @@ NSSyncInfo * NSGetSyncInfo(OCPayload * payload) retSync->state = NS_SYNC_READ; OCRepPayload * repPayload = (OCRepPayload *)payload; - if (!OCRepPayloadGetPropInt(repPayload, NS_ATTRIBUTE_MESSAGE_ID, (int64_t *)&retSync->messageId)) + if (!OCRepPayloadGetPropInt(repPayload, NS_ATTRIBUTE_MESSAGE_ID, + (int64_t *)&retSync->messageId)) { OICFree(retSync); return NULL; diff --git a/service/notification/src/provider/NSProviderMemoryCache.c b/service/notification/src/provider/NSProviderMemoryCache.c index 36173de..49c2b37 100644 --- a/service/notification/src/provider/NSProviderMemoryCache.c +++ b/service/notification/src/provider/NSProviderMemoryCache.c @@ -627,7 +627,8 @@ NSResult NSProviderDeleteConsumerTopic(NSCacheList * conTopicList, NS_LOG_V(DEBUG, "curr->id = %s", curr->id); NS_LOG_V(DEBUG, "curr->topicName = %s", curr->topicName); - if( (strncmp(curr->id, cId, NS_UUID_STRING_SIZE) == 0) && (strcmp(curr->topicName, topicName) == 0) ) + if( (strncmp(curr->id, cId, NS_UUID_STRING_SIZE) == 0) && + (strcmp(curr->topicName, topicName) == 0) ) { if (del == conTopicList->head) // first object { @@ -649,7 +650,8 @@ NSResult NSProviderDeleteConsumerTopic(NSCacheList * conTopicList, while (del) { curr = (NSCacheTopicSubData *) del->data; - if( (strncmp(curr->id, cId, NS_UUID_STRING_SIZE) == 0) && (strcmp(curr->topicName, topicName) == 0) ) + if( (strncmp(curr->id, cId, NS_UUID_STRING_SIZE) == 0) && + (strcmp(curr->topicName, topicName) == 0) ) { if (del == conTopicList->tail) // delete object same to last object { diff --git a/service/notification/src/provider/NSProviderResource.c b/service/notification/src/provider/NSProviderResource.c index 4000746..dbac395 100644 --- a/service/notification/src/provider/NSProviderResource.c +++ b/service/notification/src/provider/NSProviderResource.c @@ -68,7 +68,6 @@ NSResult NSPublishResourceToCloud(char *serverAddress) } #endif - NSResult NSCreateResource(char *uri) { NS_LOG(DEBUG, "NSCreateResource - IN"); @@ -102,7 +101,8 @@ NSResult NSCreateResource(char *uri) } if (OCCreateResource(&NotificationResource.handle, NS_ROOT_TYPE, NS_DEFAULT_INTERFACE, - NS_ROOT_URI, NSEntityHandlerNotificationCb, NULL, resourceProperties) != OC_STACK_OK) + NS_ROOT_URI, NSEntityHandlerNotificationCb, NULL, + resourceProperties) != OC_STACK_OK) { NS_LOG(NS_ERROR, "Fail to Create Notification Resource"); return NS_ERROR; @@ -180,7 +180,8 @@ NSResult NSCreateResource(char *uri) return NS_ERROR; } - if (OCBindResourceInterfaceToResource(NotificationSyncResource.handle, NS_INTERFACE_READWRITE) + if (OCBindResourceInterfaceToResource(NotificationSyncResource.handle, + NS_INTERFACE_READWRITE) != OC_STACK_OK) { NS_LOG(NS_ERROR, "Fail to bind Notification Sync Resource Type"); @@ -212,7 +213,8 @@ NSResult NSCreateResource(char *uri) return NS_ERROR; } - if (OCBindResourceInterfaceToResource(NotificationTopicResource.handle, NS_INTERFACE_READWRITE) + if (OCBindResourceInterfaceToResource(NotificationTopicResource.handle, + NS_INTERFACE_READWRITE) != OC_STACK_OK) { NS_LOG(NS_ERROR, "Fail to bind Notification Topic Resource Type"); diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c index 55ba1d5..c537c61 100644 --- a/service/notification/src/provider/NSProviderSubscription.c +++ b/service/notification/src/provider/NSProviderSubscription.c @@ -283,8 +283,8 @@ NSResult NSSendResponse(const char * id, bool accepted) } NSCacheSubData * subData = (NSCacheSubData*) element->data; - if (OCNotifyListOfObservers(rHandle, (OCObservationId*)&subData->messageObId, 1, payload, OC_LOW_QOS) - != OC_STACK_OK) + if (OCNotifyListOfObservers(rHandle, (OCObservationId*)&subData->messageObId, 1, + payload, OC_LOW_QOS) != OC_STACK_OK) { NS_LOG(ERROR, "fail to send Acceptance"); OCRepPayloadDestroy(payload); diff --git a/service/notification/src/provider/NSProviderSubscription.h b/service/notification/src/provider/NSProviderSubscription.h index f17883f..dd11273 100644 --- a/service/notification/src/provider/NSProviderSubscription.h +++ b/service/notification/src/provider/NSProviderSubscription.h @@ -39,7 +39,8 @@ NSCacheList * consumerSubList; NSResult NSInitSubscriptionList(); NSResult NSSetSubscriptionAccessPolicy(bool policy); NSResult NSSendAccessPolicyResponse(OCEntityHandlerRequest *entityHandlerRequest); -void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, NSResourceType resourceType); +void NSHandleSubscription(OCEntityHandlerRequest *entityHandlerRequest, + NSResourceType resourceType); void NSHandleUnsubscription(OCEntityHandlerRequest *entityHandlerRequest); void NSAskAcceptanceToUser(OCEntityHandlerRequest *entityHandlerRequest); NSResult NSSendConsumerSubResponse(OCEntityHandlerRequest *entityHandlerRequest); diff --git a/service/notification/src/provider/NSProviderSystem.h b/service/notification/src/provider/NSProviderSystem.h index af54319..e382ddb 100644 --- a/service/notification/src/provider/NSProviderSystem.h +++ b/service/notification/src/provider/NSProviderSystem.h @@ -39,5 +39,6 @@ const char * NSGetUserInfo(); bool NSGetPolicy(); void NSSetPolicy(bool policy); bool NSGetResourceSecurity(); +void NSSetResourceSecurity(bool secured); #endif /* _NS_PROVIDER_SYSTEM__H_ */ diff --git a/service/notification/src/provider/NSProviderTopic.c b/service/notification/src/provider/NSProviderTopic.c index 8722a63..e83288e 100644 --- a/service/notification/src/provider/NSProviderTopic.c +++ b/service/notification/src/provider/NSProviderTopic.c @@ -294,7 +294,8 @@ NSResult NSSendTopicList(OCEntityHandlerRequest * entityHandlerRequest) for (int i = 0; i < (int) dimensionSize; i++) { - NS_LOG_V(DEBUG, "topicName = %s", topics->topicName); NS_LOG_V(DEBUG, "topicState = %d",(int) topics->state); + NS_LOG_V(DEBUG, "topicName = %s", topics->topicName); + NS_LOG_V(DEBUG, "topicState = %d",(int) topics->state); payloadTopicArray[i] = OCRepPayloadCreate(); NS_VERIFY_NOT_NULL(payloadTopicArray[i], NS_ERROR); diff --git a/service/notification/unittest/NSProviderTest.cpp b/service/notification/unittest/NSProviderTest.cpp index 2ad3216..a4477c6 100755 --- a/service/notification/unittest/NSProviderTest.cpp +++ b/service/notification/unittest/NSProviderTest.cpp @@ -170,10 +170,10 @@ TEST_F(NotificationProviderTest, StartProviderPositiveWithNSPolicyFalse) NSResult ret = NSStartProvider(config); std::unique_lock< std::mutex > lock{ mutexForCondition }; - responseCon.wait_for(lock, std::chrono::milliseconds(3000)); + responseCon.wait_for(lock, g_waitForResponse); g_consumerSimul.findProvider(); - responseCon.wait_for(lock, std::chrono::milliseconds(3000)); + responseCon.wait_for(lock, g_waitForResponse); NSStopProvider(); EXPECT_EQ(ret, NS_OK); } @@ -206,7 +206,7 @@ TEST_F(NotificationProviderTest, ExpectCallbackWhenReceiveSubscribeRequestWithAc g_consumerSimul.findProvider(); std::unique_lock< std::mutex > lock{ mutexForCondition }; - responseCon.wait_for(lock, std::chrono::milliseconds(1000)); + responseCon.wait_for(lock, g_waitForResponse); EXPECT_NE((void*)g_consumerID, (void*)NULL); } @@ -242,7 +242,7 @@ TEST_F(NotificationProviderTest, NeverCallNotifyOnConsumerByAcceptIsFalse) EXPECT_EQ(expectTrue, true); NSAcceptSubscription(g_consumerID, true); - responseCon.wait_for(lock, std::chrono::milliseconds(1000)); + responseCon.wait_for(lock, g_waitForResponse); } else { @@ -401,7 +401,7 @@ TEST_F(NotificationProviderTest, ExpectEqualSetConsumerTopicsAndGetConsumerTopic NSProviderSetConsumerTopic(g_consumerID, str.c_str()); std::unique_lock< std::mutex > lock{ mutexForCondition }; - responseCon.wait_for(lock, std::chrono::milliseconds(500)); + responseCon.wait_for(lock, g_waitForResponse); bool isSame = false; NSTopicLL * topics = NSProviderGetConsumerTopics(g_consumerID); @@ -438,7 +438,7 @@ TEST_F(NotificationProviderTest, ExpectEqualUnSetConsumerTopicsAndGetConsumerTop NSProviderUnsetConsumerTopic(g_consumerID, str.c_str()); std::unique_lock< std::mutex > lock{ mutexForCondition }; - responseCon.wait_for(lock, std::chrono::milliseconds(500)); + responseCon.wait_for(lock, g_waitForResponse); bool isSame = false; NSTopicLL * topics = NSProviderGetConsumerTopics(g_consumerID); -- 2.7.4