separated the scheduler interface and added callbackresponse.

change NSProviderInterface -> NSProvider
Added NSCallbackResponse.h and .c
included that file CallbackResponseSchedule instead of interfaceSchedule.

second patch included missing header file.wq

Change-Id: I7cd263f31be62faf979c1dee131c0afa02125280
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9455
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 75397e0..2da567e 100644 (file)
--- a/service/notification/SConscript
+++ b/service/notification/SConscript
@@ -121,14 +121,14 @@ consumersdk = notification_env.StaticLibrary('notification_consumer', notificati
 notification_env.InstallTarget(consumersdk, 'libnotification_consumer')
 notification_env.UserInstallTargetLib(consumersdk, 'libnotification_consumer')
 
-notification_env.UserInstallTargetHeader('include/NSProviderInterface.h',\
-       'service/notification', 'NSProviderInterface.h')
+notification_env.UserInstallTargetHeader('include/NSProvider.h',\
+       'service/notification', 'NSProvider.h')
 notification_env.UserInstallTargetHeader('include/NSConsumerInterface.h',\
        'service/notification', 'NSConsumerInterface.h')
 
 # Go to build Unit test
 # if target_os == 'linux':
-#      SConscript('unittest/SConscript')
+#SConscript('unittest/SConscript')
 
 # Go to build sample apps
 SConscript('examples/SConscript')

diff --git a/service/notification/android/notification-service/src/main/jni/notificationProvider.h b/service/notification/android/notification-service/src/main/jni/notificationProvider.h
index ffafb5c..9d6a057 100644 (file)
--- a/service/notification/android/notification-service/src/main/jni/notificationProvider.h
+++ b/service/notification/android/notification-service/src/main/jni/notificationProvider.h
@@ -19,7 +19,8 @@
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
 \r
 #include <jni.h>\r
-#include "NSProviderInterface.h"\r
+\r
+#include "NSProvider.h"\r
 #include "NSCommon.h"\r
 \r
 #ifndef NOTIFICATION_JNI_H\r

diff --git a/service/notification/examples/linux/notificationprovider.c b/service/notification/examples/linux/notificationprovider.c
index 94c06ce..ff7343c 100644 (file)
--- a/service/notification/examples/linux/notificationprovider.c
+++ b/service/notification/examples/linux/notificationprovider.c
@@ -22,8 +22,9 @@
 #include <stdbool.h>\r
 #include <stdlib.h>\r
 #include <unistd.h>\r
+\r
+#include "NSProvider.h"\r
 #include "NSCommon.h"\r
-#include "NSProviderInterface.h"\r
 #include "logger.h"\r
 #include "octypes.h"\r
 #include "pthread.h"\r

diff --git a/service/notification/include/NSProviderInterface.h b/service/notification/include/NSProvider.h
similarity index 100%
rename from service/notification/include/NSProviderInterface.h
rename to service/notification/include/NSProvider.h

diff --git a/service/notification/src/common/NSConstants.h b/service/notification/src/common/NSConstants.h
index fc1f04a..9db4b55 100644 (file)
--- a/service/notification/src/common/NSConstants.h
+++ b/service/notification/src/common/NSConstants.h
@@ -93,7 +93,7 @@ typedef enum eConnectionState
 
 typedef enum eSchedulerType
 {
-    INTERFACE_SCHEDULER = 0,
+    CALLBACK_RESPONSE_SCHEDULER = 0,
     DISCOVERY_SCHEDULER = 1,
     SUBSCRIPTION_SCHEDULER = 2,
     NOTIFICATION_SCHEDULER = 3,

diff --git a/service/notification/src/provider/NSProviderInterface.c b/service/notification/src/provider/NSProvider.c
similarity index 64%
rename from service/notification/src/provider/NSProviderInterface.c
rename to service/notification/src/provider/NSProvider.c
index 53baa56..511114e 100644 (file)
--- a/service/notification/src/provider/NSProviderInterface.c
+++ b/service/notification/src/provider/NSProvider.c
@@ -18,11 +18,12 @@
 //\r
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
 \r
-#include "NSProviderInterface.h"\r
+#include "NSProvider.h"\r
 #include "NSProviderScheduler.h"\r
 #include "NSProviderListener.h"\r
 #include "NSProviderSubscription.h"\r
 #include "NSProviderNotification.h"\r
+#include "NSProviderCallbackResponse.h"\r
 #include "NSStorageAdapter.h"\r
 #include "NSProviderMemoryCache.h"\r
 #include "oic_malloc.h"\r
@@ -32,8 +33,6 @@
 #include "oic_time.h"\r
 \r
 bool initProvider = false;\r
-static NSSubscribeRequestCallback g_subscribeRequestCb = NULL;\r
-static NSProviderSyncInfoCallback g_syncCb = NULL;\r
 \r
 pthread_mutex_t nsInitMutex;\r
 \r
@@ -43,34 +42,6 @@ void initializeMutex()
     nsInitMutex = initMutex;\r
 }\r
 \r
-void NSRegisterSubscribeRequestCb(NSSubscribeRequestCallback subscribeRequestCb)\r
-{\r
-    NS_LOG(DEBUG, "NSRegisterSubscribeRequestCb - IN");\r
-    g_subscribeRequestCb = subscribeRequestCb;\r
-    NS_LOG(DEBUG, "NSRegisterSubscribeRequestCb - OUT");\r
-}\r
-\r
-void  NSRegisterSyncCb(NSProviderSyncInfoCallback syncCb)\r
-{\r
-    NS_LOG(DEBUG, "NSRegisterSyncCb - IN");\r
-    g_syncCb = syncCb;\r
-    NS_LOG(DEBUG, "NSRegisterSyncCb - OUT");\r
-}\r
-\r
-void NSSubscribeRequestCb(NSConsumer *consumer)\r
-{\r
-    NS_LOG(DEBUG, "NSSubscribeRequestCb - IN");\r
-    g_subscribeRequestCb(consumer);\r
-    NS_LOG(DEBUG, "NSSubscribeRequestCb - OUT");\r
-}\r
-\r
-void NSSyncCb(NSSyncInfo *sync)\r
-{\r
-    NS_LOG(DEBUG, "NSSyncCb - IN");\r
-    g_syncCb(sync);\r
-    NS_LOG(DEBUG, "NSSyncCb - OUT");\r
-}\r
-\r
 NSResult NSStartProvider(NSAccessPolicy policy, NSSubscribeRequestCallback subscribeRequestCb,\r
         NSProviderSyncInfoCallback syncCb)\r
 {\r
@@ -88,8 +59,8 @@ NSResult NSStartProvider(NSAccessPolicy policy, NSSubscribeRequestCallback subsc
         NSSetSubscriptionAccessPolicy(policy);\r
         NSRegisterSubscribeRequestCb(subscribeRequestCb);\r
         NSRegisterSyncCb(syncCb);\r
-        CARegisterNetworkMonitorHandler(NSProviderAdapterStateListener,\r
-                NSProviderConnectionStateListener);\r
+        CARegisterNetworkMonitorHandler((CAAdapterStateChangedCB)NSProviderAdapterStateListener,\r
+                (CAConnectionStateChangedCB)NSProviderConnectionStateListener);\r
 \r
         NSSetList();\r
         NSInitScheduler();\r
@@ -152,8 +123,6 @@ NSResult NSProviderEnableRemoteService(char *serverAddress)
     }\r
 \r
     NS_LOG_V(DEBUG, "Remote server address: %s", serverAddress);\r
-    NSSetRemoteServerAddress(serverAddress);\r
-\r
     NSPushQueue(DISCOVERY_SCHEDULER, TASK_PUBLISH_RESOURCE, serverAddress);\r
 \r
     pthread_mutex_unlock(&nsInitMutex);\r
@@ -172,7 +141,6 @@ NSResult NSProviderDisableRemoteService(char *serverAddress)
         return NS_FAIL;\r
     }\r
     NS_LOG_V(DEBUG, "Remote server address: %s", serverAddress);\r
-    NSDeleteRemoteServerAddress(serverAddress);\r
 \r
     pthread_mutex_unlock(&nsInitMutex);\r
     NS_LOG(DEBUG, "NSProviderDisableRemoteService - OUT");\r
@@ -253,65 +221,3 @@ NSMessage * NSCreateMessage()
     NS_LOG(DEBUG, "NSCreateMessage - OUT");\r
     return msg;\r
 }\r
-\r
-void * NSInterfaceSchedule(void * ptr)\r
-{\r
-    if (ptr == NULL)\r
-    {\r
-        NS_LOG(DEBUG, "Create NSReponseSchedule");\r
-    }\r
-\r
-    while (NSIsRunning[INTERFACE_SCHEDULER])\r
-    {\r
-        sem_wait(&NSSemaphore[INTERFACE_SCHEDULER]);\r
-        pthread_mutex_lock(&NSMutex[INTERFACE_SCHEDULER]);\r
-\r
-        if (NSHeadMsg[INTERFACE_SCHEDULER] != NULL)\r
-        {\r
-            NSTask *node = NSHeadMsg[INTERFACE_SCHEDULER];\r
-            NSHeadMsg[INTERFACE_SCHEDULER] = node->nextTask;\r
-\r
-            switch (node->taskType)\r
-            {\r
-                case TASK_CB_SUBSCRIPTION:\r
-                {\r
-                    NS_LOG(DEBUG, "CASE TASK_CB_SUBSCRIPTION : ");\r
-\r
-                    OCEntityHandlerRequest * request = (OCEntityHandlerRequest*)node->taskData;\r
-                    NSConsumer * consumer = (NSConsumer *)OICMalloc(sizeof(NSConsumer));\r
-\r
-                    char * consumerId = NSGetValueFromQuery(OICStrdup(request->query),\r
-                            NS_QUERY_CONSUMER_ID);\r
-\r
-                    if(consumerId)\r
-                    {\r
-                        OICStrcpy(consumer->consumerId, UUID_STRING_SIZE, consumerId);\r
-                        NSSubscribeRequestCb(consumer);\r
-                    }\r
-\r
-                    NSFreeConsumer(consumer);\r
-                    NSFreeOCEntityHandlerRequest(request);\r
-\r
-                    break;\r
-                }\r
-                case TASK_CB_SYNC:\r
-                {\r
-                    NS_LOG(DEBUG, "CASE TASK_CB_SYNC : ");\r
-                    NSSyncInfo * sync = (NSSyncInfo*)node->taskData;\r
-                    NSSyncCb(NSDuplicateSync(sync));\r
-                    NSFreeSync(sync);\r
-                    break;\r
-                }\r
-                default:\r
-                    NS_LOG(DEBUG, "No Task Type");\r
-                    break;\r
-            }\r
-            OICFree(node);\r
-        }\r
-\r
-        pthread_mutex_unlock(&NSMutex[INTERFACE_SCHEDULER]);\r
-    }\r
-\r
-    NS_LOG(DEBUG, "Destroy NSResponseSchedule");\r
-    return NULL;\r
-}\r

diff --git a/service/notification/src/provider/NSProviderCallbackResponse.c b/service/notification/src/provider/NSProviderCallbackResponse.c
new file mode 100644 (file)
index 0000000..d92afd6
--- /dev/null
+++ b/service/notification/src/provider/NSProviderCallbackResponse.c
@@ -0,0 +1,129 @@
+//******************************************************************\r
+//\r
+// Copyright 2016 Samsung Electronics All Rights Reserved.\r
+//\r
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
+//\r
+// Licensed under the Apache License, Version 2.0 (the "License");\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+//      http://www.apache.org/licenses/LICENSE-2.0\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
+\r
+#include "NSProvider.h"\r
+#include "NSProviderScheduler.h"\r
+#include "NSProviderListener.h"\r
+#include "NSProviderSubscription.h"\r
+#include "NSProviderNotification.h"\r
+#include "NSStorageAdapter.h"\r
+#include "NSProviderMemoryCache.h"\r
+#include "NSProviderCallbackResponse.h"\r
+#include "oic_malloc.h"\r
+#include "oic_string.h"\r
+#include "cautilinterface.h"\r
+#include "NSProviderSystem.h"\r
+#include "oic_time.h"\r
+\r
+static NSSubscribeRequestCallback g_subscribeRequestCb = NULL;\r
+static NSProviderSyncInfoCallback g_syncCb = NULL;\r
+\r
+pthread_mutex_t nsInitMutex;\r
+\r
+void NSRegisterSubscribeRequestCb(NSSubscribeRequestCallback subscribeRequestCb)\r
+{\r
+    NS_LOG(DEBUG, "NSRegisterSubscribeRequestCb - IN");\r
+    g_subscribeRequestCb = subscribeRequestCb;\r
+    NS_LOG(DEBUG, "NSRegisterSubscribeRequestCb - OUT");\r
+}\r
+\r
+void  NSRegisterSyncCb(NSProviderSyncInfoCallback syncCb)\r
+{\r
+    NS_LOG(DEBUG, "NSRegisterSyncCb - IN");\r
+    g_syncCb = syncCb;\r
+    NS_LOG(DEBUG, "NSRegisterSyncCb - OUT");\r
+}\r
+\r
+void NSSubscribeRequestCb(NSConsumer *consumer)\r
+{\r
+    NS_LOG(DEBUG, "NSSubscribeRequestCb - IN");\r
+    g_subscribeRequestCb(consumer);\r
+    NS_LOG(DEBUG, "NSSubscribeRequestCb - OUT");\r
+}\r
+\r
+void NSSyncCb(NSSyncInfo *sync)\r
+{\r
+    NS_LOG(DEBUG, "NSSyncCb - IN");\r
+    g_syncCb(sync);\r
+    NS_LOG(DEBUG, "NSSyncCb - OUT");\r
+}\r
+\r
+void * NSCallbackResponseSchedule(void * ptr)\r
+{\r
+    if (ptr == NULL)\r
+    {\r
+        NS_LOG(DEBUG, "Create NSReponseSchedule");\r
+    }\r
+\r
+    while (NSIsRunning[CALLBACK_RESPONSE_SCHEDULER])\r
+    {\r
+        sem_wait(&NSSemaphore[CALLBACK_RESPONSE_SCHEDULER]);\r
+        pthread_mutex_lock(&NSMutex[CALLBACK_RESPONSE_SCHEDULER]);\r
+\r
+        if (NSHeadMsg[CALLBACK_RESPONSE_SCHEDULER] != NULL)\r
+        {\r
+            NSTask *node = NSHeadMsg[CALLBACK_RESPONSE_SCHEDULER];\r
+            NSHeadMsg[CALLBACK_RESPONSE_SCHEDULER] = node->nextTask;\r
+\r
+            switch (node->taskType)\r
+            {\r
+                case TASK_CB_SUBSCRIPTION:\r
+                {\r
+                    NS_LOG(DEBUG, "CASE TASK_CB_SUBSCRIPTION : ");\r
+\r
+                    OCEntityHandlerRequest * request = (OCEntityHandlerRequest*)node->taskData;\r
+                    NSConsumer * consumer = (NSConsumer *)OICMalloc(sizeof(NSConsumer));\r
+\r
+                    char * consumerId = NSGetValueFromQuery(OICStrdup(request->query),\r
+                            NS_QUERY_CONSUMER_ID);\r
+\r
+                    if(consumerId)\r
+                    {\r
+                        OICStrcpy(consumer->consumerId, UUID_STRING_SIZE, consumerId);\r
+                        NSSubscribeRequestCb(consumer);\r
+                    }\r
+\r
+                    NSFreeConsumer(consumer);\r
+                    NSFreeOCEntityHandlerRequest(request);\r
+\r
+                    break;\r
+                }\r
+                case TASK_CB_SYNC:\r
+                {\r
+                    NS_LOG(DEBUG, "CASE TASK_CB_SYNC : ");\r
+                    NSSyncInfo * sync = (NSSyncInfo*)node->taskData;\r
+                    NSSyncCb(NSDuplicateSync(sync));\r
+                    NSFreeSync(sync);\r
+                    break;\r
+                }\r
+                default:\r
+                    NS_LOG(DEBUG, "No Task Type");\r
+                    break;\r
+            }\r
+            OICFree(node);\r
+        }\r
+\r
+        pthread_mutex_unlock(&NSMutex[CALLBACK_RESPONSE_SCHEDULER]);\r
+    }\r
+\r
+    NS_LOG(DEBUG, "Destroy NSResponseSchedule");\r
+    return NULL;\r
+}\r
+\r

diff --git a/service/notification/src/provider/NSProviderCallbackResponse.h b/service/notification/src/provider/NSProviderCallbackResponse.h
new file mode 100644 (file)
index 0000000..d0d8275
--- /dev/null
+++ b/service/notification/src/provider/NSProviderCallbackResponse.h
@@ -0,0 +1,37 @@
+//******************************************************************\r
+//\r
+// Copyright 2016 Samsung Electronics All Rights Reserved.\r
+//\r
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
+//\r
+// Licensed under the Apache License, Version 2.0 (the "License");\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+//      http://www.apache.org/licenses/LICENSE-2.0\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distributed under the License is distributed on an "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+//\r
+//-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\r
+\r
+#ifndef _NS_PROVIDER_CALLBACK_RESPONSE__H_\r
+#define _NS_PROVIDER_CALLBACK_RESPONSE__H_\r
+\r
+#include <string.h>\r
+#include "logger.h"\r
+#include "NSCommon.h"\r
+#include "NSConstants.h"\r
+#include "oic_malloc.h"\r
+#include "NSStructs.h"\r
+#include "NSUtil.h"\r
+\r
+void NSRegisterSubscribeRequestCb(NSSubscribeRequestCallback subscribeRequestCb);\r
+void NSRegisterSyncCb(NSProviderSyncInfoCallback syncCb);\r
+void NSSubscribeRequestCb(NSConsumer *consumer);\r
+void NSSyncCb(NSSyncInfo *sync);\r
+\r
+#endif /* _NS_PROVIDER_CALLBACK_RESPONSE__H_ */\r

diff --git a/service/notification/src/provider/NSProviderNotification.c b/service/notification/src/provider/NSProviderNotification.c
index a2a60f1..cc1e792 100644 (file)
--- a/service/notification/src/provider/NSProviderNotification.c
+++ b/service/notification/src/provider/NSProviderNotification.c
@@ -266,7 +266,7 @@ void * NSNotificationSchedule(void *ptr)
                 case TASK_RECV_READ:
                     NS_LOG(DEBUG, "CASE TASK_RECV_READ : ");
                     NSSendSync((NSSyncInfo*) node->taskData);
-                    NSPushQueue(INTERFACE_SCHEDULER, TASK_CB_SYNC, node->taskData);
+                    NSPushQueue(CALLBACK_RESPONSE_SCHEDULER, TASK_CB_SYNC, node->taskData);
                     break;
 
                 default:

diff --git a/service/notification/src/provider/NSProviderScheduler.c b/service/notification/src/provider/NSProviderScheduler.c
index 072866c..9e9173f 100755 (executable)
--- a/service/notification/src/provider/NSProviderScheduler.c
+++ b/service/notification/src/provider/NSProviderScheduler.c
@@ -23,13 +23,12 @@
 pthread_t NSThread[THREAD_COUNT];\r
 pthread_mutex_t NSMutex[THREAD_COUNT];\r
 sem_t NSSemaphore[THREAD_COUNT];\r
-bool NSIsRunning[THREAD_COUNT] =\r
-{ false, };\r
+bool NSIsRunning[THREAD_COUNT] = { false, };\r
 \r
 NSTask* NSHeadMsg[THREAD_COUNT];\r
 NSTask* NSTailMsg[THREAD_COUNT];\r
 \r
-void * NSInterfaceSchedule(void *ptr);\r
+void * NSCallbackResponseSchedule(void *ptr);\r
 void * NSDiscoverySchedule(void *ptr);\r
 void * NSSubScriptionSchedule(void *ptr);\r
 void * NSNotificationSchedule(void *ptr);\r
@@ -62,10 +61,10 @@ bool NSStartScheduler()
 \r
         switch (i)\r
         {\r
-            case INTERFACE_SCHEDULER:\r
+            case CALLBACK_RESPONSE_SCHEDULER:\r
             {\r
                 NS_LOG(DEBUG, "CASE RESPONSE_SCHEDULER :");\r
-                pthread_create(&NSThread[i], NULL, NSInterfaceSchedule, NULL);\r
+                pthread_create(&NSThread[i], NULL, NSCallbackResponseSchedule, NULL);\r
             }\r
                 break;\r
 \r
@@ -184,7 +183,7 @@ void NSFreeData(NSSchedulerType type, NSTask * task)
 {\r
     NS_LOG(DEBUG, "NSFreeData - IN");\r
 \r
-    if (type == INTERFACE_SCHEDULER)\r
+    if (type == CALLBACK_RESPONSE_SCHEDULER)\r
     {\r
         switch (task->taskType)\r
         {\r

diff --git a/service/notification/src/provider/NSProviderScheduler.h b/service/notification/src/provider/NSProviderScheduler.h
index 961e193..cd3b7a9 100755 (executable)
--- a/service/notification/src/provider/NSProviderScheduler.h
+++ b/service/notification/src/provider/NSProviderScheduler.h
@@ -42,7 +42,7 @@ extern pthread_mutex_t NSMutex[THREAD_COUNT];
 extern sem_t NSSemaphore[THREAD_COUNT];\r
 extern bool NSIsRunning[THREAD_COUNT];\r
 \r
-extern void * NSResponseSchedule(void *ptr);\r
+extern void * NSCallbackResponseSchedule(void *ptr);\r
 extern void * NSDiscoverySchedule(void *ptr);\r
 extern void * NSSubScriptionSchedule(void *ptr);\r
 extern void * NSNotificationSchedule(void *ptr);\r

diff --git a/service/notification/src/provider/NSProviderSubscription.c b/service/notification/src/provider/NSProviderSubscription.c
index 361a2e8..91f0325 100644 (file)
--- a/service/notification/src/provider/NSProviderSubscription.c
+++ b/service/notification/src/provider/NSProviderSubscription.c
@@ -245,7 +245,7 @@ void NSAskAcceptanceToUser(OCEntityHandlerRequest *entityHandlerRequest)
 {\r
     NS_LOG(DEBUG, "NSAskAcceptanceToUser - IN");\r
 \r
-    NSPushQueue(INTERFACE_SCHEDULER, TASK_CB_SUBSCRIPTION, entityHandlerRequest);\r
+    NSPushQueue(CALLBACK_RESPONSE_SCHEDULER, TASK_CB_SUBSCRIPTION, entityHandlerRequest);\r
 \r
     NS_LOG(DEBUG, "NSAskAcceptanceToUser - OUT");\r
 }\r

diff --git a/service/notification/unittest/NSProviderTest.cpp b/service/notification/unittest/NSProviderTest.cpp
index 41c7fab..782bbc5 100644 (file)
--- a/service/notification/unittest/NSProviderTest.cpp
+++ b/service/notification/unittest/NSProviderTest.cpp
@@ -18,6 +18,8 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
+#include "../include/NSProvider.h"
+
 #include <gtest/gtest.h>
 #include <HippoMocks/hippomocks.h>
 #include <atomic>
@@ -29,7 +31,6 @@
 #include "NSConsumerSimulator.h"
 
 #include "NSCommon.h"
-#include "NSProviderInterface.h"
 
 namespace
 {