status-im/qzxing
2
0
Fork 0
mirror of https://github.com/status-im/qzxing.git synced 2025-02-22 15:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make test compile on 64bit Linux machines

Browse Source
This commit is contained in:
Milian Wolff 2017-01-10 13:17:25 +01:00
parent b68b4c3fed
commit 8cdfdee225
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/src/QZXingTests/TestCase.h
View File

@ -37,6 +37,10 @@ private:
return QString::number(item); return QString::number(item);
} }
static QString itemToString(void* item) {
return QString::number(reinterpret_cast<uintptr_t>(item));
}
static QString itemToString(long unsigned item) { static QString itemToString(long unsigned item) {
return QString::number(item); return QString::number(item);
} }
@ -67,7 +71,7 @@ protected:
message += QString::fromStdString(trace.object_filename); message += QString::fromStdString(trace.object_filename);
message += QString::fromStdString(trace.object_function); message += QString::fromStdString(trace.object_function);
message += QString("["); message += QString("[");
message += QString::number((int)trace.addr); message += itemToString(trace.addr);
message += QString("]\n"); message += QString("]\n");
} }
@ -85,15 +89,15 @@ protected:
} }
void assertSame(void *expected, void *actual) { void assertSame(void *expected, void *actual) {
assertEquals((int)expected, (int)actual); assertEquals(expected, actual);
} }
void assertTrue(bool actual) { void assertTrue(bool actual) {
assertEquals(1, (int)actual); assertEquals(true, actual);
} }
void assertFalse(bool actual) { void assertFalse(bool actual) {
assertEquals(0, (int)actual); assertEquals(false, actual);
} }
void assertDataEquals(const std::string &message, void assertDataEquals(const std::string &message,

30
tests/src/QZXingTests/zxing/qrcode/encoder/BitArrayTests.cpp
View File

@ -34,43 +34,43 @@ void BitArrayTests::testAppendBit()
// 1 // 1
v.appendBit(true); v.appendBit(true);
assertEquals(1, v.getSize()); assertEquals(1, v.getSize());
assertEquals(0x80000000L, getUnsignedInt(v, 0)); assertEquals(0x80000000ul, getUnsignedInt(v, 0));
// 10 // 10
v.appendBit(false); v.appendBit(false);
assertEquals(2, v.getSize()); assertEquals(2, v.getSize());
assertEquals(0x80000000L, getUnsignedInt(v, 0)); assertEquals(0x80000000ul, getUnsignedInt(v, 0));
// 101 // 101
v.appendBit(true); v.appendBit(true);
assertEquals(3, v.getSize()); assertEquals(3, v.getSize());
assertEquals(0xa0000000L, getUnsignedInt(v, 0)); assertEquals(0xa0000000ul, getUnsignedInt(v, 0));
// 1010 // 1010
v.appendBit(false); v.appendBit(false);
assertEquals(4, v.getSize()); assertEquals(4, v.getSize());
assertEquals(0xa0000000L, getUnsignedInt(v, 0)); assertEquals(0xa0000000ul, getUnsignedInt(v, 0));
// 10101 // 10101
v.appendBit(true); v.appendBit(true);
assertEquals(5, v.getSize()); assertEquals(5, v.getSize());
assertEquals(0xa8000000L, getUnsignedInt(v, 0)); assertEquals(0xa8000000ul, getUnsignedInt(v, 0));
// 101010 // 101010
v.appendBit(false); v.appendBit(false);
assertEquals(6, v.getSize()); assertEquals(6, v.getSize());
assertEquals(0xa8000000L, getUnsignedInt(v, 0)); assertEquals(0xa8000000ul, getUnsignedInt(v, 0));
// 1010101 // 1010101
v.appendBit(true); v.appendBit(true);
assertEquals(7, v.getSize()); assertEquals(7, v.getSize());
assertEquals(0xaa000000L, getUnsignedInt(v, 0)); assertEquals(0xaa000000ul, getUnsignedInt(v, 0));
// 10101010 // 10101010
v.appendBit(false); v.appendBit(false);
assertEquals(8, v.getSize()); assertEquals(8, v.getSize());
assertEquals(0xaa000000L, getUnsignedInt(v, 0)); assertEquals(0xaa000000ul, getUnsignedInt(v, 0));
// 10101010 1 // 10101010 1
v.appendBit(true); v.appendBit(true);
assertEquals(9, v.getSize()); assertEquals(9, v.getSize());
assertEquals(0xaa800000L, getUnsignedInt(v, 0)); assertEquals(0xaa800000ul, getUnsignedInt(v, 0));
// 10101010 10 // 10101010 10
v.appendBit(false); v.appendBit(false);
assertEquals(10, v.getSize()); assertEquals(10, v.getSize());
assertEquals(0xaa800000L, getUnsignedInt(v, 0)); assertEquals(0xaa800000ul, getUnsignedInt(v, 0));
} }
void BitArrayTests::testAppendBits() void BitArrayTests::testAppendBits()
@ -78,15 +78,15 @@ void BitArrayTests::testAppendBits()
BitArray v; BitArray v;
v.appendBits(0x1, 1); v.appendBits(0x1, 1);
assertEquals(1, v.getSize()); assertEquals(1, v.getSize());
assertEquals(0x80000000L, getUnsignedInt(v, 0)); assertEquals(0x80000000ul, getUnsignedInt(v, 0));
v = BitArray(); v = BitArray();
v.appendBits(0xff, 8); v.appendBits(0xff, 8);
assertEquals(8, v.getSize()); assertEquals(8, v.getSize());
assertEquals(0xff000000L, getUnsignedInt(v, 0)); assertEquals(0xff000000ul, getUnsignedInt(v, 0));
v = BitArray(); v = BitArray();
v.appendBits(0xff7, 12); v.appendBits(0xff7, 12);
assertEquals(12, v.getSize()); assertEquals(12, v.getSize());
assertEquals(0xff700000L, getUnsignedInt(v, 0)); assertEquals(0xff700000ul, getUnsignedInt(v, 0));
} }
void BitArrayTests::testNumBytes() void BitArrayTests::testNumBytes()
@ -123,7 +123,7 @@ void BitArrayTests::testXOR()
BitArray v2; BitArray v2;
v2.appendBits(0xaaaa5555, 32); v2.appendBits(0xaaaa5555, 32);
v1.xor_(v2); v1.xor_(v2);
assertEquals(0xffffffffL, getUnsignedInt(v1, 0)); assertEquals(0xfffffffful, getUnsignedInt(v1, 0));
} }
void BitArrayTests::testXOR2() void BitArrayTests::testXOR2()
@ -133,7 +133,7 @@ void BitArrayTests::testXOR2()
BitArray v2; BitArray v2;
v2.appendBits(0x55, 7); // 101 0101 v2.appendBits(0x55, 7); // 101 0101
v1.xor_(v2); v1.xor_(v2);
assertEquals(0xfe000000L, getUnsignedInt(v1, 0)); // 1111 1110 assertEquals(0xfe000000ul, getUnsignedInt(v1, 0)); // 1111 1110
} }
void BitArrayTests::testAt() void BitArrayTests::testAt()