Skip to content

Commit

Permalink
In the tests, replacing the Reader and Writer variables by 'r' and 'w…
Browse files Browse the repository at this point in the history 
…', respectively.
  • Loading branch information
@ssilverman
ssilverman committed Nov 22, 2017
1 parent 3d30f10 commit 84cb9c6
Show file tree
Hide file tree
Showing 13 changed files with 932 additions and 932 deletions.
40 changes: 20 additions & 20 deletions src/tests/api.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
test(short_write_single_byte) {
uint8_t b[1];
cbor::BytesPrint bp{b, sizeof(b)};
cbor::Writer cbor{bp};
assertTrue(cbor.getWriteError() == 0);
cbor::Writer w{bp};
assertTrue(w.getWriteError() == 0);

uint8_t b2[] = { (0 << 5) + 24, 24 };
cbor.writeUnsignedInt(b2[1]);
assertEqual(cbor.getWriteSize(), size_t{1});
assertTrue(cbor.getWriteError() != 0);
w.writeUnsignedInt(b2[1]);
assertEqual(w.getWriteSize(), size_t{1});
assertTrue(w.getWriteError() != 0);

for (size_t i = 0; i < sizeof(b); i++) {
assertEqual(b[i], b2[i]);
Expand All @@ -22,17 +22,17 @@ test(short_write_single_byte) {
test(short_write_2_bytes) {
uint8_t b[2];
cbor::BytesPrint bp{b, sizeof(b)};
cbor::Writer cbor{bp};
assertTrue(cbor.getWriteError() == 0);
cbor::Writer w{bp};
assertTrue(w.getWriteError() == 0);

uint8_t b2[] = { (2 << 5) + 2, 0x01, 0x02 };
cbor.beginBytes(2);
cbor.writeByte(b2[1]);
assertEqual(cbor.getWriteSize(), size_t{2});
assertTrue(cbor.getWriteError() == 0);
cbor.writeByte(b2[2]);
assertEqual(cbor.getWriteSize(), size_t{2});
assertTrue(cbor.getWriteError() != 0);
w.beginBytes(2);
w.writeByte(b2[1]);
assertEqual(w.getWriteSize(), size_t{2});
assertTrue(w.getWriteError() == 0);
w.writeByte(b2[2]);
assertEqual(w.getWriteSize(), size_t{2});
assertTrue(w.getWriteError() != 0);

for (size_t i = 0; i < sizeof(b); i++) {
assertEqual(b[i], b2[i]);
Expand All @@ -42,14 +42,14 @@ test(short_write_2_bytes) {
test(short_write_multi_bytes) {
uint8_t b[2];
cbor::BytesPrint bp{b, sizeof(b)};
cbor::Writer cbor{bp};
assertTrue(cbor.getWriteError() == 0);
cbor.beginBytes(2);
cbor::Writer w{bp};
assertTrue(w.getWriteError() == 0);
w.beginBytes(2);

uint8_t b2[] = { (2 << 5) + 2, 0x01, 0x02 };
cbor.writeBytes(&b2[1], 2);
assertEqual(cbor.getWriteSize(), size_t{2});
assertTrue(cbor.getWriteError() != 0);
w.writeBytes(&b2[1], 2);
assertEqual(w.getWriteSize(), size_t{2});
assertTrue(w.getWriteError() != 0);

for (size_t i = 0; i < sizeof(b); i++) {
assertEqual(b[i], b2[i]);
Expand Down
80 changes: 40 additions & 40 deletions src/tests/array.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,66 +8,66 @@
test(array_empty) {
uint8_t b[] = { (4 << 5) + 0 };
cbor::BytesStream bs{b, sizeof(b)};
cbor::Reader cbor{bs};
assertTrue(cbor.isWellFormed());
assertEqual(cbor.getReadSize(), size_t{1});
cbor::Reader r{bs};
assertTrue(r.isWellFormed());
assertEqual(r.getReadSize(), size_t{1});
bs.reset();
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kArray));
assertTrue(cbor.getLength() == 0);
assertEqual(cbor.getReadSize(), size_t{2});
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kArray));
assertTrue(r.getLength() == 0);
assertEqual(r.getReadSize(), size_t{2});
}

test(array_indefinite_empty) {
uint8_t b[] = { (4 << 5) + 31, (7 << 5) + 31 };
cbor::BytesStream bs{b, sizeof(b)};
cbor::Reader cbor{bs};
assertTrue(cbor.isWellFormed());
assertEqual(cbor.getReadSize(), size_t{2});
cbor::Reader r{bs};
assertTrue(r.isWellFormed());
assertEqual(r.getReadSize(), size_t{2});
bs.reset();
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kArray));
assertTrue(cbor.isIndefiniteLength());
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kBreak));
assertEqual(cbor.getReadSize(), size_t{4});
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kArray));
assertTrue(r.isIndefiniteLength());
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kBreak));
assertEqual(r.getReadSize(), size_t{4});
}

test(array_something) {
uint8_t b[] = { (4 << 5) + 4, 0x01, 0x02, (1 << 5) | 0x03, (0 << 5) + 24, 24 };
cbor::BytesStream bs{b, sizeof(b)};
cbor::Reader cbor{bs};
assertTrue(cbor.isWellFormed());
assertEqual(cbor.getReadSize(), size_t{6});
cbor::Reader r{bs};
assertTrue(r.isWellFormed());
assertEqual(r.getReadSize(), size_t{6});
bs.reset();
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kArray));
assertTrue(cbor.getLength() == 4);
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kArray));
assertTrue(r.getLength() == 4);

assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kUnsignedInt));
assertTrue(cbor.getUnsignedInt() == 1);
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kUnsignedInt));
assertTrue(cbor.getUnsignedInt() == 2);
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kNegativeInt));
assertTrue(cbor.getInt() == -4);
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kUnsignedInt));
assertTrue(cbor.getUnsignedInt() == 24);
assertEqual(cbor.getReadSize(), size_t{12});
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kUnsignedInt));
assertTrue(r.getUnsignedInt() == 1);
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kUnsignedInt));
assertTrue(r.getUnsignedInt() == 2);
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kNegativeInt));
assertTrue(r.getInt() == -4);
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kUnsignedInt));
assertTrue(r.getUnsignedInt() == 24);
assertEqual(r.getReadSize(), size_t{12});
}

test(array_indefinite) {
uint8_t b[] = { (4 << 5) + 31, 0x01, 0x02, (1 << 5) | 0x03, (7 << 5) + 31 };
cbor::BytesStream bs{b, sizeof(b)};
cbor::Reader cbor{bs};
assertTrue(cbor.isWellFormed());
assertEqual(cbor.getReadSize(), size_t{5});
cbor::Reader r{bs};
assertTrue(r.isWellFormed());
assertEqual(r.getReadSize(), size_t{5});
bs.reset();
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kArray));
assertTrue(cbor.isIndefiniteLength());
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kArray));
assertTrue(r.isIndefiniteLength());

assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kUnsignedInt));
assertTrue(cbor.getUnsignedInt() == 1);
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kUnsignedInt));
assertTrue(cbor.getUnsignedInt() == 2);
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kNegativeInt));
assertTrue(cbor.getInt() == -4);
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kUnsignedInt));
assertTrue(r.getUnsignedInt() == 1);
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kUnsignedInt));
assertTrue(r.getUnsignedInt() == 2);
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kNegativeInt));
assertTrue(r.getInt() == -4);

assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kBreak));
assertEqual(cbor.getReadSize(), size_t{10});
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kBreak));
assertEqual(r.getReadSize(), size_t{10});
}
104 changes: 52 additions & 52 deletions src/tests/bytes.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,102 +8,102 @@
test(bytes_empty) {
uint8_t b[] = { (2 << 5) + 0 };
cbor::BytesStream bs{b, sizeof(b)};
cbor::Reader cbor{bs};
assertTrue(cbor.isWellFormed());
assertEqual(cbor.getReadSize(), size_t{1});
cbor::Reader r{bs};
assertTrue(r.isWellFormed());
assertEqual(r.getReadSize(), size_t{1});
bs.reset();
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kBytes));
assertTrue(cbor.getLength() == 0);
assertEqual(cbor.getReadSize(), size_t{2});
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kBytes));
assertTrue(r.getLength() == 0);
assertEqual(r.getReadSize(), size_t{2});
}

test(bytes_something) {
uint8_t b[] = { (2 << 5) + 4, 0x01, 0x02, 0x03, 0x04, 0 };
cbor::BytesStream bs{b, sizeof(b)};
cbor::Reader cbor{bs};
assertTrue(cbor.isWellFormed());
assertEqual(cbor.getReadSize(), size_t{5});
cbor::Reader r{bs};
assertTrue(r.isWellFormed());
assertEqual(r.getReadSize(), size_t{5});
bs.reset();
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kBytes));
assertTrue(cbor.getLength() == 4);
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kBytes));
assertTrue(r.getLength() == 4);
uint8_t b2[5]{0};
assertEqual(cbor.readBytes(b2, 4), size_t{4});
assertEqual(r.readBytes(b2, 4), size_t{4});
assertEqual(reinterpret_cast<char*>(&b2[0]), reinterpret_cast<char*>(&b[1]));
assertEqual(cbor.getReadSize(), size_t{10});
assertEqual(r.getReadSize(), size_t{10});
}

test(bytes_indefinite) {
uint8_t b[] = { (2 << 5) + 31, (2 << 5) + 2, 0x01, 0x02, (2 << 5) + 3, 0x03, 0x04, 0x05, (7 << 5) + 31 };
cbor::BytesStream bs{b, sizeof(b)};
cbor::Reader cbor{bs};
assertTrue(cbor.isWellFormed());
assertEqual(cbor.getReadSize(), size_t{9});
cbor::Reader r{bs};
assertTrue(r.isWellFormed());
assertEqual(r.getReadSize(), size_t{9});
bs.reset();
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kBytes));
assertTrue(cbor.isIndefiniteLength());
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kBytes));
assertTrue(r.isIndefiniteLength());

uint8_t b2[6]{0};
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kBytes));
assertTrue(cbor.getLength() == 2);
assertEqual(cbor.readBytes(&b2[0], 2), size_t{2});
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kBytes));
assertTrue(cbor.getLength() == 3);
assertEqual(cbor.readBytes(&b2[2], 3), size_t{3});
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kBreak));
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kBytes));
assertTrue(r.getLength() == 2);
assertEqual(r.readBytes(&b2[0], 2), size_t{2});
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kBytes));
assertTrue(r.getLength() == 3);
assertEqual(r.readBytes(&b2[2], 3), size_t{3});
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kBreak));

uint8_t b3[] = { 0x01, 0x02, 0x03, 0x04, 0x05, 0 };
assertEqual(reinterpret_cast<char*>(b2), reinterpret_cast<char*>(b3));
assertEqual(cbor.getReadSize(), size_t{18});
assertEqual(r.getReadSize(), size_t{18});
}

test(text_empty) {
uint8_t b[] = { (3 << 5) + 0 };
cbor::BytesStream bs{b, sizeof(b)};
cbor::Reader cbor{bs};
assertTrue(cbor.isWellFormed());
assertEqual(cbor.getReadSize(), size_t{1});
cbor::Reader r{bs};
assertTrue(r.isWellFormed());
assertEqual(r.getReadSize(), size_t{1});
bs.reset();
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kText));
assertTrue(cbor.getLength() == 0);
assertEqual(cbor.getReadSize(), size_t{2});
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kText));
assertTrue(r.getLength() == 0);
assertEqual(r.getReadSize(), size_t{2});
}

test(text_something) {
uint8_t b[] = { (3 << 5) + 4, 0x49, 0x45, 0x54, 0x46, 0 };
cbor::BytesStream bs{b, sizeof(b)};
cbor::Reader cbor{bs};
assertTrue(cbor.isWellFormed());
assertEqual(cbor.getReadSize(), size_t{5});
cbor::Reader r{bs};
assertTrue(r.isWellFormed());
assertEqual(r.getReadSize(), size_t{5});
bs.reset();
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kText));
assertTrue(cbor.getLength() == 4);
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kText));
assertTrue(r.getLength() == 4);
uint8_t b2[5]{0};
assertEqual(cbor.readBytes(b2, 4), size_t{4});
assertEqual(r.readBytes(b2, 4), size_t{4});
assertEqual(reinterpret_cast<char*>(&b2[0]), reinterpret_cast<char*>(&b[1]));
assertEqual(cbor.getReadSize(), size_t{10});
assertEqual(r.getReadSize(), size_t{10});
}

test(text_indefinite) {
uint8_t b[] = { (3 << 5) + 31, (3 << 5) + 5, 0x73, 0x74, 0x72, 0x65, 0x61, (3 << 5) + 4, 0x6d, 0x69, 0x6e, 0x67, (7 << 5) + 31 };
cbor::BytesStream bs{b, sizeof(b)};
cbor::Reader cbor{bs};
assertTrue(cbor.isWellFormed());
assertEqual(cbor.getReadSize(), size_t{13});
cbor::Reader r{bs};
assertTrue(r.isWellFormed());
assertEqual(r.getReadSize(), size_t{13});
bs.reset();
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kText));
assertTrue(cbor.isIndefiniteLength());
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kText));
assertTrue(r.isIndefiniteLength());

uint8_t b2[10]{0};
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kText));
assertTrue(cbor.getLength() == 5);
assertEqual(cbor.readBytes(&b2[0], 5), size_t{5});
assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kText));
assertTrue(cbor.getLength() == 4);
assertEqual(cbor.readBytes(&b2[5], 4), size_t{4});
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kText));
assertTrue(r.getLength() == 5);
assertEqual(r.readBytes(&b2[0], 5), size_t{5});
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kText));
assertTrue(r.getLength() == 4);
assertEqual(r.readBytes(&b2[5], 4), size_t{4});

assertEqual(static_cast<int>(cbor.readDataType()), static_cast<int>(cbor::DataType::kBreak));
assertEqual(static_cast<int>(r.readDataType()), static_cast<int>(cbor::DataType::kBreak));

uint8_t b3[] = { 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x69, 0x6e, 0x67, 0 };
assertEqual(reinterpret_cast<char*>(b2), reinterpret_cast<char*>(b3));
assertEqual(cbor.getReadSize(), size_t{26});
assertEqual(r.getReadSize(), size_t{26});
}
Loading

0 comments on commit 84cb9c6

Please sign in to comment.