From e68dbfb0af873791281552bc7976ee30d55c418c Mon Sep 17 00:00:00 2001 From: "jaesick.shin" Date: Mon, 29 Aug 2016 22:51:30 +0900 Subject: [PATCH] Rename Function and arguments for API. this patch included, 1. Rename function for API. 2. Modify the unittested by the first. 3. comment out the cpp-wrapper in SConscript. Change-Id: I5f7ba966e757dc14389eab58d96ed3e5cfa521fe Signed-off-by: jaesick.shin Reviewed-on: https://gerrit.iotivity.org/gerrit/11071 Reviewed-by: Uze Choi Tested-by: jenkins-iotivity --- service/notification/SConscript | 2 +- .../examples/linux/notificationprovider.c | 22 +++++++++++----------- service/notification/include/NSProviderInterface.h | 18 +++++++++--------- .../src/provider/NSProviderInterface.c | 22 +++++++++++----------- .../src/provider/NSProviderSubscription.c | 16 ++++++++-------- service/notification/unittest/NSProviderTest.cpp | 15 +++++++-------- 6 files changed, 47 insertions(+), 48 deletions(-) diff --git a/service/notification/SConscript b/service/notification/SConscript index ab866e8..4ec3d60 100755 --- a/service/notification/SConscript +++ b/service/notification/SConscript @@ -124,4 +124,4 @@ if target_os == 'android': SConscript('android/SConscript') # Go to build c++ wrapper -SConscript('cpp-wrapper/SConscript') +#SConscript('cpp-wrapper/SConscript') diff --git a/service/notification/examples/linux/notificationprovider.c b/service/notification/examples/linux/notificationprovider.c index c638d23..3454acb 100644 --- a/service/notification/examples/linux/notificationprovider.c +++ b/service/notification/examples/linux/notificationprovider.c @@ -78,7 +78,7 @@ void subscribeRequestCallback(NSConsumer *consumer) OICStrcpy(mainConsumer, 37, consumer->consumerId); } - NSAcceptSubscription(consumer, true); + NSAcceptSubscription(consumer->consumerId, true); } void syncCallback(NSSyncInfo *sync) @@ -255,28 +255,28 @@ int main() case 5: printf("NSProviderAddTopic\n"); - NSProviderAddTopic("OCF_TOPIC1"); - NSProviderAddTopic("OCF_TOPIC2"); - NSProviderAddTopic("OCF_TOPIC3"); - NSProviderAddTopic("OCF_TOPIC4"); + NSProivderRegisterTopic("OCF_TOPIC1"); + NSProivderRegisterTopic("OCF_TOPIC2"); + NSProivderRegisterTopic("OCF_TOPIC3"); + NSProivderRegisterTopic("OCF_TOPIC4"); break; case 6: printf("NSProviderDeleteTopic\n"); - NSProviderDeleteTopic("OCF_TOPIC2"); + NSProviderUnregisterTopic("OCF_TOPIC2"); break; case 7: printf("NSProviderSelectTopic\n"); - NSProviderSelectTopic(mainConsumer, "OCF_TOPIC1"); - NSProviderSelectTopic(mainConsumer, "OCF_TOPIC2"); - NSProviderSelectTopic(mainConsumer, "OCF_TOPIC3"); - NSProviderSelectTopic(mainConsumer, "OCF_TOPIC4"); + NSProviderSetConsumerTopic(mainConsumer, "OCF_TOPIC1"); + NSProviderSetConsumerTopic(mainConsumer, "OCF_TOPIC2"); + NSProviderSetConsumerTopic(mainConsumer, "OCF_TOPIC3"); + NSProviderSetConsumerTopic(mainConsumer, "OCF_TOPIC4"); break; case 8: printf("NSProviderUnSelectTopic\n"); - NSProviderUnselectTopic(mainConsumer, "OCF_TOPIC1"); + NSProviderUnsetConsumerTopic(mainConsumer, "OCF_TOPIC1"); break; case 9: diff --git a/service/notification/include/NSProviderInterface.h b/service/notification/include/NSProviderInterface.h index 5304c73..af9c19f 100644 --- a/service/notification/include/NSProviderInterface.h +++ b/service/notification/include/NSProviderInterface.h @@ -86,21 +86,21 @@ NSResult NSStopProvider(); * @param[in] server address combined with IP address and port number using delimiter : * @return ::NS_OK or result code of NSResult */ -NSResult NSProviderEnableRemoteService(char *serverAddress); +NSResult NSProviderEnableRemoteService(char * serverAddress); /** * Request to cancel remote service using cloud server * @param[in] server address combined with IP address and port number using delimiter : * @return ::NS_OK or result code of NSResult */ -NSResult NSProviderDisableRemoteService(char *serverAddress); +NSResult NSProviderDisableRemoteService(char * serverAddress); /** * Send notification message to all subscribers * @param[in] message Notification message including id, title, contentText * @return ::NS_OK or result code of NSResult */ -NSResult NSSendMessage(NSMessage *msg); +NSResult NSSendMessage(NSMessage * msg); /** * Send acceptance to consumer who subscribes the resource of notification message @@ -108,7 +108,7 @@ NSResult NSSendMessage(NSMessage *msg); * @param[in] accepted the result of acceptance; Allow or Deny * @return ::NS_OK or result code of NSResult */ -NSResult NSAcceptSubscription(NSConsumer *consumer, bool accepted); +NSResult NSAcceptSubscription(const char * consumerId, bool accepted); /** * Get consumer list that is stored in the cache of notification service @@ -137,14 +137,14 @@ NSMessage * NSCreateMessage(); * @param[in] topicName Topic name to add * @return ::NS_OK or result code of NSResult */ -NSResult NSProviderAddTopic(char* topicName); +NSResult NSProivderRegisterTopic(const char * topicName); /** * Delete topic from topic list * @param[in] topicName Topic name to delete * @return ::NS_OK or result code of NSResult */ -NSResult NSProviderDeleteTopic(char* topicName); +NSResult NSProviderUnregisterTopic(const char * topicName); /** * Select a topic name for a consumer @@ -152,7 +152,7 @@ NSResult NSProviderDeleteTopic(char* topicName); * @param[in] topicName Topic name to select * @return ::NS_OK or result code of NSResult */ -NSResult NSProviderSelectTopic(char* consumerId, char* topicName); +NSResult NSProviderSetConsumerTopic(const char * consumerId, const char * topicName); /** * Unselect a topic from the topic list for consumer @@ -160,14 +160,14 @@ NSResult NSProviderSelectTopic(char* consumerId, char* topicName); * @param[in] topicName Topic name to unselect * @return ::NS_OK or result code of NSResult */ -NSResult NSProviderUnselectTopic(char* consumerId, char* topicName); +NSResult NSProviderUnsetConsumerTopic(const char * consumerId, const char * topicName); /** * Request topic list with selection state for the consumer * @param[in] consumerid the id of consumer which topic list is subscribed for * @return :: Topic list */ -NSTopicLL * NSProviderGetConsumerTopics(char *consumerId); +NSTopicLL * NSProviderGetConsumerTopics(const char * consumerId); /** * Request topics list already registered by provider user diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProviderInterface.c index cddb775..c963a81 100644 --- a/service/notification/src/provider/NSProviderInterface.c +++ b/service/notification/src/provider/NSProviderInterface.c @@ -127,7 +127,7 @@ NSResult NSStopProvider() return NS_OK; } -NSResult NSProviderEnableRemoteService(char *serverAddress) +NSResult NSProviderEnableRemoteService(char * serverAddress) { NS_LOG(DEBUG, "NSProviderEnableRemoteService - IN"); pthread_mutex_lock(&nsInitMutex); @@ -171,7 +171,7 @@ NSResult NSProviderDisableRemoteService(char *serverAddress) return NS_OK; } -NSResult NSSendMessage(NSMessage *msg) +NSResult NSSendMessage(NSMessage * msg) { NS_LOG(DEBUG, "NSSendNotification - IN"); @@ -209,22 +209,22 @@ NSResult NSProviderSendSyncInfo(uint64_t messageId, NSSyncType type) return NS_OK; } -NSResult NSAcceptSubscription(NSConsumer *consumer, bool accepted) +NSResult NSAcceptSubscription(const char * consumerId, bool accepted) { NS_LOG(DEBUG, "NSAccept - IN"); pthread_mutex_lock(&nsInitMutex); - NSConsumer * newConsumer = NSDuplicateConsumer(consumer); + char * newConsumerId = OICStrdup(consumerId); if(accepted) { NS_LOG(DEBUG, "accepted is true - ALLOW"); - NSPushQueue(SUBSCRIPTION_SCHEDULER, TASK_SEND_ALLOW, newConsumer); + NSPushQueue(SUBSCRIPTION_SCHEDULER, TASK_SEND_ALLOW, newConsumerId); } else { NS_LOG(DEBUG, "accepted is false - DENY"); - NSPushQueue(SUBSCRIPTION_SCHEDULER, TASK_SEND_DENY, newConsumer); + NSPushQueue(SUBSCRIPTION_SCHEDULER, TASK_SEND_DENY, newConsumerId); } pthread_mutex_unlock(&nsInitMutex); @@ -245,7 +245,7 @@ NSMessage * NSCreateMessage() return msg; } -NSTopicLL * NSProviderGetConsumerTopics(char *consumerId) +NSTopicLL * NSProviderGetConsumerTopics(const char * consumerId) { NS_LOG(DEBUG, "NSProviderGetConsumerTopics - IN"); pthread_mutex_lock(&nsInitMutex); @@ -277,7 +277,7 @@ NSTopicLL * NSProviderGetTopics() return topics; } -NSResult NSProviderAddTopic(char *topicName) +NSResult NSProviderRegisterTopic(const char * topicName) { NS_LOG(DEBUG, "NSProviderAddTopics - IN"); pthread_mutex_lock(&nsInitMutex); @@ -296,7 +296,7 @@ NSResult NSProviderAddTopic(char *topicName) return NS_OK; } -NSResult NSProviderDeleteTopic(char *topicName) +NSResult NSProviderUnregisterTopic(const char * topicName) { NS_LOG(DEBUG, "NSProviderDeleteTopics - IN"); pthread_mutex_lock(&nsInitMutex); @@ -315,7 +315,7 @@ NSResult NSProviderDeleteTopic(char *topicName) return NS_OK; } -NSResult NSProviderSelectTopic(char *consumerId, char *topicName) +NSResult NSProviderSetConsumerTopic(const char * consumerId, const char * topicName) { NS_LOG(DEBUG, "NSProviderSelectTopics - IN"); pthread_mutex_lock(&nsInitMutex); @@ -341,7 +341,7 @@ NSResult NSProviderSelectTopic(char *consumerId, char *topicName) return NS_OK; } -NSResult NSProviderUnselectTopic(char *consumerId, char *topicName) +NSResult NSProviderUnsetConsumerTopic(const char * consumerId, const char * topicName) { NS_LOG(DEBUG, "NSProviderUnselectTopics - IN"); pthread_mutex_lock(&nsInitMutex); diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c index 17a0f3b..026fb6c 100644 --- a/service/notification/src/provider/NSProviderSubscription.c +++ b/service/notification/src/provider/NSProviderSubscription.c @@ -359,21 +359,21 @@ void * NSSubScriptionSchedule(void *ptr) case TASK_SEND_ALLOW: { NS_LOG(DEBUG, "CASE TASK_SEND_ALLOW : "); - NSConsumer * consumer = (NSConsumer *) node->taskData; + char * consumerId = (char *) node->taskData; - NSCacheUpdateSubScriptionState(consumerSubList, consumer->consumerId, true); - NSSendResponse(consumer->consumerId, true); - NSFreeConsumer(consumer); + NSCacheUpdateSubScriptionState(consumerSubList, consumerId, true); + NSSendResponse(consumerId, true); + OICFree(consumerId); break; } case TASK_SEND_DENY: { NS_LOG(DEBUG, "CASE TASK_SEND_DENY : "); - NSConsumer * consumer = (NSConsumer *) node->taskData; + char * consumerId = (char *) node->taskData; - NSCacheUpdateSubScriptionState(consumerSubList, consumer->consumerId, false); - NSSendResponse(consumer->consumerId, false); - NSFreeConsumer(consumer); + NSCacheUpdateSubScriptionState(consumerSubList, consumerId, false); + NSSendResponse(consumerId, false); + NSFreeConsumer(consumerId); break; } diff --git a/service/notification/unittest/NSProviderTest.cpp b/service/notification/unittest/NSProviderTest.cpp index 989a8bd..1ae689f 100755 --- a/service/notification/unittest/NSProviderTest.cpp +++ b/service/notification/unittest/NSProviderTest.cpp @@ -40,7 +40,7 @@ namespace std::mutex mutexForCondition; NSConsumerSimulator g_consumerSimul; - NSConsumer * g_consumer; + char * g_consumerID; } class TestWithMock: public testing::Test @@ -177,13 +177,12 @@ TEST_F(NotificationProviderTest, StartProviderPositiveWithNSPolicyFalse) TEST_F(NotificationProviderTest, ExpectCallbackWhenReceiveSubscribeRequestWithAccepterProvider) { - g_consumer = NULL; + g_consumerID = NULL; mocks.OnCallFunc(NSRequestedSubscribeCallbackEmpty).Do( [](NSConsumer * consumer) { std::cout << "NSRequestedSubscribeCallback" << std::endl; - g_consumer = (NSConsumer *)malloc(sizeof(NSConsumer)); - strncpy(g_consumer->consumerId , consumer->consumerId, 37); + g_consumerID = strdup(consumer->consumerId); responseCon.notify_all(); }); @@ -207,7 +206,7 @@ TEST_F(NotificationProviderTest, ExpectCallbackWhenReceiveSubscribeRequestWithAc std::unique_lock< std::mutex > lock{ mutexForCondition }; responseCon.wait_for(lock, std::chrono::milliseconds(1000)); - EXPECT_NE((void*)g_consumer, (void*)NULL); + EXPECT_NE((void*)g_consumerID, (void*)NULL); } TEST_F(NotificationProviderTest, NeverCallNotifyOnConsumerByAcceptIsFalse) @@ -225,7 +224,7 @@ TEST_F(NotificationProviderTest, NeverCallNotifyOnConsumerByAcceptIsFalse) } }); - NSAcceptSubscription(g_consumer, false); + NSAcceptSubscription(g_consumerID, false); NSMessage * msg = NSCreateMessage(); msgID = (int)msg->messageId; @@ -244,7 +243,7 @@ TEST_F(NotificationProviderTest, NeverCallNotifyOnConsumerByAcceptIsFalse) EXPECT_EQ(expectTrue, true); - NSAcceptSubscription(g_consumer, true); + NSAcceptSubscription(g_consumerID, true); } TEST_F(NotificationProviderTest, ExpectCallNotifyOnConsumerByAcceptIsTrue) @@ -262,7 +261,7 @@ TEST_F(NotificationProviderTest, ExpectCallNotifyOnConsumerByAcceptIsTrue) } }); - NSAcceptSubscription(g_consumer, true); + NSAcceptSubscription(g_consumerID, true); NSMessage * msg = NSCreateMessage(); msgID = (int)msg->messageId; -- 2.7.4