romixlab/qmsgpack
1
0
Fork 1
mirror of https://github.com/romixlab/qmsgpack.git synced 2025-07-30 02:17:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

pack test is almost done, some fixes in cmake files

Browse Source
This commit is contained in:
Roman
2014-09-22 23:01:21 +04:00
parent fd58047192
commit 4c905a30e4
8 changed files with 316 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,3 +2,4 @@
build
lib
Makefile
*.autosave

4
CMakeLists.txt
View File

@ -34,6 +34,10 @@ else ()
message("Qt5 not found, searching for Qt4")
find_package(Qt4 REQUIRED)
include(${QT_USE_FILE})
# Find includes in corresponding build directories
set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Instruct CMake to run moc automatically when needed.
set(CMAKE_AUTOMOC ON)
set(PC_Requires "QtCore")
endif ()

20
src/private/pack_p.cpp
View File

@ -122,18 +122,16 @@ quint8 *MsgPackPrivate::pack_list(const QVariantList &list, quint8 *p, bool wr)
if (len <= 15) {
if (wr) *p = 0x90 | len;
p++;
} else if (len <= 65535) {
if (wr) *p = 0xdc;
p++;
if (wr) _msgpack_store16(p, len);
p += 2;
} else {
if (len <= 65535) {
if (wr) *p = 0xdc;
p++;
_msgpack_store16(p, len);
p += 2;
} else {
if (wr) *p = 0xdd;
p++;
_msgpack_store32(p, len);
p += 4;
}
if (wr) *p = 0xdd;
p++;
if (wr) _msgpack_store32(p, len);
p += 4;
}
foreach (QVariant item, list)
p = pack(item, p, wr);

19
test/pack/pack-test/pack-test.pro
View File

@ -1,19 +0,0 @@
#-------------------------------------------------
#
# Project created by QtCreator 2014-09-20T15:17:37
#
#-------------------------------------------------
QT += testlib
QT -= gui
TARGET = tst_d
CONFIG += console
CONFIG -= app_bundle
TEMPLATE = app
SOURCES += tst_d.cpp
DEFINES += SRCDIR=\\\"$$PWD/\\\"

26
test/pack/pack-test/tst_d.cpp
View File

@ -1,26 +0,0 @@
#include <QString>
#include <QtTest>
class d : public QObject
{
Q_OBJECT
public:
d();
private Q_SLOTS:
void testCase1();
};
d::d()
{
}
void d::testCase1()
{
QVERIFY2(true, "Failure");
}
QTEST_APPLESS_MAIN(d)
#include "tst_d.moc"

2
tests/pack/CMakeLists.txt
View File

@ -1,7 +1,7 @@
set(QT_USE_QTTEST TRUE)
if (NOT Qt5Core_FOUND)
include( $QT_USE_FILE} )
include( ${QT_USE_FILE} )
endif()
include(AddFileDependencies)

305
tests/pack/pack_test.cpp
View File

@ -2,6 +2,7 @@
#include <QByteArray>
#include <QtTest>
#include "msgpack.h"
#include <limits>
class PackTest : public QObject
{
@ -14,6 +15,13 @@ private Q_SLOTS:
void test_integer16();
void test_integer32();
void test_integer64();
void test_float();
void test_str();
void test_bin();
void test_array();
void test_map();
void test_ext();
void test_mixed();
};
void PackTest::test_bool()
@ -151,7 +159,7 @@ void PackTest::test_integer32()
void PackTest::test_integer64()
{
QByteArray arr = MsgPack::pack((quint64)4294967296);
QByteArray arr = MsgPack::pack((quint64)std::numeric_limits<quint32>::max() + 1);
quint8 *p = (quint8 *)arr.data();
QVERIFY(arr.size() == 9);
QVERIFY(p[0] == 0xcf);
@ -164,14 +172,14 @@ void PackTest::test_integer64()
QVERIFY(p[7] == 0x00);
QVERIFY(p[8] == 0x00);
arr = MsgPack::pack((quint64)18446744073709551615U);
arr = MsgPack::pack(std::numeric_limits<quint64>::max());
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 9);
QVERIFY(p[0] == 0xcf);
for (int i = 1; i < 9; ++i)
QVERIFY(p[i] == 0xff);
arr = MsgPack::pack((qint64)-2147483649);
arr = MsgPack::pack((qint64)std::numeric_limits<qint32>::min() - 1);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 9);
QVERIFY(p[0] == 0xd3);
@ -184,7 +192,7 @@ void PackTest::test_integer64()
QVERIFY(p[7] == 0xff);
QVERIFY(p[8] == 0xff);
arr = MsgPack::pack((qint64)-9223372036854775808);
arr = MsgPack::pack(std::numeric_limits<qint64>::min());
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 9);
QVERIFY(p[0] == 0xd3);
@ -193,6 +201,295 @@ void PackTest::test_integer64()
QVERIFY(p[i] == 0x00);
}
void PackTest::test_float()
{
QByteArray arr = MsgPack::pack(1.234567);
QVERIFY(arr.size() == 9);
quint8 *p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xcb);
QVERIFY(p[1] == 0x3f);
QVERIFY(p[2] == 0xf3);
QVERIFY(p[3] == 0xc0);
QVERIFY(p[4] == 0xc9);
QVERIFY(p[5] == 0x53);
QVERIFY(p[6] == 0x9b);
QVERIFY(p[7] == 0x88);
QVERIFY(p[8] == 0x87);
}
void PackTest::test_str()
{
QString str = QString::fromUtf8("msgpack rocks");
QByteArray arr = MsgPack::pack(str);
QVERIFY(arr.size() == 14);
quint8 *p = (quint8 *)arr.data();
QVERIFY(p[0] == (0xa0 | str.length()));
QVERIFY(memcmp(p + 1, str.toUtf8().data(), str.size()) == 0);
str = QString::fromUtf8(QByteArray(32, 'm'));
arr = MsgPack::pack(str);
QVERIFY(arr.size() == 32 + 2);
p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xd9);
QVERIFY(p[1] == 32);
QVERIFY(memcmp(p + 2, str.toUtf8().data(), str.size()) == 0);
str = QString::fromUtf8(QByteArray(256, 's'));
arr = MsgPack::pack(str);
QVERIFY(arr.size() == 256 + 3);
p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xda);
QVERIFY(p[1] == 0x01);
QVERIFY(p[2] == 0x00);
QVERIFY(memcmp(p + 3, str.toUtf8().data(), str.size()) == 0);
str = QString::fromUtf8(QByteArray(65536, 'g'));
arr = MsgPack::pack(str);
QVERIFY(arr.size() == 65536 + 5);
p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xdb);
QVERIFY(p[1] == 0x00);
QVERIFY(p[2] == 0x01);
QVERIFY(p[3] == 0x00);
QVERIFY(p[4] == 0x00);
QVERIFY(memcmp(p + 5, str.toUtf8().data(), str.size()) == 0);
}
void PackTest::test_bin()
{
QByteArray ba = QByteArray("msgpack");
QByteArray arr = MsgPack::pack(ba);
QVERIFY(arr.size() == ba.size() + 2);
quint8 *p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xc4);
QVERIFY(p[1] == ba.size());
QVERIFY(memcmp(p + 2, ba.data(), ba.size()) == 0);
ba = QByteArray(256, 'r');
arr = MsgPack::pack(ba);
QVERIFY(arr.size() == ba.size() + 3);
p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xc5);
QVERIFY(p[1] == 0x01);
QVERIFY(p[2] == 0x00);
QVERIFY(memcmp(p + 3, ba.data(), ba.size()) == 0);
ba = QByteArray(65536, 'r');
arr = MsgPack::pack(ba);
QVERIFY(arr.size() == ba.size() + 5);
p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xc6);
QVERIFY(p[1] == 0x00);
QVERIFY(p[2] == 0x01);
QVERIFY(p[3] == 0x00);
QVERIFY(p[4] == 0x00);
QVERIFY(memcmp(p + 5, ba.data(), ba.size()) == 0);
}
void PackTest::test_array()
{
QVariantList list;
list << 1 << 2 << 3;
QByteArray arr = MsgPack::pack(list);
QVERIFY(arr.size() == list.size() + 1);
quint8 *p = (quint8 *)arr.data();
QVERIFY(p[0] == (0x90 | list.size()));
for (int i = 0; i < 29; ++i)
list << 4;
arr = MsgPack::pack(list);
QVERIFY(arr.size() == list.size() + 3);
p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xdc);
QVERIFY(p[1] == 0x00);
QVERIFY(p[2] == 0x20);
for (int i = 0; i < 65504; ++i)
list << 7;
arr = MsgPack::pack(list);
QVERIFY(arr.size() == list.size() + 5);
p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xdd);
QVERIFY(p[1] == 0x00);
QVERIFY(p[2] == 0x01);
QVERIFY(p[3] == 0x00);
QVERIFY(p[4] == 0x00);
}
void PackTest::test_map()
{
QVariantMap map;
map.insert(QString("%1").QString::arg(0, 5), "v");
QByteArray arr = MsgPack::pack(map);
QVERIFY(arr.size() == map.size() * 8 + 1);
quint8 *p = (quint8 *)arr.data();
QVERIFY(p[0] == (0x80 | map.size()));
for (int i = 1; i < 16; ++i)
map.insert(QString("%1").QString::arg(i, 5), "v");
arr = MsgPack::pack(map);
QVERIFY(arr.size() == map.size() * 8 + 3);
p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xde);
QVERIFY(p[1] == 0x00);
QVERIFY(p[2] == 0x10);
for (int i = 16; i < 65536; ++i)
map.insert(QString("%1").QString::arg(i, 5), "v");
arr = MsgPack::pack(map);
QVERIFY(arr.size() == map.size() * 8 + 5);
p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xdf);
QVERIFY(p[1] == 0x00);
QVERIFY(p[2] == 0x01);
QVERIFY(p[3] == 0x00);
QVERIFY(p[4] == 0x00);
}
class CustomType
{
public:
CustomType() {}
CustomType(const CustomType &other) { m_size = other.m_size; }
~CustomType() {}
CustomType(int size) : m_size(size) {}
int size() { return m_size; }
void setSize(int size) { m_size = size; }
private:
int m_size;
};
Q_DECLARE_METATYPE(CustomType)
quint32 pack_custom_type(const QVariant &variant, QByteArray &data, bool write)
{
CustomType ct = variant.value<CustomType>();
if (write) {
data.resize(ct.size());
quint8 *p = (quint8 *)data.data();
for (int i = 0; i < ct.size(); ++i)
p[i] = 7;
}
return ct.size();
}
void PackTest::test_ext()
{
CustomType ct(1);
QVariant custom;
custom.setValue(ct);
MsgPack::registerPacker((QMetaType::Type)qMetaTypeId<CustomType>(),
3, pack_custom_type);
QByteArray arr = MsgPack::pack(custom);
QVERIFY(arr.size() == 2 + ct.size());
quint8 *p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xd4);
QVERIFY(p[1] == 0x03);
QVERIFY(p[2] == 0x07);
ct.setSize(2);
custom.setValue(ct);
arr = MsgPack::pack(custom);
QVERIFY(arr.size() == 2 + ct.size());
p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xd5);
QVERIFY(p[1] == 0x03);
QVERIFY(p[2] == 0x07);
QVERIFY(p[3] == 0x07);
ct.setSize(4);
custom.setValue(ct);
arr = MsgPack::pack(custom);
QVERIFY(arr.size() == 2 + ct.size());
p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xd6);
QVERIFY(p[1] == 0x03);
QVERIFY(p[2] == 0x07);
QVERIFY(p[3] == 0x07);
QVERIFY(p[4] == 0x07);
QVERIFY(p[5] == 0x07);
ct.setSize(8);
custom.setValue(ct);
arr = MsgPack::pack(custom);
QVERIFY(arr.size() == 2 + ct.size());
p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xd7);
QVERIFY(p[1] == 0x03);
for (int i = 0; i < ct.size(); ++i)
QVERIFY(p[2 + i] = 0x07);
ct.setSize(16);
custom.setValue(ct);
arr = MsgPack::pack(custom);
QVERIFY(arr.size() == 2 + ct.size());
p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xd8);
QVERIFY(p[1] == 0x03);
for (int i = 0; i < ct.size(); ++i)
QVERIFY(p[2 + i] = 0x07);
ct.setSize(3);
custom.setValue(ct);
arr = MsgPack::pack(custom);
QVERIFY(arr.size() == 3 + ct.size());
p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xc7);
QVERIFY(p[1] == 0x03);
QVERIFY(p[2] == 0x03);
for (int i = 0; i < ct.size(); ++i)
QVERIFY(p[3 + i] = 0x07);
ct.setSize(256);
custom.setValue(ct);
arr = MsgPack::pack(custom);
QVERIFY(arr.size() == 4 + ct.size());
p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xc8);
QVERIFY(p[1] == 0x01);
QVERIFY(p[2] == 0x00);
QVERIFY(p[3] == 0x03);
for (int i = 0; i < ct.size(); ++i)
QVERIFY(p[4 + i] = 0x07);
ct.setSize(65536);
custom.setValue(ct);
arr = MsgPack::pack(custom);
QVERIFY(arr.size() == 6 + ct.size());
p = (quint8 *)arr.data();
QVERIFY(p[0] == 0xc9);
QVERIFY(p[1] == 0x00);
QVERIFY(p[2] == 0x01);
QVERIFY(p[3] == 0x00);
QVERIFY(p[4] == 0x00);
QVERIFY(p[5] == 0x03);
for (int i = 0; i < ct.size(); ++i)
QVERIFY(p[6 + i] = 0x07);
}
void PackTest::test_mixed()
{
QVariantMap map;
// map["booleans"] = QVariantList() << false << true;
// map["list2"] = QVariantList() << (QVariantList() << "abc" << "def")
// << (QVariantList() << "qwe" << "rty");
// map["integers"] = QVariantList() << 0 << 127 << -31 << 128 << 777;
map["bytearray"] = QByteArray("bytes");
// QVariantMap map2;
// map2["one"] = 1;
// map2["two"] = QVariantMap();
// map["map2"] = map2;
QByteArray arr = MsgPack::pack(map);
qDebug() << arr.toBase64();
}
QTEST_APPLESS_MAIN(PackTest)
#include "pack_test.moc"

215
tests/pack/pack_test.cpp.autosave
View File

@ -1,215 +0,0 @@
#include <QString>
#include <QByteArray>
#include <QtTest>
#include "msgpack.h"
class PackTest : public QObject
{
Q_OBJECT
private Q_SLOTS:
void test_bool();
void test_fixint();
void test_integer8();
void test_integer16();
void test_integer32();
void test_integer64();
void test_float();
};
void PackTest::test_bool()
{
QByteArray arr = MsgPack::pack(false);
quint8 *p = (quint8 *)arr.data();
QVERIFY(arr.size() == 1);
QVERIFY(p[0] == 0xc2);
arr = MsgPack::pack(true);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 1);
QVERIFY(p[0] == 0xc3);
}
void PackTest::test_fixint()
{
QByteArray arr = MsgPack::pack(0);
quint8 *p = (quint8 *)arr.data();
QVERIFY(arr.size() == 1);
QVERIFY(p[0] == 0x00);
arr = MsgPack::pack(127);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 1);
QVERIFY(p[0] == 0x7f);
arr = MsgPack::pack(-1);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 1);
QVERIFY(p[0] == 0xff);
arr = MsgPack::pack(-32);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 1);
QVERIFY(p[0] == 0xe0);
}
void PackTest::test_integer8()
{
QByteArray arr = MsgPack::pack(128);
quint8 *p = (quint8 *)arr.data();
QVERIFY(arr.size() == 2);
QVERIFY(p[0] == 0xcc);
QVERIFY(p[1] == 0x80);
arr = MsgPack::pack(255);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 2);
QVERIFY(p[0] == 0xcc);
QVERIFY(p[1] == 0xff);
arr = MsgPack::pack(-33);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 2);
QVERIFY(p[0] == 0xd0);
QVERIFY(p[1] == 0xdf);
arr = MsgPack::pack(-128);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 2);
QVERIFY(p[0] == 0xd0);
QVERIFY(p[1] == 0x80);
}
void PackTest::test_integer16()
{
QByteArray arr = MsgPack::pack(256);
quint8 *p = (quint8 *)arr.data();
QVERIFY(arr.size() == 3);
QVERIFY(p[0] == 0xcd);
QVERIFY(p[1] == 0x01);
QVERIFY(p[2] == 0x00);
arr = MsgPack::pack(65535);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 3);
QVERIFY(p[0] == 0xcd);
QVERIFY(p[1] == 0xff);
QVERIFY(p[2] == 0xff);
arr = MsgPack::pack(-129);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 3);
QVERIFY(p[0] == 0xd1);
QVERIFY(p[1] == 0xff);
QVERIFY(p[2] == 0x7f);
arr = MsgPack::pack(-32768);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 3);
QVERIFY(p[0] == 0xd1);
QVERIFY(p[1] == 0x80);
QVERIFY(p[2] == 0x00);
}
void PackTest::test_integer32()
{
QByteArray arr = MsgPack::pack(65536);
quint8 *p = (quint8 *)arr.data();
QVERIFY(arr.size() == 5);
QVERIFY(p[0] == 0xce);
QVERIFY(p[1] == 0x00);
QVERIFY(p[2] == 0x01);
QVERIFY(p[3] == 0x00);
QVERIFY(p[4] == 0x00);
arr = MsgPack::pack((quint32)4294967295);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 5);
QVERIFY(p[0] == 0xce);
QVERIFY(p[1] == 0xff);
QVERIFY(p[2] == 0xff);
QVERIFY(p[3] == 0xff);
QVERIFY(p[4] == 0xff);
arr = MsgPack::pack(-32769);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 5);
QVERIFY(p[0] == 0xd2);
QVERIFY(p[1] == 0xff);
QVERIFY(p[2] == 0xff);
QVERIFY(p[3] == 0x7f);
QVERIFY(p[4] == 0xff);
arr = MsgPack::pack((qint32)-2147483648);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 5);
QVERIFY(p[0] == 0xd2);
QVERIFY(p[1] == 0x80);
QVERIFY(p[2] == 0x00);
QVERIFY(p[3] == 0x00);
QVERIFY(p[4] == 0x00);
}
void PackTest::test_integer64()
{
QByteArray arr = MsgPack::pack((quint64)4294967296);
quint8 *p = (quint8 *)arr.data();
QVERIFY(arr.size() == 9);
QVERIFY(p[0] == 0xcf);
QVERIFY(p[1] == 0x00);
QVERIFY(p[2] == 0x00);
QVERIFY(p[3] == 0x00);
QVERIFY(p[4] == 0x01);
QVERIFY(p[5] == 0x00);
QVERIFY(p[6] == 0x00);
QVERIFY(p[7] == 0x00);
QVERIFY(p[8] == 0x00);
arr = MsgPack::pack((quint64)18446744073709551615U);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 9);
QVERIFY(p[0] == 0xcf);
for (int i = 1; i < 9; ++i)
QVERIFY(p[i] == 0xff);
arr = MsgPack::pack((qint64)-2147483649);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 9);
QVERIFY(p[0] == 0xd3);
QVERIFY(p[1] == 0xff);
QVERIFY(p[2] == 0xff);
QVERIFY(p[3] == 0xff);
QVERIFY(p[4] == 0xff);
QVERIFY(p[5] == 0x7f);
QVERIFY(p[6] == 0xff);
QVERIFY(p[7] == 0xff);
QVERIFY(p[8] == 0xff);
arr = MsgPack::pack((qint64)-9223372036854775808);
p = (quint8 *)arr.data();
QVERIFY(arr.size() == 9);
QVERIFY(p[0] == 0xd3);
QVERIFY(p[1] == 0x80);
for (int i = 2; i < 9; ++i)
QVERIFY(p[i] == 0x00);
}
void PackTest::test_float()
{
QByteArray arr = MsgPack::pack(1.234567);
quint8 *p = (quint8 *)arr.data();
QVERIFY(arr.size() == 9);
QVERIFY(p[0] == 0xcf);
QVERIFY(p[1] == 0x00);
QVERIFY(p[2] == 0x00);
QVERIFY(p[3] == 0x00);
QVERIFY(p[4] == 0x01);
QVERIFY(p[5] == 0x00);
QVERIFY(p[6] == 0x00);
QVERIFY(p[7] == 0x00);
QVERIFY(p[8] == 0x00);
}
QTEST_APPLESS_MAIN(PackTest)
#include "pack_test.moc"