From ad1a5bf63fa63532c3267d4f365286dc78288651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Wed, 6 May 2020 18:24:07 +0200 Subject: QDecompressHelper: Add brotli support Task-number: QTBUG-83269 Change-Id: If23b098ee76a4892e4c2c6ce5c635688d8d9138d Reviewed-by: Timur Pocheptsov --- tests/auto/network/access/qdecompresshelper/4G.br | Bin 0 -> 3361 bytes .../access/qdecompresshelper/tst_qdecompresshelper.cpp | 16 ++++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 tests/auto/network/access/qdecompresshelper/4G.br (limited to 'tests/auto/network/access/qdecompresshelper') diff --git a/tests/auto/network/access/qdecompresshelper/4G.br b/tests/auto/network/access/qdecompresshelper/4G.br new file mode 100644 index 0000000000..dabd553ed7 Binary files /dev/null and b/tests/auto/network/access/qdecompresshelper/4G.br differ diff --git a/tests/auto/network/access/qdecompresshelper/tst_qdecompresshelper.cpp b/tests/auto/network/access/qdecompresshelper/tst_qdecompresshelper.cpp index 4f54839ec0..a1fbe60d3e 100644 --- a/tests/auto/network/access/qdecompresshelper/tst_qdecompresshelper.cpp +++ b/tests/auto/network/access/qdecompresshelper/tst_qdecompresshelper.cpp @@ -90,6 +90,12 @@ void tst_QDecompressHelper::encodingSupported() QVERIFY(accepted.contains("gzip")); int expected = 2; +#if QT_CONFIG(brotli) + QVERIFY(QDecompressHelper::isSupportedEncoding("br")); + QVERIFY(accepted.contains("br")); + ++expected; +#endif + QCOMPARE(expected, accepted.size()); } @@ -115,6 +121,12 @@ void tst_QDecompressHelper::sharedDecompress_data() QTest::newRow("deflate-hello-world") << QByteArray("deflate") << QByteArray::fromBase64("eJzLSM3JyVcozy/KSQEAGgsEXQ==") << QByteArray("hello world"); + +#if QT_CONFIG(brotli) + QTest::newRow("brotli-hello-world") + << QByteArray("br") << QByteArray::fromBase64("DwWAaGVsbG8gd29ybGQD") + << QByteArray("hello world"); +#endif } void tst_QDecompressHelper::decompress_data() @@ -322,6 +334,10 @@ void tst_QDecompressHelper::decompressBigData_data() QTest::newRow("gzip-4G") << QByteArray("gzip") << QString(":/4G.gz") << fourGiB; QTest::newRow("deflate-5G") << QByteArray("deflate") << QString(":/5GiB.txt.inflate") << fiveGiB; + +#if QT_CONFIG(brotli) + QTest::newRow("brotli-4G") << QByteArray("br") << (srcDir + "/4G.br") << fourGiB; +#endif } void tst_QDecompressHelper::decompressBigData() -- cgit v1.2.3