test: Remove unresolved merge conflict markers
This commit is contained in:
parent
56f1232352
commit
a6e5e47366
|
@ -22,7 +22,6 @@
|
||||||
|
|
||||||
TEST(ClipboardChunkTests, start_formatStartChunk)
|
TEST(ClipboardChunkTests, start_formatStartChunk)
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
ClipboardID id = 0;
|
ClipboardID id = 0;
|
||||||
UInt32 sequence = 0;
|
UInt32 sequence = 0;
|
||||||
String mockDataSize("10");
|
String mockDataSize("10");
|
||||||
|
@ -34,28 +33,12 @@ TEST(ClipboardChunkTests, start_formatStartChunk)
|
||||||
EXPECT_EQ('1', chunk->m_chunk[6]);
|
EXPECT_EQ('1', chunk->m_chunk[6]);
|
||||||
EXPECT_EQ('0', chunk->m_chunk[7]);
|
EXPECT_EQ('0', chunk->m_chunk[7]);
|
||||||
EXPECT_EQ('\0', chunk->m_chunk[8]);
|
EXPECT_EQ('\0', chunk->m_chunk[8]);
|
||||||
=======
|
|
||||||
ClipboardID id = 0;
|
|
||||||
UInt32 sequence = 0;
|
|
||||||
String mockDataSize("10");
|
|
||||||
ClipboardChunk* chunk = ClipboardChunk::start(id, sequence, mockDataSize);
|
|
||||||
UInt32 temp_m_chunk;
|
|
||||||
memcpy(&temp_m_chunk, &(chunk->m_chunk[1]), 4);
|
|
||||||
|
|
||||||
EXPECT_EQ(id, chunk->m_chunk[0]);
|
|
||||||
EXPECT_EQ(sequence, temp_m_chunk);
|
|
||||||
EXPECT_EQ(kDataStart, chunk->m_chunk[5]);
|
|
||||||
EXPECT_EQ('1', chunk->m_chunk[6]);
|
|
||||||
EXPECT_EQ('0', chunk->m_chunk[7]);
|
|
||||||
EXPECT_EQ('\0', chunk->m_chunk[8]);
|
|
||||||
>>>>>>> master
|
|
||||||
|
|
||||||
delete chunk;
|
delete chunk;
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(ClipboardChunkTests, data_formatDataChunk)
|
TEST(ClipboardChunkTests, data_formatDataChunk)
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
ClipboardID id = 0;
|
ClipboardID id = 0;
|
||||||
UInt32 sequence = 1;
|
UInt32 sequence = 1;
|
||||||
String mockData("mock data");
|
String mockData("mock data");
|
||||||
|
@ -74,35 +57,12 @@ TEST(ClipboardChunkTests, data_formatDataChunk)
|
||||||
EXPECT_EQ('t', chunk->m_chunk[13]);
|
EXPECT_EQ('t', chunk->m_chunk[13]);
|
||||||
EXPECT_EQ('a', chunk->m_chunk[14]);
|
EXPECT_EQ('a', chunk->m_chunk[14]);
|
||||||
EXPECT_EQ('\0', chunk->m_chunk[15]);
|
EXPECT_EQ('\0', chunk->m_chunk[15]);
|
||||||
=======
|
|
||||||
ClipboardID id = 0;
|
|
||||||
UInt32 sequence = 1;
|
|
||||||
String mockData("mock data");
|
|
||||||
ClipboardChunk* chunk = ClipboardChunk::data(id, sequence, mockData);
|
|
||||||
UInt32 temp_m_chunk;
|
|
||||||
memcpy(&temp_m_chunk, &(chunk->m_chunk[1]), 4);
|
|
||||||
|
|
||||||
EXPECT_EQ(id, chunk->m_chunk[0]);
|
|
||||||
EXPECT_EQ(sequence, temp_m_chunk);
|
|
||||||
EXPECT_EQ(kDataChunk, chunk->m_chunk[5]);
|
|
||||||
EXPECT_EQ('m', chunk->m_chunk[6]);
|
|
||||||
EXPECT_EQ('o', chunk->m_chunk[7]);
|
|
||||||
EXPECT_EQ('c', chunk->m_chunk[8]);
|
|
||||||
EXPECT_EQ('k', chunk->m_chunk[9]);
|
|
||||||
EXPECT_EQ(' ', chunk->m_chunk[10]);
|
|
||||||
EXPECT_EQ('d', chunk->m_chunk[11]);
|
|
||||||
EXPECT_EQ('a', chunk->m_chunk[12]);
|
|
||||||
EXPECT_EQ('t', chunk->m_chunk[13]);
|
|
||||||
EXPECT_EQ('a', chunk->m_chunk[14]);
|
|
||||||
EXPECT_EQ('\0', chunk->m_chunk[15]);
|
|
||||||
>>>>>>> master
|
|
||||||
|
|
||||||
delete chunk;
|
delete chunk;
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(ClipboardChunkTests, end_formatDataChunk)
|
TEST(ClipboardChunkTests, end_formatDataChunk)
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
ClipboardID id = 1;
|
ClipboardID id = 1;
|
||||||
UInt32 sequence = 1;
|
UInt32 sequence = 1;
|
||||||
ClipboardChunk* chunk = ClipboardChunk::end(id, sequence);
|
ClipboardChunk* chunk = ClipboardChunk::end(id, sequence);
|
||||||
|
@ -111,18 +71,6 @@ TEST(ClipboardChunkTests, end_formatDataChunk)
|
||||||
EXPECT_EQ(sequence, (UInt32)chunk->m_chunk[1]);
|
EXPECT_EQ(sequence, (UInt32)chunk->m_chunk[1]);
|
||||||
EXPECT_EQ(kDataEnd, chunk->m_chunk[5]);
|
EXPECT_EQ(kDataEnd, chunk->m_chunk[5]);
|
||||||
EXPECT_EQ('\0', chunk->m_chunk[6]);
|
EXPECT_EQ('\0', chunk->m_chunk[6]);
|
||||||
=======
|
|
||||||
ClipboardID id = 1;
|
|
||||||
UInt32 sequence = 1;
|
|
||||||
ClipboardChunk* chunk = ClipboardChunk::end(id, sequence);
|
|
||||||
UInt32 temp_m_chunk;
|
|
||||||
memcpy(&temp_m_chunk, &(chunk->m_chunk[1]), 4);
|
|
||||||
|
|
||||||
EXPECT_EQ(id, chunk->m_chunk[0]);
|
|
||||||
EXPECT_EQ(sequence, temp_m_chunk);
|
|
||||||
EXPECT_EQ(kDataEnd, chunk->m_chunk[5]);
|
|
||||||
EXPECT_EQ('\0', chunk->m_chunk[6]);
|
|
||||||
>>>>>>> master
|
|
||||||
|
|
||||||
delete chunk;
|
delete chunk;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue