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

fixed: code style in unit test (missing g_)

This commit is contained in:
Nick Bolton 2013-05-01 15:57:46 +00:00
parent 4fffe2dad1
commit 65b8f480e8
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/test/unittests/client/CServerProxyTests.cpp
View File

@ -30,21 +30,21 @@ using ::testing::Invoke;
using ::testing::NiceMock; using ::testing::NiceMock;
using ::testing::AnyNumber; using ::testing::AnyNumber;
const UInt8 mouseMove_bufferLen = 16; const UInt8 g_mouseMove_bufferLen = 16;
UInt8 mouseMove_buffer[mouseMove_bufferLen]; UInt8 g_mouseMove_buffer[g_mouseMove_bufferLen];
UInt32 mouseMove_bufferIndex; UInt32 g_mouseMove_bufferIndex;
UInt32 mouseMove_mockRead(void* buffer, UInt32 n); UInt32 mouseMove_mockRead(void* buffer, UInt32 n);
const UInt8 readCryptoIv_bufferLen = 20; const UInt8 g_readCryptoIv_bufferLen = 20;
UInt8 readCryptoIv_buffer[readCryptoIv_bufferLen]; UInt8 g_readCryptoIv_buffer[g_readCryptoIv_bufferLen];
UInt32 readCryptoIv_bufferIndex; UInt32 g_readCryptoIv_bufferIndex;
CString readCryptoIv_result; CString g_readCryptoIv_result;
UInt32 readCryptoIv_mockRead(void* buffer, UInt32 n); UInt32 readCryptoIv_mockRead(void* buffer, UInt32 n);
void readCryptoIv_setDecryptIv(const UInt8*); void readCryptoIv_setDecryptIv(const UInt8*);
TEST(CServerProxyTests, mouseMove) TEST(CServerProxyTests, mouseMove)
{ {
mouseMove_bufferIndex = 0; g_mouseMove_bufferIndex = 0;
NiceMock<CMockEventQueue> eventQueue; NiceMock<CMockEventQueue> eventQueue;
NiceMock<CMockClient> client; NiceMock<CMockClient> client;
@ -55,7 +55,7 @@ TEST(CServerProxyTests, mouseMove)
EXPECT_CALL(client, mouseMove(1, 2)).Times(1); EXPECT_CALL(client, mouseMove(1, 2)).Times(1);
const char data[] = "DSOP\0\0\0\0DMMV\0\1\0\2"; const char data[] = "DSOP\0\0\0\0DMMV\0\1\0\2";
memcpy(mouseMove_buffer, data, mouseMove_bufferLen); memcpy(g_mouseMove_buffer, data, g_mouseMove_bufferLen);
CServerProxy serverProxy(&client, &stream, &eventQueue); CServerProxy serverProxy(&client, &stream, &eventQueue);
serverProxy.handleDataForTest(); serverProxy.handleDataForTest();
@ -63,7 +63,7 @@ TEST(CServerProxyTests, mouseMove)
TEST(CServerProxyTests, readCryptoIv) TEST(CServerProxyTests, readCryptoIv)
{ {
readCryptoIv_bufferIndex = 0; g_readCryptoIv_bufferIndex = 0;
NiceMock<CMockEventQueue> eventQueue; NiceMock<CMockEventQueue> eventQueue;
NiceMock<CMockClient> client; NiceMock<CMockClient> client;
@ -73,38 +73,38 @@ TEST(CServerProxyTests, readCryptoIv)
ON_CALL(client, setDecryptIv(_)).WillByDefault(Invoke(readCryptoIv_setDecryptIv)); ON_CALL(client, setDecryptIv(_)).WillByDefault(Invoke(readCryptoIv_setDecryptIv));
const char data[] = "DSOP\0\0\0\0DCIV\0\0\0\4mock"; const char data[] = "DSOP\0\0\0\0DCIV\0\0\0\4mock";
memcpy(readCryptoIv_buffer, data, readCryptoIv_bufferLen); memcpy(g_readCryptoIv_buffer, data, g_readCryptoIv_bufferLen);
CServerProxy serverProxy(&client, &stream, &eventQueue); CServerProxy serverProxy(&client, &stream, &eventQueue);
serverProxy.handleDataForTest(); serverProxy.handleDataForTest();
EXPECT_EQ("mock", readCryptoIv_result); EXPECT_EQ("mock", g_readCryptoIv_result);
} }
UInt32 UInt32
mouseMove_mockRead(void* buffer, UInt32 n) mouseMove_mockRead(void* buffer, UInt32 n)
{ {
if (mouseMove_bufferIndex >= mouseMove_bufferLen) { if (g_mouseMove_bufferIndex >= g_mouseMove_bufferLen) {
return 0; return 0;
} }
memcpy(buffer, &mouseMove_buffer[mouseMove_bufferIndex], n); memcpy(buffer, &g_mouseMove_buffer[g_mouseMove_bufferIndex], n);
mouseMove_bufferIndex += n; g_mouseMove_bufferIndex += n;
return n; return n;
} }
UInt32 UInt32
readCryptoIv_mockRead(void* buffer, UInt32 n) readCryptoIv_mockRead(void* buffer, UInt32 n)
{ {
if (readCryptoIv_bufferIndex >= readCryptoIv_bufferLen) { if (g_readCryptoIv_bufferIndex >= g_readCryptoIv_bufferLen) {
return 0; return 0;
} }
memcpy(buffer, &readCryptoIv_buffer[readCryptoIv_bufferIndex], n); memcpy(buffer, &g_readCryptoIv_buffer[g_readCryptoIv_bufferIndex], n);
readCryptoIv_bufferIndex += n; g_readCryptoIv_bufferIndex += n;
return n; return n;
} }
void void
readCryptoIv_setDecryptIv(const UInt8* data) readCryptoIv_setDecryptIv(const UInt8* data)
{ {
readCryptoIv_result = reinterpret_cast<const char*>(data); g_readCryptoIv_result = reinterpret_cast<const char*>(data);
} }