rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #848 from chewi/TEST_ENV 

Rename TEST_ENV macro to BARRIER_TEST_ENV
This commit is contained in:
Povilas Kanapickas 2020-08-23 14:25:48 +03:00 committed by GitHub
parent c3aba1b20b 1418196af1
commit 600d31f29b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/barrier/KeyMap.h
View File

@ -24,7 +24,7 @@
#include "common/stdset.h" #include "common/stdset.h"
#include "common/stdvector.h" #include "common/stdvector.h"
#ifdef TEST_ENV #ifdef BARRIER_TEST_ENV
#include <gtest/gtest_prod.h> #include <gtest/gtest_prod.h>
#endif #endif
@ -329,7 +329,7 @@ public:
//@} //@}
private: private:
#ifdef TEST_ENV #ifdef BARRIER_TEST_ENV
FRIEND_TEST(KeyMapTests, FRIEND_TEST(KeyMapTests,
findBestKey_requiredDown_matchExactFirstItem); findBestKey_requiredDown_matchExactFirstItem);
FRIEND_TEST(KeyMapTests, FRIEND_TEST(KeyMapTests,

2
src/lib/barrier/Screen.h
View File

@ -42,7 +42,7 @@ public:
Screen(IPlatformScreen* platformScreen, IEventQueue* events); Screen(IPlatformScreen* platformScreen, IEventQueue* events);
virtual ~Screen(); virtual ~Screen();
#ifdef TEST_ENV #ifdef BARRIER_TEST_ENV
Screen() : m_mock(true) { } Screen() : m_mock(true) { }
#endif #endif

2
src/lib/client/ServerProxy.h
View File

@ -59,7 +59,7 @@ public:
// sending dragging information to server // sending dragging information to server
void sendDragInfo(UInt32 fileCount, const char* info, size_t size); void sendDragInfo(UInt32 fileCount, const char* info, size_t size);
#ifdef TEST_ENV #ifdef BARRIER_TEST_ENV
void handleDataForTest() { handleData(Event(), NULL); } void handleDataForTest() { handleData(Event(), NULL); }
#endif #endif

2
src/lib/ipc/IpcServer.h
View File

@ -82,7 +82,7 @@ private:
ClientList m_clients; ClientList m_clients;
mutable std::mutex m_clientsMutex; mutable std::mutex m_clientsMutex;
#ifdef TEST_ENV #ifdef BARRIER_TEST_ENV
public: public:
IpcServer() : IpcServer() :
m_mock(true), m_mock(true),

4
src/lib/platform/XWindowsKeyState.h
View File

@ -136,7 +136,7 @@ private:
bool m_lock; bool m_lock;
}; };
#ifdef TEST_ENV #ifdef BARRIER_TEST_ENV
public: // yuck public: // yuck
#endif #endif
typedef std::vector<KeyModifierMask> KeyModifierMaskList; typedef std::vector<KeyModifierMask> KeyModifierMaskList;
@ -169,7 +169,7 @@ private:
// autorepeat state // autorepeat state
XKeyboardState m_keyboardState; XKeyboardState m_keyboardState;
#ifdef TEST_ENV #ifdef BARRIER_TEST_ENV
public: public:
SInt32 group() const { return m_group; } SInt32 group() const { return m_group; }
void group(const SInt32& group) { m_group = group; } void group(const SInt32& group) { m_group = group; }

2
src/lib/server/Config.h
View File

@ -174,7 +174,7 @@ public:
Config(IEventQueue* events); Config(IEventQueue* events);
virtual ~Config(); virtual ~Config();
#ifdef TEST_ENV #ifdef BARRIER_TEST_ENV
Config() : m_inputFilter(NULL) { } Config() : m_inputFilter(NULL) { }
#endif #endif

2
src/lib/server/InputFilter.h
View File

@ -333,7 +333,7 @@ public:
InputFilter(const InputFilter&); InputFilter(const InputFilter&);
virtual ~InputFilter(); virtual ~InputFilter();
#ifdef TEST_ENV #ifdef BARRIER_TEST_ENV
InputFilter() : m_primaryClient(NULL) { } InputFilter() : m_primaryClient(NULL) { }
#endif #endif

2
src/lib/server/PrimaryClient.h
View File

@ -37,7 +37,7 @@ public:
PrimaryClient(const std::string& name, barrier::Screen* screen); PrimaryClient(const std::string& name, barrier::Screen* screen);
~PrimaryClient(); ~PrimaryClient();
#ifdef TEST_ENV #ifdef BARRIER_TEST_ENV
PrimaryClient() : BaseClientProxy("") { } PrimaryClient() : BaseClientProxy("") { }
#endif #endif

2
src/lib/server/Server.h
View File

@ -110,7 +110,7 @@ public:
barrier::Screen* screen, IEventQueue* events, ServerArgs const& args); barrier::Screen* screen, IEventQueue* events, ServerArgs const& args);
~Server(); ~Server();
#ifdef TEST_ENV #ifdef BARRIER_TEST_ENV
Server() : m_mock(true), m_config(NULL) { } Server() : m_mock(true), m_config(NULL) { }
void setActive(BaseClientProxy* active) { m_active = active; } void setActive(BaseClientProxy* active) { m_active = active; }
#endif #endif

2
src/test/integtests/ipc/IpcTests.cpp
View File

@ -19,7 +19,7 @@
// TODO: fix, tests failing intermittently on mac. // TODO: fix, tests failing intermittently on mac.
#ifndef WINAPI_CARBON #ifndef WINAPI_CARBON
#define TEST_ENV #define BARRIER_TEST_ENV
#include "test/global/TestEventQueue.h" #include "test/global/TestEventQueue.h"
#include "ipc/IpcServer.h" #include "ipc/IpcServer.h"

2
src/test/integtests/net/NetworkTests.cpp
View File

@ -18,7 +18,7 @@
// TODO: fix, tests failing intermittently on mac. // TODO: fix, tests failing intermittently on mac.
#ifndef WINAPI_CARBON #ifndef WINAPI_CARBON
#define TEST_ENV #define BARRIER_TEST_ENV
#include "test/mock/server/MockConfig.h" #include "test/mock/server/MockConfig.h"
#include "test/mock/server/MockPrimaryClient.h" #include "test/mock/server/MockPrimaryClient.h"

2
src/test/integtests/platform/MSWindowsKeyStateTests.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#define TEST_ENV #define BARRIER_TEST_ENV
#include "test/mock/barrier/MockEventQueue.h" #include "test/mock/barrier/MockEventQueue.h"
#include "test/mock/barrier/MockKeyMap.h" #include "test/mock/barrier/MockKeyMap.h"

2
src/test/integtests/platform/XWindowsKeyStateTests.cpp
View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#define TEST_ENV #define BARRIER_TEST_ENV
#include "test/mock/barrier/MockKeyMap.h" #include "test/mock/barrier/MockKeyMap.h"
#include "test/mock/barrier/MockEventQueue.h" #include "test/mock/barrier/MockEventQueue.h"

2
src/test/mock/barrier/MockApp.h
View File

@ -17,7 +17,7 @@
#pragma once #pragma once
#define TEST_ENV #define BARRIER_TEST_ENV
#include "barrier/App.h" #include "barrier/App.h"

2
src/test/mock/barrier/MockArgParser.h
View File

@ -17,7 +17,7 @@
#pragma once #pragma once
#define TEST_ENV #define BARRIER_TEST_ENV
#include "barrier/ArgParser.h" #include "barrier/ArgParser.h"

2
src/test/mock/barrier/MockScreen.h
View File

@ -17,7 +17,7 @@
#pragma once #pragma once
#define TEST_ENV #define BARRIER_TEST_ENV
#include "barrier/Screen.h" #include "barrier/Screen.h"

2
src/test/mock/server/MockConfig.h
View File

@ -17,7 +17,7 @@
#pragma once #pragma once
#define TEST_ENV #define BARRIER_TEST_ENV
#include "server/Config.h" #include "server/Config.h"

2
src/test/mock/server/MockInputFilter.h
View File

@ -17,7 +17,7 @@
#pragma once #pragma once
#define TEST_ENV #define BARRIER_TEST_ENV
#include "server/InputFilter.h" #include "server/InputFilter.h"

2
src/test/mock/server/MockPrimaryClient.h
View File

@ -17,7 +17,7 @@
#pragma once #pragma once
#define TEST_ENV #define BARRIER_TEST_ENV
#include "server/PrimaryClient.h" #include "server/PrimaryClient.h"
#include "base/String.h" #include "base/String.h"

2
src/test/mock/server/MockServer.h
View File

@ -17,7 +17,7 @@
#pragma once #pragma once
#define TEST_ENV #define BARRIER_TEST_ENV
#include "server/Server.h" #include "server/Server.h"

2
src/test/unittests/barrier/KeyMapTests.cpp
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#define TEST_ENV #define BARRIER_TEST_ENV
#include "barrier/KeyMap.h" #include "barrier/KeyMap.h"

2
src/test/unittests/ipc/IpcLogOutputterTests.cpp
View File

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#define TEST_ENV #define BARRIER_TEST_ENV
#include "test/mock/ipc/MockIpcServer.h" #include "test/mock/ipc/MockIpcServer.h"