tests: support msvc

divide mock library and executable for PDB and exports some core APIs for msvc testing. Signed-off-by: JeanTracker <[email protected]>
nugu-developers · May 30, 2024 · 4df9c41 · 4df9c41
1 parent 22166d5
commit 4df9c41
Show file tree

Hide file tree

Showing 13 changed files with 44 additions and 26 deletions.
diff --git a/src/clientkit/dialog_ux_state_aggregator.hh b/src/clientkit/dialog_ux_state_aggregator.hh
@@ -25,15 +25,16 @@
 #include "clientkit/dialog_ux_state_aggregator_interface.hh"
 #include "clientkit/interaction_control_manager_interface.hh"
 #include "clientkit/session_manager_interface.hh"
+#include "nugu.h"
 
 namespace NuguClientKit {
 
 using namespace NuguCapability;
 
-class DialogUXStateAggregator : public IASRListener,
-                                public ITTSListener,
-                                public IChipsListener,
-                                public IInteractionControlManagerListener {
+class NUGU_API DialogUXStateAggregator : public IASRListener,
+                                         public ITTSListener,
+                                         public IChipsListener,
+                                         public IInteractionControlManagerListener {
 public:
     explicit DialogUXStateAggregator(ISessionManager* session_manager);
     virtual ~DialogUXStateAggregator();

diff --git a/src/clientkit/speech_recognizer_aggregator.hh b/src/clientkit/speech_recognizer_aggregator.hh
@@ -18,12 +18,13 @@
 #define __SPEECH_RECOGNIZER_AGGREGATOR_H__
 
 #include "clientkit/speech_recognizer_aggregator_interface.hh"
+#include "nugu.h"
 
 namespace NuguClientKit {
 
-class SpeechRecognizerAggregator : public ISpeechRecognizerAggregator,
-                                   public IWakeupListener,
-                                   public IASRListener {
+class NUGU_API SpeechRecognizerAggregator : public ISpeechRecognizerAggregator,
+                                            public IWakeupListener,
+                                            public IASRListener {
 public:
     SpeechRecognizerAggregator();
     virtual ~SpeechRecognizerAggregator();

diff --git a/src/core/directive_sequencer.hh b/src/core/directive_sequencer.hh
@@ -18,21 +18,22 @@
 #define __NUGU_DIRECTIVE_SEQUENCER_H__
 
 #include <map>
-#include <vector>
 #include <string>
+#include <vector>
 
 #include <glib.h>
 
 #include "clientkit/directive_sequencer_interface.hh"
+#include "nugu.h"
 
 namespace NuguCore {
 
 using namespace NuguClientKit;
 
-class LookupTable;
-class DialogDirectiveList;
+class NUGU_API LookupTable;
+class NUGU_API DialogDirectiveList;
 
-class DirectiveSequencer : public IDirectiveSequencer {
+class NUGU_API DirectiveSequencer : public IDirectiveSequencer {
 
 public:
     DirectiveSequencer();

diff --git a/src/core/focus_manager.hh b/src/core/focus_manager.hh
@@ -23,19 +23,20 @@
 #include <memory>
 
 #include "clientkit/focus_manager_interface.hh"
+#include "nugu.h"
 
 namespace NuguCore {
 
 using namespace NuguClientKit;
 
-class IFocusResourceObserver {
+class NUGU_API IFocusResourceObserver {
 public:
     virtual ~IFocusResourceObserver() = default;
 
     virtual void onFocusChanged(const std::string& type, const std::string& name, FocusState state) = 0;
 };
 
-class FocusResource {
+class NUGU_API FocusResource {
 public:
     FocusResource(const std::string& type, const std::string& name, int request_priority, int release_priority, IFocusResourceListener* listener, IFocusResourceObserver* observer);
     virtual ~FocusResource() = default;
@@ -55,8 +56,8 @@ public:
     IFocusResourceObserver* observer;
 };
 
-class FocusManager : public IFocusManager,
-                     public IFocusResourceObserver {
+class NUGU_API FocusManager : public IFocusManager,
+                              public IFocusResourceObserver {
 public:
     FocusManager();
     virtual ~FocusManager() = default;

diff --git a/src/core/interaction_control_manager.hh b/src/core/interaction_control_manager.hh
@@ -26,7 +26,7 @@ namespace NuguCore {
 
 using namespace NuguClientKit;
 
-class InteractionControlManager : public IInteractionControlManager {
+class NUGU_API InteractionControlManager : public IInteractionControlManager {
 public:
     using Requesters = std::set<std::string>;
 

diff --git a/src/core/media_player.hh b/src/core/media_player.hh
@@ -22,13 +22,14 @@
 #include "base/nugu_media.h"
 #include "base/nugu_player.h"
 #include "clientkit/media_player_interface.hh"
+#include "nugu.h"
 
 namespace NuguCore {
 
 using namespace NuguClientKit;
 
 class MediaPlayerPrivate;
-class MediaPlayer : public IMediaPlayer {
+class NUGU_API MediaPlayer : public IMediaPlayer {
 public:
     explicit MediaPlayer(int volume = NUGU_SET_VOLUME_MAX);
     virtual ~MediaPlayer();

diff --git a/src/core/nugu_timer.hh b/src/core/nugu_timer.hh
@@ -18,13 +18,14 @@
 #define __NUGU_TIMER_HH__
 
 #include "clientkit/nugu_timer_interface.hh"
+#include "nugu.h"
 
 namespace NuguCore {
 
 using namespace NuguClientKit;
 
-class NUGUTimerPrivate;
-class NUGUTimer : public INuguTimer {
+class NUGU_API NUGUTimerPrivate;
+class NUGU_API NUGUTimer : public INuguTimer {
 public:
     NUGUTimer(bool singleshot = false);
     virtual ~NUGUTimer();

diff --git a/src/core/playstack_manager.hh b/src/core/playstack_manager.hh
@@ -21,6 +21,7 @@
 #include <set>
 
 #include "clientkit/playsync_manager_interface.hh"
+#include "nugu.h"
 #include "nugu_timer.hh"
 
 namespace NuguCore {
@@ -33,21 +34,21 @@ enum class PlayStackRemoveMode {
     Later
 };
 
-class IPlayStackManagerListener {
+class NUGU_API IPlayStackManagerListener {
 public:
     virtual ~IPlayStackManagerListener() = default;
 
     virtual void onStackAdded(const std::string& ps_id) = 0;
     virtual void onStackRemoved(const std::string& ps_id) = 0;
 };
 
-class IStackTimer : public NUGUTimer {
+class NUGU_API IStackTimer : public NUGUTimer {
 public:
     virtual ~IStackTimer() = default;
     virtual bool isStarted() = 0;
 };
 
-class PlayStackManager {
+class NUGU_API PlayStackManager {
 public:
     using PlayStack = std::pair<std::map<std::string, PlayStackActivity>, std::vector<std::string>>;
     using PlayStackHoldTimes = struct _PlayStackHoldTimes {

diff --git a/src/core/playsync_manager.hh b/src/core/playsync_manager.hh
@@ -23,6 +23,7 @@
 #include <vector>
 
 #include "base/nugu_directive.h"
+#include "nugu.h"
 
 #include "clientkit/playsync_manager_interface.hh"
 #include "interaction_control_manager.hh"
@@ -32,8 +33,8 @@ namespace NuguCore {
 
 using namespace NuguClientKit;
 
-class PlaySyncManager : public IPlaySyncManager,
-                        public IPlayStackManagerListener {
+class NUGU_API PlaySyncManager : public IPlaySyncManager,
+                                 public IPlayStackManagerListener {
 public:
     PlaySyncManager();
     virtual ~PlaySyncManager();

diff --git a/src/core/routine_manager.hh b/src/core/routine_manager.hh
@@ -25,13 +25,14 @@
 #include <vector>
 
 #include "clientkit/routine_manager_interface.hh"
+#include "nugu.h"
 #include "nugu_timer.hh"
 
 namespace NuguCore {
 
 using namespace NuguClientKit;
 
-class RoutineManager : public IRoutineManager {
+class NUGU_API RoutineManager : public IRoutineManager {
 public:
     using RoutineAction = struct _RoutineAction {
         std::string type;

diff --git a/src/core/session_manager.hh b/src/core/session_manager.hh
@@ -21,12 +21,13 @@
 #include <vector>
 
 #include "clientkit/session_manager_interface.hh"
+#include "nugu.h"
 
 namespace NuguCore {
 
 using namespace NuguClientKit;
 
-class SessionManager : public ISessionManager {
+class NUGU_API SessionManager : public ISessionManager {
 public:
     using ActiveDialogs = std::vector<std::pair<std::string, int>>;
     using Sessions = std::map<std::string, Session>;

diff --git a/tests/core/CMakeLists.txt b/tests/core/CMakeLists.txt
@@ -18,6 +18,13 @@ SET(test_core_media_player_srcs
 	../../src/core/nugu_timer.cc
 	../../src/core/media_player.cc)
 
+# doesn't work timer mock in msvc cause of PDB issue.
+IF(MSVC)
+	LIST(REMOVE_ITEM UNIT_TESTS
+		"test_core_nugu_timer"
+		"test_core_media_player")
+ENDIF()
+
 FOREACH(test ${UNIT_TESTS})
 	SET(SRC ${test}.cc)
 	IF (${test}_srcs)

diff --git a/tests/core/test_core_focus_manager.cc b/tests/core/test_core_focus_manager.cc
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <string>
 
 #include <glib.h>