7 files changed, 19 insertions, 60 deletions
diff --git a/src/plugins/test/common/ConsoleLogger.cpp b/src/plugins/test/common/ConsoleLogger.cpp
index d4f9eef..d6735f4 100644
--- a/src/plugins/test/common/ConsoleLogger.cpp
+++ b/src/plugins/test/common/ConsoleLogger.cpp
@@ -16,8 +16,7 @@
 #include <iostream>
 
 #include "test/common/ConsoleLogger.h"
-
-namespace vshl {
+namespace vshlcore {
 namespace test {
 namespace common {
 
diff --git a/src/plugins/test/common/ConsoleLogger.h b/src/plugins/test/common/ConsoleLogger.h
index 11bc0d8..916b48f 100644
--- a/src/plugins/test/common/ConsoleLogger.h
+++ b/src/plugins/test/common/ConsoleLogger.h
@@ -18,12 +18,11 @@
 #include "interfaces/utilities/logging/ILogger.h"
 
 using namespace std;
-
-namespace vshl {
+namespace vshlcore {
 namespace test {
 namespace common {
 
-class ConsoleLogger : public vshl::common::interfaces::ILogger {
+class ConsoleLogger : public vshlcore::common::interfaces::ILogger {
 public:
   // ILogger interface
   void log(Level level, const std::string &tag,
diff --git a/src/plugins/test/mocks/AFBApiMock.h b/src/plugins/test/mocks/AFBApiMock.h
index 46e2e99..846468d 100644
--- a/src/plugins/test/mocks/AFBApiMock.h
+++ b/src/plugins/test/mocks/AFBApiMock.h
@@ -18,11 +18,10 @@
 #include <gmock/gmock.h>
 
 #include "interfaces/afb/IAFBApi.h"
-
-namespace vshl {
+namespace vshlcore {
 namespace test {
 
-class AFBApiMock : public vshl::common::interfaces::IAFBApi {
+class AFBApiMock : public vshlcore::common::interfaces::IAFBApi {
 public:
     MOCK_METHOD1(createEvent, std::shared_ptr<IAFBEvent>(const std::string& eventName));
     MOCK_METHOD6(
diff --git a/src/plugins/test/mocks/AFBEventMock.h b/src/plugins/test/mocks/AFBEventMock.h
index 3d78e9f..0e47029 100644
--- a/src/plugins/test/mocks/AFBEventMock.h
+++ b/src/plugins/test/mocks/AFBEventMock.h
@@ -18,11 +18,10 @@
 #include <gmock/gmock.h>
 
 #include "interfaces/afb/IAFBApi.h"
-
-namespace vshl {
+namespace vshlcore {
 namespace test {
 
-class AFBEventMock : public vshl::common::interfaces::IAFBApi::IAFBEvent {
+class AFBEventMock : public vshlcore::common::interfaces::IAFBApi::IAFBEvent {
 public:
     void setName(const std::string& name) {
         mName = name;
@@ -34,8 +33,8 @@ public:
 
     MOCK_METHOD0(isValid, bool());
     MOCK_METHOD1(publishEvent, int(struct json_object* payload));
-    MOCK_METHOD1(subscribe, bool(vshl::common::interfaces::IAFBRequest& request));
-    MOCK_METHOD1(unsubscribe, bool(vshl::common::interfaces::IAFBRequest& request));
+    MOCK_METHOD1(subscribe, bool(vshlcore::common::interfaces::IAFBRequest& request));
+    MOCK_METHOD1(unsubscribe, bool(vshlcore::common::interfaces::IAFBRequest& request));
 
 private:
     std::string mName;
diff --git a/src/plugins/test/mocks/AFBRequestMock.h b/src/plugins/test/mocks/AFBRequestMock.h
index 5557565..02cc34e 100644
--- a/src/plugins/test/mocks/AFBRequestMock.h
+++ b/src/plugins/test/mocks/AFBRequestMock.h
@@ -18,11 +18,10 @@
 #include <gmock/gmock.h>
 
 #include "interfaces/afb/IAFBApi.h"
-
-namespace vshl {
+namespace vshlcore {
 namespace test {
 
-class AFBRequestMock : public vshl::common::interfaces::IAFBRequest {
+class AFBRequestMock : public vshlcore::common::interfaces::IAFBRequest {
 public:
     MOCK_METHOD0(getNativeRequest, void*());
 };
diff --git a/src/plugins/test/mocks/CapabilityMock.h b/src/plugins/test/mocks/CapabilityMock.h
deleted file mode 100644
index a2201df..0000000
--- a/src/plugins/test/mocks/CapabilityMock.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2018-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-#ifndef VSHL_TEST_MOCKS_CAPABILITYMOCK_H_
-#define VSHL_TEST_MOCKS_CAPABILITYMOCK_H_
-
-#include <gmock/gmock.h>
-
-#include "interfaces/capabilities/ICapability.h"
-
-namespace vshl {
-namespace test {
-
-class CapabilityMock : public vshl::common::interfaces::ICapability {
-public:
-    MOCK_CONST_METHOD0(getName, std::string());
-    MOCK_CONST_METHOD0(getUpstreamMessages, std::list<std::string>());
-    MOCK_CONST_METHOD0(getDownstreamMessages, std::list<std::string>());
-};
-
-}  // namespace test
-}  // namespace vshl
-
-#endif  // VSHL_TEST_MOCKS_CAPABILITYMOCK_H_
-\ No newline at end of file
diff --git a/src/plugins/test/mocks/VoiceAgentsChangeObserverMock.h b/src/plugins/test/mocks/VoiceAgentsChangeObserverMock.h
index 6edeea2..5935ab6 100644
--- a/src/plugins/test/mocks/VoiceAgentsChangeObserverMock.h
+++ b/src/plugins/test/mocks/VoiceAgentsChangeObserverMock.h
@@ -18,18 +18,17 @@
 #include <gmock/gmock.h>
 
 #include "interfaces/voiceagents/IVoiceAgentsChangeObserver.h"
-
-namespace vshl {
+namespace vshlcore {
 namespace test {
 
-class VoiceAgentsChangeObserverMock : public vshl::common::interfaces::IVoiceAgentsChangeObserver {
+class VoiceAgentsChangeObserverMock : public vshlcore::common::interfaces::IVoiceAgentsChangeObserver {
 public:
-    MOCK_METHOD1(OnDefaultVoiceAgentChanged, void(shared_ptr<vshl::common::interfaces::IVoiceAgent> defaultVoiceAgent));
-    MOCK_METHOD1(OnVoiceAgentAdded, void(shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent));
-    MOCK_METHOD1(OnVoiceAgentRemoved, void(shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent));
-    MOCK_METHOD1(OnVoiceAgentActiveWakeWordChanged, void(shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent));
-    MOCK_METHOD1(OnVoiceAgentActivated, void(shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent));
-    MOCK_METHOD1(OnVoiceAgentDeactivated, void(shared_ptr<vshl::common::interfaces::IVoiceAgent> voiceAgent));
+    MOCK_METHOD1(OnDefaultVoiceAgentChanged, void(shared_ptr<vshlcore::common::interfaces::IVoiceAgent> defaultVoiceAgent));
+    MOCK_METHOD1(OnVoiceAgentAdded, void(shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent));
+    MOCK_METHOD1(OnVoiceAgentRemoved, void(shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent));
+    MOCK_METHOD1(OnVoiceAgentActiveWakeWordChanged, void(shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent));
+    MOCK_METHOD1(OnVoiceAgentActivated, void(shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent));
+    MOCK_METHOD1(OnVoiceAgentDeactivated, void(shared_ptr<vshlcore::common::interfaces::IVoiceAgent> voiceAgent));
 };
 
 }  // namespace test