github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-05 20:51:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Introduce helper function to join values as string

Browse source 
PR #20130.
This commit is contained in:
Chocobo1 2023-12-19 00:08:37 +08:00 • committed by GitHub
parent 9d90141c29
commit 073ca4267c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 188 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

1
test/CMakeLists.txt
View file

@ -8,6 +8,7 @@ include_directories("../src")
set(testFiles
testalgorithm.cpp
testbittorrenttrackerentry.cpp
testconceptsexplicitlyconvertibleto.cpp
testconceptsstringable.cpp
testglobal.cpp
testorderedset.cpp

54
test/testconceptsexplicitlyconvertibleto.cpp Normal file
View file

@ -0,0 +1,54 @@
/*
* Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2023 Mike Tzou (Chocobo1)
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* In addition, as a special exception, the copyright holders give permission to
* link this program with the OpenSSL project's "OpenSSL" library (or with
* modified versions of it that use the same license as the "OpenSSL" library),
* and distribute the linked executables. You must obey the GNU General Public
* License in all respects for all of the code used other than "OpenSSL". If you
* modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version.
*/
#include <string>
#include <QObject>
#include <QString>
#include <QTest>
#include "base/concepts/explicitlyconvertibleto.h"
class TestExplicitlyConvertibleTo final : public QObject
{
Q_OBJECT
Q_DISABLE_COPY_MOVE(TestExplicitlyConvertibleTo)
public:
TestExplicitlyConvertibleTo() = default;
private slots:
void testExplicitlyConvertibleTo() const
{
static_assert(ExplicitlyConvertibleTo<const char *, std::string>);
static_assert(!ExplicitlyConvertibleTo<std::string, const char *>);
}
};
QTEST_APPLESS_MAIN(TestExplicitlyConvertibleTo)
#include "testconceptsexplicitlyconvertibleto.moc"

34
test/testorderedset.cpp
View file

@ -33,6 +33,7 @@
#include "base/global.h"
#include "base/orderedset.h"
#include "base/utils/string.h"
class TestOrderedSet final : public QObject
{
@ -57,7 +58,7 @@ private slots:
OrderedSet<QString> set {u"a"_s, u"b"_s, u"c"_s};
set.intersect({u"c"_s, u"a"_s});
QCOMPARE(set.size(), 2);
QCOMPARE(set.join(u","_s), u"a,c"_s);
QCOMPARE(Utils::String::joinIntoString(set, u","_s), u"a,c"_s);
OrderedSet<QString> emptySet;
emptySet.intersect({u"a"_s}).intersect({u"c"_s});;
@ -73,24 +74,15 @@ private slots:
QVERIFY(emptySet.isEmpty());
}
void testJoin() const
{
const OrderedSet<QString> set {u"a"_s, u"b"_s, u"c"_s};
QCOMPARE(set.join(u","_s), u"a,b,c"_s);
const OrderedSet<QString> emptySet;
QCOMPARE(emptySet.join(u","_s), u""_s);
}
void testRemove() const
{
OrderedSet<QString> set {u"a"_s, u"b"_s, u"c"_s};
QVERIFY(!set.remove(u"z"_s));
QCOMPARE(set.join(u","_s), u"a,b,c"_s);
QCOMPARE(Utils::String::joinIntoString(set, u","_s), u"a,b,c"_s);
QVERIFY(set.remove(u"b"_s));
QCOMPARE(set.join(u","_s), u"a,c"_s);
QCOMPARE(Utils::String::joinIntoString(set, u","_s), u"a,c"_s);
QVERIFY(set.remove(u"a"_s));
QCOMPARE(set.join(u","_s), u"c"_s);
QCOMPARE(Utils::String::joinIntoString(set, u","_s), u"c"_s);
QVERIFY(set.remove(u"c"_s));
QVERIFY(set.isEmpty());
@ -107,15 +99,15 @@ private slots:
OrderedSet<QString> set {u"a"_s, u"b"_s, u"c"_s};
set.unite(newData1);
QCOMPARE(set.join(u","_s), u"a,b,c,z"_s);
QCOMPARE(Utils::String::joinIntoString(set, u","_s), u"a,b,c,z"_s);
set.unite(newData2);
QCOMPARE(set.join(u","_s), u"a,b,c,y,z"_s);
QCOMPARE(Utils::String::joinIntoString(set, u","_s), u"a,b,c,y,z"_s);
set.unite(newData3);
QCOMPARE(set.join(u","_s), u"a,b,c,d,e,y,z"_s);
QCOMPARE(Utils::String::joinIntoString(set, u","_s), u"a,b,c,d,e,y,z"_s);
OrderedSet<QString> emptySet;
emptySet.unite(newData1).unite(newData2).unite(newData3);
QCOMPARE(emptySet.join(u","_s), u"c,d,e,y,z"_s);
QCOMPARE(Utils::String::joinIntoString(emptySet, u","_s), u"c,d,e,y,z"_s);
}
void testUnited() const
@ -126,11 +118,11 @@ private slots:
OrderedSet<QString> set {u"a"_s, u"b"_s, u"c"_s};
QCOMPARE(set.united(newData1).join(u","_s), u"a,b,c,z"_s);
QCOMPARE(set.united(newData2).join(u","_s), u"a,b,c,y"_s);
QCOMPARE(set.united(newData3).join(u","_s), u"a,b,c,d,e"_s);
QCOMPARE(Utils::String::joinIntoString(set.united(newData1), u","_s), u"a,b,c,z"_s);
QCOMPARE(Utils::String::joinIntoString(set.united(newData2), u","_s), u"a,b,c,y"_s);
QCOMPARE(Utils::String::joinIntoString(set.united(newData3), u","_s), u"a,b,c,d,e"_s);
QCOMPARE(OrderedSet<QString>().united(newData1).united(newData2).united(newData3).join(u","_s), u"c,d,e,y,z"_s);
QCOMPARE(Utils::String::joinIntoString(OrderedSet<QString>().united(newData1).united(newData2).united(newData3), u","_s), u"c,d,e,y,z"_s);
}
};

36
test/testutilsstring.cpp
View file

@ -26,12 +26,33 @@
* exception statement from your version.
*/
#include <QList>
#include <QObject>
#include <QTest>
#include "base/global.h"
#include "base/utils/string.h"
namespace
{
class MyString
{
public:
MyString(const QString &str)
: m_str {str}
{
}
explicit operator QString() const
{
return m_str;
}
private:
QString m_str;
};
}
class TestUtilsString final : public QObject
{
Q_OBJECT
@ -41,6 +62,21 @@ public:
TestUtilsString() = default;
private slots:
void testJoinIntoString() const
{
const QList<QString> list1;
QCOMPARE(Utils::String::joinIntoString(list1, u","_s), u""_s);
const QList<QString> list2 {u"a"_s};
QCOMPARE(Utils::String::joinIntoString(list2, u","_s), u"a"_s);
const QList<QString> list3 {u"a"_s, u"b"_s};
QCOMPARE(Utils::String::joinIntoString(list3, u" , "_s), u"a , b"_s);
const QList<MyString> list4 {u"a"_s, u"b"_s, u"cd"_s};
QCOMPARE(Utils::String::joinIntoString(list4, u"++"_s), u"a++b++cd"_s);
}
void testSplitCommand() const
{
QCOMPARE(Utils::String::splitCommand({}), {});