std::mutex mutexForCondition;
NSConsumerSimulator g_consumerSimul;
- OIC::Service::NSConsumer *g_consumer;
+ std::shared_ptr<OIC::Service::NSConsumer> g_consumer;
}
class TestWithMock: public testing::Test
NotificationProviderServiceTest() = default;
~NotificationProviderServiceTest() = default;
- static void ConsumerSubscribedCallbackEmpty(OIC::Service::NSConsumer *)
+ static void ConsumerSubscribedCallbackEmpty(std::shared_ptr<OIC::Service::NSConsumer> )
{
std::cout << __func__ << std::endl;
}
- static void MessageSynchronizedCallbackEmpty(OIC::Service::NSSyncInfo *)
+ static void MessageSynchronizedCallbackEmpty(OIC::Service::NSSyncInfo)
{
std::cout << __func__ << std::endl;
}
{
g_consumer = NULL;
mocks.ExpectCallFunc(ConsumerSubscribedCallbackEmpty).Do(
- []( OIC::Service::NSConsumer * consumer)
+ []( std::shared_ptr<OIC::Service::NSConsumer> consumer)
{
std::cout << "ConsumerSubscribedCallbackEmpty" << std::endl;
g_consumer = consumer;
ASSERT_NE(nullptr, g_consumer) << "error: discovery failure";
g_consumer->acceptSubscription(false);
-
- OIC::Service::NSMessage *msg = OIC::Service::NSProviderService::getInstance()->createMessage();
- msgID = (int)msg->getMessageId();
- msg->setTitle(std::string("Title"));
- msg->setContentText(std::string("ContentText"));
- msg->setSourceName(std::string("OCF"));
+ OIC::Service::NSMessage msg = OIC::Service::NSProviderService::getInstance()->createMessage();
+ msgID = (int)msg.getMessageId();
+ msg.setTitle(std::string("Title"));
+ msg.setContentText(std::string("ContentText"));
+ msg.setSourceName(std::string("OCF"));
OIC::Service::NSProviderService::getInstance()->sendMessage(msg);
{
std::unique_lock< std::mutex > lock { mutexForCondition };
responseCon.wait_for(lock, g_waitForResponse);
- delete msg;
-
EXPECT_EQ(expectTrue, true);
}
g_consumer->acceptSubscription(true);
- OIC::Service::NSMessage *msg = OIC::Service::NSProviderService::getInstance()->createMessage();
- msgID = (int)msg->getMessageId();
- msg->setTitle(std::string("Title"));
- msg->setContentText(std::string("ContentText"));
- msg->setSourceName(std::string("OCF"));
+ OIC::Service::NSMessage msg = OIC::Service::NSProviderService::getInstance()->createMessage();
+ msgID = (int)msg.getMessageId();
+ msg.setTitle(std::string("Title"));
+ msg.setContentText(std::string("ContentText"));
+ msg.setSourceName(std::string("OCF"));
OIC::Service::NSProviderService::getInstance()->sendMessage(msg);
std::unique_lock< std::mutex > lock { mutexForCondition };
responseCon.wait_for(lock, g_waitForResponse);
- delete msg;
}
TEST_F(NotificationProviderServiceTest, ExpectCallbackSyncOnReadToConsumer)
}
});
- OIC::Service::NSMessage *msg = OIC::Service::NSProviderService::getInstance()->createMessage();
- id = (int)msg->getMessageId();
- msg->setTitle(std::string("Title"));
- msg->setContentText(std::string("ContentText"));
- msg->setSourceName(std::string("OCF"));
+ OIC::Service::NSMessage msg = OIC::Service::NSProviderService::getInstance()->createMessage();
+ id = (int)msg.getMessageId();
+ msg.setTitle(std::string("Title"));
+ msg.setContentText(std::string("ContentText"));
+ msg.setSourceName(std::string("OCF"));
- OIC::Service::NSProviderService::getInstance()->sendSyncInfo(msg->getMessageId(),
+ OIC::Service::NSProviderService::getInstance()->sendSyncInfo(msg.getMessageId(),
OIC::Service::NSSyncInfo::NSSyncType::NS_SYNC_READ);
std::unique_lock< std::mutex > lock { mutexForCondition };
responseCon.wait_for(lock, g_waitForResponse);
-
- delete msg;
}
TEST_F(NotificationProviderServiceTest, ExpectCallbackSyncOnReadFromConsumer)
int type = (int)OIC::Service::NSSyncInfo::NSSyncType::NS_SYNC_READ;
int id = 0;
mocks.ExpectCallFunc(MessageSynchronizedCallbackEmpty).Do(
- [& id](OIC::Service::NSSyncInfo * sync)
+ [& id](OIC::Service::NSSyncInfo sync)
{
std::cout << "MessageSynchronizedCallbackEmpty" << std::endl;
- if ((int)sync->getMessageId() == id
- && sync->getState() == OIC::Service::NSSyncInfo::NSSyncType::NS_SYNC_READ)
+ if ((int)sync.getMessageId() == id
+ && sync.getState() == OIC::Service::NSSyncInfo::NSSyncType::NS_SYNC_READ)
{
std::cout << "ExpectCallbackSyncOnReadFromConsumer" << std::endl;
responseCon.notify_all();
}
});
- OIC::Service::NSMessage *msg = OIC::Service::NSProviderService::getInstance()->createMessage();
- id = (int)msg->getMessageId();
- msg->setTitle(std::string("Title"));
- msg->setContentText(std::string("ContentText"));
- msg->setSourceName(std::string("OCF"));
- g_consumerSimul.syncToProvider(type, id, msg->getProviderId());
+ OIC::Service::NSMessage msg = OIC::Service::NSProviderService::getInstance()->createMessage();
+ id = (int)msg.getMessageId();
+ msg.setTitle(std::string("Title"));
+ msg.setContentText(std::string("ContentText"));
+ msg.setSourceName(std::string("OCF"));
+ g_consumerSimul.syncToProvider(type, id, msg.getProviderId());
std::unique_lock< std::mutex > lock { mutexForCondition };
responseCon.wait(lock);
-
- delete msg;
}
TEST_F(NotificationProviderServiceTest, ExpectEqualAddedTopicsAndRegisteredTopics)
std::unique_lock< std::mutex > lock { mutexForCondition };
responseCon.wait_for(lock, g_waitForResponse);
bool isSame = false;
- OIC::Service::NSTopicsList *topicList =
+ auto topicList =
OIC::Service::NSProviderService::getInstance()->getRegisteredTopicList();
if (!topicList)
{
int i = 0;
for (auto itr : topicList->getTopicsList())
{
- compString[i] = itr->getTopicName(); i++;
+ compString[i] = itr.getTopicName(); i++;
}
std::cout << compString[0] << std::endl;
std::cout << compString[1] << std::endl;
OIC::Service::NSProviderService::getInstance()->unregisterTopic(str1);
OIC::Service::NSProviderService::getInstance()->unregisterTopic(str2);
- if (topicList != nullptr)
- {
- delete topicList;
- }
responseCon.wait_for(lock, g_waitForResponse);
}
std::unique_lock< std::mutex > lock { mutexForCondition };
responseCon.wait_for(lock, g_waitForResponse);
bool isSame = false;
- OIC::Service::NSTopicsList *topicList =
+ auto topicList =
OIC::Service::NSProviderService::getInstance()->getRegisteredTopicList();
if (!topicList)
{
}
else
{
- std::list<OIC::Service::NSTopic *>::iterator it = topicList->getTopicsList().begin();
- std::string compStr = (*it)->getTopicName() ;
+ auto topic = topicList->getTopicsList();
+ auto it = topic.begin();
+ std::string compStr = (*it).getTopicName() ;
std::cout << compStr << std::endl;
if (str1.compare(compStr) == 0 )
{
EXPECT_EQ(isSame, true);
OIC::Service::NSProviderService::getInstance()->unregisterTopic(str1);
- if (topicList != nullptr)
- {
- delete topicList;
- }
responseCon.wait_for(lock, g_waitForResponse);
}
responseCon.wait_for(lock, g_waitForResponse);
bool isSame = false;
- OIC::Service::NSTopicsList *topicList = g_consumer->getConsumerTopicList();
+ auto topicList = g_consumer->getConsumerTopicList();
if (!topicList)
{
int i = 0, state[10] = {0};
for (auto itr : topicList->getTopicsList())
{
- compString[i] = itr->getTopicName();
- state[i++] = (int) itr->getState();
+ compString[i] = itr.getTopicName();
+ state[i++] = (int) itr.getState();
}
std::cout << compString[0] << std::endl;
std::cout << compString[1] << std::endl;
OIC::Service::NSProviderService::getInstance()->unregisterTopic(str1);
OIC::Service::NSProviderService::getInstance()->unregisterTopic(str2);
- if (topicList != nullptr)
- {
- delete topicList;
- }
responseCon.wait_for(lock, g_waitForResponse);
}
responseCon.wait_for(lock, g_waitForResponse);
bool isSame = false;
- OIC::Service::NSTopicsList *topicList = g_consumer->getConsumerTopicList();
+ auto topicList = g_consumer->getConsumerTopicList();
if (!topicList)
{
int i = 0, state[10] = {0};
for (auto itr : topicList->getTopicsList())
{
- compString[i] = itr->getTopicName();
- state[i++] = (int) itr->getState();
+ compString[i] = itr.getTopicName();
+ state[i++] = (int) itr.getState();
}
std::cout << compString[0] << std::endl;
std::cout << compString[1] << std::endl;
OIC::Service::NSProviderService::getInstance()->unregisterTopic(str1);
OIC::Service::NSProviderService::getInstance()->unregisterTopic(str2);
-
- if (topicList != nullptr)
- {
- delete topicList;
- }
responseCon.wait_for(lock, g_waitForResponse);
}
-TEST_F(NotificationProviderServiceTest, ExpectFailSendMessage)
-{
- OIC::Service::NSResult result = OIC::Service::NSResult::OK;
- result = OIC::Service::NSProviderService::getInstance()->sendMessage(nullptr);
-
- EXPECT_EQ(result, OIC::Service::NSResult::ERROR);
-}
TEST_F(NotificationProviderServiceTest, CancelObserves)
{