Skip to content

Commit

Permalink
Merge pull request #587 from peternewman/libusb
Browse files Browse the repository at this point in the history 
Do some tidy up of ASSERT_DATA_EQUALS to OLA_ASSERT_DATA_EQUALS
  • Loading branch information
@nomis52
nomis52 committed Jan 2, 2015
2 parents 2c91dfc + 5843065 commit 2ec510a
Show file tree
Hide file tree
Showing 19 changed files with 120 additions and 194 deletions.
21 changes: 10 additions & 11 deletions common/io/IOQueueTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
using ola::io::IOQueue;
using ola::io::IOVec;
using ola::io::MemoryBlockPool;
using ola::testing::ASSERT_DATA_EQUALS;
using std::auto_ptr;
using std::string;

Expand Down Expand Up @@ -189,15 +188,15 @@ void IOQueueTest::testPop() {
queue.Write(data1, 4);
OLA_ASSERT_EQ(4u, queue.Size());
unsigned int output_size = queue.Peek(output_data, 4);
ASSERT_DATA_EQUALS(__LINE__, data1, 4, output_data, output_size);
OLA_ASSERT_DATA_EQUALS(data1, 4, output_data, output_size);
queue.Pop(4);
OLA_ASSERT_TRUE(queue.Empty());

// now add some more data
queue.Write(data1 + 4, 4);
OLA_ASSERT_EQ(4u, queue.Size());
output_size = queue.Peek(output_data, 4);
ASSERT_DATA_EQUALS(__LINE__, data1 + 4, 4, output_data, output_size);
OLA_ASSERT_DATA_EQUALS(data1 + 4, 4, output_data, output_size);
queue.Pop(4);
OLA_ASSERT_TRUE(queue.Empty());

Expand All @@ -220,18 +219,18 @@ void IOQueueTest::testPeek() {

// peek at the first four bytes
unsigned int output_size = m_buffer->Peek(output_data, 4);
ASSERT_DATA_EQUALS(__LINE__, data1, 4, output_data, output_size);
OLA_ASSERT_DATA_EQUALS(data1, 4, output_data, output_size);
OLA_ASSERT_EQ(9u, m_buffer->Size());

// peek at the first 9 bytes
output_size = m_buffer->Peek(output_data, 9);
ASSERT_DATA_EQUALS(__LINE__, data1, 9, output_data, output_size);
OLA_ASSERT_DATA_EQUALS(data1, 9, output_data, output_size);
OLA_ASSERT_EQ(9u, m_buffer->Size());

// peek at more bytes that exist in the buffer
output_size = m_buffer->Peek(output_data, DATA_SIZE);
OLA_ASSERT_EQ(9u, output_size);
ASSERT_DATA_EQUALS(__LINE__, data1, sizeof(data1), output_data, output_size);
OLA_ASSERT_DATA_EQUALS(data1, sizeof(data1), output_data, output_size);
OLA_ASSERT_EQ(9u, m_buffer->Size());

// Now try a buffer with smaller blocks
Expand All @@ -242,32 +241,32 @@ void IOQueueTest::testPeek() {

// peek at he same amount as the first block size
output_size = queue.Peek(output_data, 4);
ASSERT_DATA_EQUALS(__LINE__, data1, 4, output_data, output_size);
OLA_ASSERT_DATA_EQUALS(data1, 4, output_data, output_size);
OLA_ASSERT_EQ(9u, queue.Size());
OLA_ASSERT_FALSE(queue.Empty());

// peek at data from more than one block
output_size = queue.Peek(output_data, 6);
ASSERT_DATA_EQUALS(__LINE__, data1, 6, output_data, output_size);
OLA_ASSERT_DATA_EQUALS(data1, 6, output_data, output_size);
OLA_ASSERT_EQ(9u, queue.Size());
OLA_ASSERT_FALSE(queue.Empty());

// peek at data on the two block boundry
output_size = queue.Peek(output_data, 8);
ASSERT_DATA_EQUALS(__LINE__, data1, 8, output_data, output_size);
OLA_ASSERT_DATA_EQUALS(data1, 8, output_data, output_size);
OLA_ASSERT_EQ(9u, queue.Size());
OLA_ASSERT_FALSE(queue.Empty());

// peek at all the data
output_size = queue.Peek(output_data, 9);
ASSERT_DATA_EQUALS(__LINE__, data1, 9, output_data, output_size);
OLA_ASSERT_DATA_EQUALS(data1, 9, output_data, output_size);
OLA_ASSERT_EQ(9u, queue.Size());
OLA_ASSERT_FALSE(queue.Empty());

// peek at more data than what exists
output_size = queue.Peek(output_data, DATA_SIZE);
OLA_ASSERT_EQ(9u, output_size);
ASSERT_DATA_EQUALS(__LINE__, data1, 9, output_data, output_size);
OLA_ASSERT_DATA_EQUALS(data1, 9, output_data, output_size);
OLA_ASSERT_EQ(9u, queue.Size());
OLA_ASSERT_FALSE(queue.Empty());

Expand Down
17 changes: 8 additions & 9 deletions common/io/IOStackTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ using ola::io::IOStack;
using ola::io::IOQueue;
using ola::io::IOVec;
using ola::io::MemoryBlockPool;
using ola::testing::ASSERT_DATA_EQUALS;
using std::string;


Expand Down Expand Up @@ -103,8 +102,8 @@ void IOStackTest::testBasicWrite() {
OLA_ASSERT_EQ(data_size, stack.Read(output, data_size));

const uint8_t expected_data[] = {3, 4, 2, 0, 1};
ASSERT_DATA_EQUALS(__LINE__, expected_data, sizeof(expected_data),
output, data_size);
OLA_ASSERT_DATA_EQUALS(expected_data, sizeof(expected_data), output,
data_size);
}


Expand Down Expand Up @@ -134,8 +133,8 @@ void IOStackTest::testBlockOverflow() {

const uint8_t expected_data[] = {0xa, 0xb, 0xc, 0xd, 0xe, 5, 6, 7, 8, 9,
0, 1, 2, 3, 4};
ASSERT_DATA_EQUALS(__LINE__, expected_data, sizeof(expected_data),
output, data_size);
OLA_ASSERT_DATA_EQUALS(expected_data, sizeof(expected_data), output,
data_size);
}


Expand Down Expand Up @@ -183,8 +182,8 @@ void IOStackTest::testAppendToQueue() {
uint8_t tmp_data[100];
unsigned int queue_size = queue.Peek(tmp_data, sizeof(tmp_data));
OLA_ASSERT_EQ(7u, queue_size);
ASSERT_DATA_EQUALS(__LINE__, tmp_data, queue_size, expected_data,
sizeof(expected_data));
OLA_ASSERT_DATA_EQUALS(tmp_data, queue_size, expected_data,
sizeof(expected_data));

// now add a second stack
uint8_t data3[] = {0xb, 0xa};
Expand All @@ -201,8 +200,8 @@ void IOStackTest::testAppendToQueue() {
0xa};
queue_size = queue.Peek(tmp_data, sizeof(tmp_data));
OLA_ASSERT_EQ(13u, queue_size);
ASSERT_DATA_EQUALS(__LINE__, tmp_data, queue_size, expected_data2,
sizeof(expected_data2));
OLA_ASSERT_DATA_EQUALS(tmp_data, queue_size, expected_data2,
sizeof(expected_data2));

OLA_ASSERT_EQ(4u, pool.BlocksAllocated());
}
Expand Down
15 changes: 6 additions & 9 deletions common/io/MemoryBlockTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include "ola/testing/TestUtils.h"

using ola::io::MemoryBlock;
using ola::testing::ASSERT_DATA_EQUALS;

class MemoryBlockTest: public CppUnit::TestFixture {
public:
Expand Down Expand Up @@ -66,17 +65,16 @@ void MemoryBlockTest::testAppend() {
OLA_ASSERT_EQ(size - static_cast<unsigned int>(arraysize(data1)),
block.Remaining());
OLA_ASSERT_FALSE(block.Empty());
ASSERT_DATA_EQUALS(__LINE__, data1, arraysize(data1),
block.Data(), block.Size());
OLA_ASSERT_DATA_EQUALS(data1, arraysize(data1), block.Data(), block.Size());

// pop 1 byte
OLA_ASSERT_EQ(1u, block.PopFront(1));
OLA_ASSERT_EQ(3u, block.Size());
// popping doesn't change the location of the data in the memory block.
OLA_ASSERT_EQ(96u, block.Remaining());
OLA_ASSERT_FALSE(block.Empty());
ASSERT_DATA_EQUALS(__LINE__, data1 + 1, arraysize(data1) - 1,
block.Data(), block.Size());
OLA_ASSERT_DATA_EQUALS(data1 + 1, arraysize(data1) - 1, block.Data(),
block.Size());

// try to pop more data than exists
OLA_ASSERT_EQ(3u, block.PopFront(5));
Expand Down Expand Up @@ -105,17 +103,16 @@ void MemoryBlockTest::testPrepend() {
OLA_ASSERT_EQ(4u, block.Size());
OLA_ASSERT_EQ(0u, block.Remaining());
OLA_ASSERT_FALSE(block.Empty());
ASSERT_DATA_EQUALS(__LINE__, data1, arraysize(data1),
block.Data(), block.Size());
OLA_ASSERT_DATA_EQUALS(data1, arraysize(data1), block.Data(), block.Size());

// pop
OLA_ASSERT_EQ(1u, block.PopFront(1));
OLA_ASSERT_EQ(3u, block.Size());
// popping doesn't change the location of the data in the memory block.
OLA_ASSERT_EQ(0u, block.Remaining());
OLA_ASSERT_FALSE(block.Empty());
ASSERT_DATA_EQUALS(__LINE__, data1 + 1, arraysize(data1) - 1,
block.Data(), block.Size());
OLA_ASSERT_DATA_EQUALS(data1 + 1, arraysize(data1) - 1, block.Data(),
block.Size());

// try to pop more data than exists
OLA_ASSERT_EQ(3u, block.PopFront(5));
Expand Down
3 changes: 1 addition & 2 deletions common/io/OutputStreamTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
using ola::io::IOQueue;
using ola::io::BigEndianOutputStream;
using ola::network::HostToNetwork;
using ola::testing::ASSERT_DATA_EQUALS;
using std::auto_ptr;
using std::string;

Expand Down Expand Up @@ -99,6 +98,6 @@ void OutputStreamTest::testWritePrimatives() {

uint8_t data1[] = {0, 0, 0, 4, 0x80, 0, 0, 0, 0xa, 0x9, 0x60};
unsigned int output_size = m_buffer.Peek(output_data, m_buffer.Size());
ASSERT_DATA_EQUALS(__LINE__, data1, sizeof(data1), output_data, output_size);
OLA_ASSERT_DATA_EQUALS(data1, sizeof(data1), output_data, output_size);
delete[] output_data;
}
42 changes: 10 additions & 32 deletions common/rdm/MessageSerializerTest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ using ola::messaging::UInt8FieldDescriptor;
using ola::messaging::UIDFieldDescriptor;
using ola::rdm::StringMessageBuilder;
using ola::rdm::MessageSerializer;
using ola::testing::ASSERT_DATA_EQUALS;
using std::auto_ptr;
using std::string;
using std::vector;
Expand Down Expand Up @@ -139,11 +138,7 @@ void MessageSerializerTest::testSimple() {
0, 1, 1, 208, 255, 254, 254, 48,
'f', 'o', 'o'};

ASSERT_DATA_EQUALS(__LINE__,
expected,
sizeof(expected),
data,
packed_length);
OLA_ASSERT_DATA_EQUALS(expected, sizeof(expected), data, packed_length);
}


Expand Down Expand Up @@ -173,11 +168,10 @@ void MessageSerializerTest::testString() {
OLA_ASSERT_EQ(31u, packed_length);

uint8_t expected[] = "foo bar\0\0\0long long foo bar baz";
ASSERT_DATA_EQUALS(__LINE__,
expected,
sizeof(expected) - 1, // ignore the trailing \0
data,
packed_length);
OLA_ASSERT_DATA_EQUALS(expected,
sizeof(expected) - 1, // ignore the trailing \0
data,
packed_length);
}


Expand Down Expand Up @@ -205,7 +199,7 @@ void MessageSerializerTest::testUID() {
OLA_ASSERT_EQ(6u, packed_length);

uint8_t expected[] = {0x7a, 0x70, 0, 0, 0, 1};
ASSERT_DATA_EQUALS(__LINE__, expected, sizeof(expected), data, packed_length);
OLA_ASSERT_DATA_EQUALS(expected, sizeof(expected), data, packed_length);
}


Expand Down Expand Up @@ -246,11 +240,7 @@ void MessageSerializerTest::testLittleEndian() {
uint8_t expected[] = {
1, 253, 44, 1, 112, 254,
208, 1, 1, 0, 48, 254, 254, 255};
ASSERT_DATA_EQUALS(__LINE__,
expected,
sizeof(expected),
data,
packed_length);
OLA_ASSERT_DATA_EQUALS(expected, sizeof(expected), data, packed_length);
}


Expand Down Expand Up @@ -284,11 +274,7 @@ void MessageSerializerTest::testWithGroups() {
OLA_ASSERT_NOT_NULL(data);
OLA_ASSERT_EQ(2u, packed_length);
uint8_t expected[] = {1, 10};
ASSERT_DATA_EQUALS(__LINE__,
expected,
sizeof(expected),
data,
packed_length);
OLA_ASSERT_DATA_EQUALS(expected, sizeof(expected), data, packed_length);

// now do multiple groups
vector<string> inputs2;
Expand All @@ -304,11 +290,7 @@ void MessageSerializerTest::testWithGroups() {
OLA_ASSERT_NOT_NULL(data);
OLA_ASSERT_EQ(6u, packed_length);
uint8_t expected2[] = {1, 10, 1, 42, 0, 240};
ASSERT_DATA_EQUALS(__LINE__,
expected2,
sizeof(expected2),
data,
packed_length);
OLA_ASSERT_DATA_EQUALS(expected2, sizeof(expected2), data, packed_length);
}


Expand Down Expand Up @@ -346,9 +328,5 @@ void MessageSerializerTest::testWithNestedGroups() {
OLA_ASSERT_NOT_NULL(data);
OLA_ASSERT_EQ(8u, packed_length);
uint8_t expected[] = {0, 1, 1, 1, 0, 2, 1, 0};
ASSERT_DATA_EQUALS(__LINE__,
expected,
sizeof(expected),
data,
packed_length);
OLA_ASSERT_DATA_EQUALS(expected, sizeof(expected), data, packed_length);
}
Loading

0 comments on commit 2ec510a

Please sign in to comment.