NS_LOG(DEBUG, "onNSProviderDiscovered - OUT");\r
}\r
\r
- void onNSProviderChanged(::NSProvider *provider, ::NSResponse response)\r
+ void onNSProviderChanged(::NSProvider *provider, ::NSProviderState response)\r
{\r
NS_LOG(DEBUG, "onNSProviderChanged - IN");\r
NS_LOG_V(DEBUG, "provider Id : %s", provider->providerId);\r
NS_LOG(DEBUG, "Start - IN");\r
m_config = config;\r
NSConsumerConfig nsConfig;\r
- nsConfig.discoverCb = onNSProviderDiscovered;\r
+\r
+ // TODO Check to changed c layer ConsumerConfig.\r
+ //nsConfig.discoverCb = onNSProviderDiscovered;\r
nsConfig.changedCb = onNSProviderChanged;\r
nsConfig.messageCb = onNSMessageReceived;\r
nsConfig.syncInfoCb = onNSSyncInfoReceived;\r
}
}
-void onProviderChanged(NSProvider * provider, NSResponse response)
+void onProviderChanged(NSProvider * provider, NSProviderState response)
{
printf("Provider changed: %d\n", response);
printf("subscribed provider Id : %s\n", provider->providerId);
} NSResult;
/**
- * Response code of notification service
+ * Provider state of notification consumer service
*/
-typedef enum eResponse
+typedef enum
{
- NS_DISCOVERED = 0,
NS_ALLOW = 1,
NS_DENY = 2,
NS_TOPIC = 3,
-
-} NSResponse;
+ NS_DISCOVERED = 11,
+ NS_STOPPED = 12
+} NSProviderState;
/**
* Notification message status to synchronize
/**
* Invoked when the provider state is changed
* @param[in] provider Provider which has the notification resource
- * @param[in] response Response which has the provider state
+ * @param[in] state Response which has the provider state
*/
-typedef void (* NSProviderStateCallback)(NSProvider *, NSResponse);
+typedef void (* NSProviderStateCallback)(NSProvider *, NSProviderState);
/**
* Invoked when the notification message from provider is received
*(NSGetProviderChangedCb()) = cb;
}
-void NSProviderChanged(NSProvider * provider, NSResponse response)
+void NSProviderChanged(NSProvider * provider, NSProviderState response)
{
(*(NSGetProviderChangedCb()))(provider, response);
}
void NSSetIsStartedConsumer(bool setValue);
void NSSetProviderChangedCb(NSProviderStateCallback cb);
-void NSProviderChanged(NSProvider * provider, NSResponse response);
+void NSProviderChanged(NSProvider * provider, NSProviderState response);
void NSSetMessagePostedCb(NSMessageReceivedCallback cb);
void NSMessagePost(NSMessage * obj);
NSResult ret = NSStorageDelete(providerCache, provider->providerId);
NS_VERIFY_NOT_NULL_V(ret == NS_OK ? (void *)1 : NULL);
+
+ NS_LOG_V(DEBUG, "Stopped Provider : %s", provider->providerId);
+ NSProvider * providerForCb = NSCopyProvider(provider);
+ NSProviderChanged(providerForCb, NS_STOPPED);
}
void NSConsumerHandleSubscribeSucceed(NSProvider_internal * provider)
NS_LOG(DEBUG, "call back to user");
NSProvider * prov = NSCopyProvider(provider);
- NSProviderChanged(prov, (NSResponse) msg->messageId);
+ NSProviderChanged(prov, (NSProviderState) msg->messageId);
NSRemoveProvider_internal(provider);
}
NS_LOG(DEBUG, "call back to user");
NSProvider * prov = NSCopyProvider(provider);
- NSProviderChanged((NSProvider *) prov, (NSResponse) NS_TOPIC);
+ NSProviderChanged((NSProvider *) prov, (NSProviderState) NS_TOPIC);
}
void NSConsumerInternalTaskProcessing(NSTask * task)
std::cout << __func__ << std::endl;
}
- static void NSProviderChangedCallback(NSProvider *, NSResponse)
+ static void NSProviderChangedCallback(NSProvider *, NSProviderState)
{
std::cout << __func__ << std::endl;
}
TEST_F(NotificationConsumerTest, DiscoverProviderWithNonAccepterWhenStartedConsumerFirst)
{
mocks.ExpectCallFunc(NSProviderChangedCallback).Do(
- [this](NSProvider *, NSResponse)
+ [this](NSProvider *, NSProviderState)
{
std::cout << "Call Discovered" << std::endl;
responseCon.notify_all();
}
mocks.ExpectCallFunc(NSProviderChangedCallback).Do(
- [this](NSProvider * provider, NSResponse)
+ [this](NSProvider * provider, NSProviderState)
{
std::cout << "Call Discovered" << std::endl;
g_provider = provider;
{
g_providerSimul.setAccepter((int)NSSelector::NS_SELECTION_CONSUMER);
mocks.ExpectCallFunc(NSProviderChangedCallback).Do(
- [this](NSProvider * provider, NSResponse)
+ [this](NSProvider * provider, NSProviderState)
{
std::cout << "Call Discovered" << std::endl;
g_provider = provider;