Fix build fail of consumer unittest.

When notification service build,
before unittest is commented why unittest has fail case and build error.
Fail case is resolved other patch by Jaesick.shin.
In this patch, build error is fixed.

Change-Id: Id5a588f719ae8b6eb1ac78bf987dd793da208c14
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10707
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/SConscript b/service/notification/SConscript
index a86fe421ea8b2ba0cc533e76f1c4757a7d349713..d9fc82007bffa942dfded272b0a1b88d48972128 100755 (executable)
--- a/service/notification/SConscript
+++ b/service/notification/SConscript
@@ -113,8 +113,8 @@ notification_env.UserInstallTargetHeader('include/NSConsumerInterface.h',\
        'service/notification', 'NSConsumerInterface.h')
 
 # Go to build Unit test
-#if target_os == 'linux':
-# SConscript('unittest/SConscript')
+if target_os == 'linux':
+    SConscript('unittest/SConscript')
 
 # Go to build sample apps
 SConscript('examples/SConscript')

diff --git a/service/notification/unittest/NSConsumerTest.cpp b/service/notification/unittest/NSConsumerTest.cpp
index 6f2378613fa03f607e382acaeb4101155f4463bd..d60d7d84b7f16b85fb70df9d6b50257c64fdd655 100644 (file)
--- a/service/notification/unittest/NSConsumerTest.cpp
+++ b/service/notification/unittest/NSConsumerTest.cpp
@@ -104,7 +104,7 @@ public:
         std::cout << __func__ << std::endl;
     }
 
-    static void NSSubscriptionAcceptedCallback(NSProvider *)
+    static void NSProviderChangedCallback(NSProvider *,  NSResponse)
     {
         std::cout << __func__ << std::endl;
     }
@@ -152,7 +152,7 @@ TEST_F(NotificationConsumerTest, StartConsumerPositive)
 {
     NSConsumerConfig cfg;
     cfg.discoverCb = NSProviderDiscoveredCallbackEmpty;
-    cfg.acceptedCb = NSSubscriptionAcceptedCallback;
+    cfg.changedCb = NSProviderChangedCallback;
     cfg.messageCb = NSNotificationReceivedCallbackEmpty;
     cfg.syncInfoCb = NSSyncCallbackEmpty;
     EXPECT_EQ(NS_OK, NSStartConsumer(cfg));
@@ -174,7 +174,7 @@ TEST_F(NotificationConsumerTest, DiscoverProviderWithNonAccepterWhenStartedConsu
 
     NSConsumerConfig cfg;
     cfg.discoverCb = NSProviderDiscoveredCallbackEmpty;
-    cfg.acceptedCb = NSSubscriptionAcceptedCallback;
+    cfg.changedCb = NSProviderChangedCallback;
     cfg.messageCb = NSNotificationReceivedCallbackEmpty;
     cfg.syncInfoCb = NSSyncCallbackEmpty;
     NSStartConsumer(cfg);
@@ -208,7 +208,7 @@ TEST_F(NotificationConsumerTest, DiscoverProviderWithNonAccepterWhenStartedConsu
 
     NSConsumerConfig cfg;
     cfg.discoverCb = NSProviderDiscoveredCallbackEmpty;
-    cfg.acceptedCb = NSSubscriptionAcceptedCallback;
+    cfg.changedCb = NSProviderChangedCallback;
     cfg.messageCb = NSNotificationReceivedCallbackEmpty;
     cfg.syncInfoCb = NSSyncCallbackEmpty;
     NSStartConsumer(cfg);
@@ -283,7 +283,7 @@ TEST_F(NotificationConsumerTest, ExpectReceiveNotificationWithAccepterisProvider
 
     NSConsumerConfig cfg;
     cfg.discoverCb = NSProviderDiscoveredCallbackEmpty;
-    cfg.acceptedCb = NSSubscriptionAcceptedCallback;
+    cfg.changedCb = NSProviderChangedCallback;
     cfg.messageCb = NSNotificationReceivedCallbackEmpty;
     cfg.syncInfoCb = NSSyncCallbackEmpty;
     NSStartConsumer(cfg);