status-im/qzxing
2
0
Fork 0
mirror of https://github.com/status-im/qzxing.git synced 2025-01-11 11:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add the test resources as a submodule to qzxing-test-resources resository that has been created

Browse Source 
Adapted unit tests to utilize the new path.
This commit is contained in:
Nikos Ftylitakis 2019-12-20 12:53:12 +02:00
parent 82c8ff217f
commit e74778d92b
4 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "tests/resources"]
path = tests/resources
url = https://github.com/ftylitak/qzxing-test-resources

1
tests/resources Submodule

@ -0,0 +1 @@
Subproject commit 1d46946b9cda9e41cc0f5f689d941f755b2ba7cc

2
tests/src/QZXingTests/main.cpp
View File

@ -32,7 +32,7 @@ int main(int argc, char **argv)
else
{
DecodeValidator decodeValidator;
decodeValidator.executeTests("../../resources/");
decodeValidator.executeTests("../../resources/resources/");
zxing::tests::EncodeValidator encodeValidator;
encodeValidator.execute();

46
tests/src/QZXingTests/zxing/qrcode/encoder/EncoderTests.cpp
View File

@ -58,21 +58,21 @@ void EncoderTests::testGetAlphanumericCode()
void EncoderTests::testChooseMode()
{
// Numeric mode.
Mode mode_(EncoderHack::chooseMode("0"));
Mode mode_(EncoderHack::chooseMode(L"0"));
assertSame(Mode::NUMERIC, mode_);
mode_ = EncoderHack::chooseMode("0123456789");
mode_ = EncoderHack::chooseMode(L"0123456789");
assertSame(Mode::NUMERIC, mode_);
// Alphanumeric mode.
mode_ = EncoderHack::chooseMode("A");
mode_ = EncoderHack::chooseMode(L"A");
assertSame(Mode::ALPHANUMERIC, mode_);
mode_ = EncoderHack::chooseMode("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:");
mode_ = EncoderHack::chooseMode(L"0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ $%*+-./:");
assertSame(Mode::ALPHANUMERIC, mode_);
// 8-bit byte mode.
mode_ = EncoderHack::chooseMode("a");
mode_ = EncoderHack::chooseMode(L"a");
assertSame(Mode::BYTE, mode_);
mode_ = EncoderHack::chooseMode("#");
mode_ = EncoderHack::chooseMode(L"#");
assertSame(Mode::BYTE, mode_);
mode_ = EncoderHack::chooseMode("");
mode_ = EncoderHack::chooseMode(L"");
assertSame(Mode::BYTE, mode_);
// Kanji mode. We used to use MODE_KANJI for these, but we stopped
// doing that as we cannot distinguish Shift_JIS from other encodings
@ -93,7 +93,7 @@ void EncoderTests::testChooseMode()
void EncoderTests::testEncode()
{
Ref<QRCode> qrCode = Encoder::encode("ABCDEF", ErrorCorrectionLevel::H);
Ref<QRCode> qrCode = Encoder::encode(L"ABCDEF", ErrorCorrectionLevel::H);
const std::string expected =
"<<\n"
" mode: ALPHANUMERIC\n"
@ -166,12 +166,12 @@ void EncoderTests::testAppendBytes()
// Should use appendNumericBytes.
// 1 = 01 = 0001 in 4 bits.
BitArray bits;
EncoderHack::appendBytes("1", Mode::NUMERIC, bits, EncoderHack::DEFAULT_BYTE_MODE_ENCODING);
EncoderHack::appendBytes(L"1", Mode::NUMERIC, bits, EncoderHack::DEFAULT_BYTE_MODE_ENCODING);
assertEquals(" ...X" , bits.toString());
// Should use appendAlphanumericBytes.
// A = 10 = 0xa = 001010 in 6 bits
bits = BitArray();
EncoderHack::appendBytes("A", Mode::ALPHANUMERIC, bits, EncoderHack::DEFAULT_BYTE_MODE_ENCODING);
EncoderHack::appendBytes(L"A", Mode::ALPHANUMERIC, bits, EncoderHack::DEFAULT_BYTE_MODE_ENCODING);
assertEquals(" ..X.X." , bits.toString());
// Lower letters such as 'a' cannot be encoded in MODE_ALPHANUMERIC.
ASSERT_THROWS(
@ -180,10 +180,10 @@ void EncoderTests::testAppendBytes()
// Should use append8BitBytes.
// 0x61, 0x62, 0x63
bits = BitArray();
EncoderHack::appendBytes("abc", Mode::BYTE, bits, EncoderHack::DEFAULT_BYTE_MODE_ENCODING);
EncoderHack::appendBytes(L"abc", Mode::BYTE, bits, EncoderHack::DEFAULT_BYTE_MODE_ENCODING);
assertEquals(" .XX....X .XX...X. .XX...XX", bits.toString());
// Anything can be encoded in QRCode.MODE_8BIT_BYTE.
EncoderHack::appendBytes("\0", Mode::BYTE, bits, EncoderHack::DEFAULT_BYTE_MODE_ENCODING);
EncoderHack::appendBytes(L"\0", Mode::BYTE, bits, EncoderHack::DEFAULT_BYTE_MODE_ENCODING);
// Should use appendKanjiBytes.
// 0x93, 0x5f
// bits = new BitArray();
@ -335,23 +335,23 @@ void EncoderTests::testAppendNumericBytes()
{
// 1 = 01 = 0001 in 4 bits.
BitArray bits;
Encoder::appendNumericBytes("1", bits);
Encoder::appendNumericBytes(L"1", bits);
assertEquals(" ...X" , bits.toString());
// 12 = 0xc = 0001100 in 7 bits.
bits = BitArray();
Encoder::appendNumericBytes("12", bits);
Encoder::appendNumericBytes(L"12", bits);
assertEquals(" ...XX.." , bits.toString());
// 123 = 0x7b = 0001111011 in 10 bits.
bits = BitArray();
Encoder::appendNumericBytes("123", bits);
Encoder::appendNumericBytes(L"123", bits);
assertEquals(" ...XXXX. XX" , bits.toString());
// 1234 = "123" + "4" = 0001111011 + 0100
bits = BitArray();
Encoder::appendNumericBytes("1234", bits);
Encoder::appendNumericBytes(L"1234", bits);
assertEquals(" ...XXXX. XX.X.." , bits.toString());
// Empty.
bits = BitArray();
Encoder::appendNumericBytes("", bits);
Encoder::appendNumericBytes(L"", bits);
assertEquals("" , bits.toString());
}
@ -359,19 +359,19 @@ void EncoderTests::testAppendAlphanumericBytes()
{
// A = 10 = 0xa = 001010 in 6 bits
BitArray bits;
Encoder::appendAlphanumericBytes("A", bits);
Encoder::appendAlphanumericBytes(L"A", bits);
assertEquals(" ..X.X." , bits.toString());
// AB = 10 * 45 + 11 = 461 = 0x1cd = 00111001101 in 11 bits
bits = BitArray();
Encoder::appendAlphanumericBytes("AB", bits);
Encoder::appendAlphanumericBytes(L"AB", bits);
assertEquals(" ..XXX..X X.X", bits.toString());
// ABC = "AB" + "C" = 00111001101 + 001100
bits = BitArray();
Encoder::appendAlphanumericBytes("ABC", bits);
Encoder::appendAlphanumericBytes(L"ABC", bits);
assertEquals(" ..XXX..X X.X..XX. ." , bits.toString());
// Empty.
bits = BitArray();
Encoder::appendAlphanumericBytes("", bits);
Encoder::appendAlphanumericBytes(L"", bits);
assertEquals("" , bits.toString());
// Invalid data.
bits = BitArray();
@ -382,11 +382,11 @@ void EncoderTests::testAppendAlphanumericBytes()
void EncoderTests::testAppend8BitBytes()
{
BitArray bits;
Encoder::append8BitBytes("abc", bits, Encoder::DEFAULT_BYTE_MODE_ENCODING);
Encoder::append8BitBytes(L"abc", bits, Encoder::DEFAULT_BYTE_MODE_ENCODING);
assertEquals(" .XX....X .XX...X. .XX...XX", bits.toString());
// Empty.
bits = BitArray();
Encoder::append8BitBytes("", bits, Encoder::DEFAULT_BYTE_MODE_ENCODING);
Encoder::append8BitBytes(L"", bits, Encoder::DEFAULT_BYTE_MODE_ENCODING);
assertEquals("", bits.toString());
}