|
 |
b85a01a |
From d2b17a8aeada96df3304725cd532c76a94ce3cc4 Mon Sep 17 00:00:00 2001
|
|
|
b85a01a |
From: Jaroslaw Staniek <staniek@kde.org>
|
|
|
b85a01a |
Date: Tue, 29 Oct 2019 22:47:56 +0100
|
|
|
b85a01a |
Subject: [PATCH 03/22] Autotests: Fix QCOMPARE for QString,const char* and
|
|
|
b85a01a |
QByteArrya,const char *
|
|
|
b85a01a |
|
|
|
b85a01a |
FIXED-IN:3.2.1
|
|
|
b85a01a |
---
|
|
|
b85a01a |
autotests/DateTimeTest.cpp | 1 +
|
|
|
b85a01a |
autotests/KDbTestUtils.cpp | 10 ++++++++++
|
|
|
b85a01a |
autotests/KDbTestUtils.h | 5 +++++
|
|
|
b85a01a |
3 files changed, 16 insertions(+)
|
|
|
b85a01a |
|
|
|
b85a01a |
diff --git a/autotests/DateTimeTest.cpp b/autotests/DateTimeTest.cpp
|
|
|
b85a01a |
index ed655caf..bb32771b 100644
|
|
|
b85a01a |
--- a/autotests/DateTimeTest.cpp
|
|
|
b85a01a |
+++ b/autotests/DateTimeTest.cpp
|
|
|
b85a01a |
@@ -18,6 +18,7 @@
|
|
|
b85a01a |
*/
|
|
|
b85a01a |
|
|
|
b85a01a |
#include "DateTimeTest.h"
|
|
|
b85a01a |
+#include "KDbTestUtils.h"
|
|
|
b85a01a |
|
|
|
b85a01a |
#include <QtTest>
|
|
|
b85a01a |
|
|
|
b85a01a |
diff --git a/autotests/KDbTestUtils.cpp b/autotests/KDbTestUtils.cpp
|
|
|
b85a01a |
index 494670a5..3c358161 100644
|
|
|
b85a01a |
--- a/autotests/KDbTestUtils.cpp
|
|
|
b85a01a |
+++ b/autotests/KDbTestUtils.cpp
|
|
|
b85a01a |
@@ -110,6 +110,16 @@ KDBTESTUTILS_EXPORT bool qCompare(const QStringList &val1, const QStringList &va
|
|
|
b85a01a |
: compare_helper(false, "Compared values are not the same", toString(val1),
|
|
|
b85a01a |
toString(val2), actual, expected, file, line);
|
|
|
b85a01a |
}
|
|
|
b85a01a |
+KDBTESTUTILS_EXPORT bool qCompare(const QByteArray &val1, const char *val2, const char *actual,
|
|
|
b85a01a |
+ const char *expected, const char *file, int line)
|
|
|
b85a01a |
+{
|
|
|
b85a01a |
+ return qCompare(val1, QByteArray(val2), actual, expected, file, line);
|
|
|
b85a01a |
+}
|
|
|
b85a01a |
+KDBTESTUTILS_EXPORT bool qCompare(const QString &val1, const char *val2, const char *actual,
|
|
|
b85a01a |
+ const char *expected, const char *file, int line)
|
|
|
b85a01a |
+{
|
|
|
b85a01a |
+ return qCompare(val1, QString::fromLatin1(val2), actual, expected, file, line);
|
|
|
b85a01a |
+}
|
|
|
b85a01a |
}
|
|
|
b85a01a |
|
|
|
b85a01a |
class KDbTestUtils::Private {
|
|
|
b85a01a |
diff --git a/autotests/KDbTestUtils.h b/autotests/KDbTestUtils.h
|
|
|
b85a01a |
index 0462e95c..9094f177 100644
|
|
|
b85a01a |
--- a/autotests/KDbTestUtils.h
|
|
|
b85a01a |
+++ b/autotests/KDbTestUtils.h
|
|
|
b85a01a |
@@ -79,6 +79,11 @@ KDBTESTUTILS_EXPORT bool qCompare(const QString &val1, const KDbEscapedString &v
|
|
|
b85a01a |
KDBTESTUTILS_EXPORT bool qCompare(const QStringList &val1, const QStringList &val2,
|
|
|
b85a01a |
const char *actual, const char *expected, const char *file,
|
|
|
b85a01a |
int line);
|
|
|
b85a01a |
+
|
|
|
b85a01a |
+KDBTESTUTILS_EXPORT bool qCompare(const QByteArray &val1, const char *val2, const char *actual,
|
|
|
b85a01a |
+ const char *expected, const char *file, int line);
|
|
|
b85a01a |
+KDBTESTUTILS_EXPORT bool qCompare(const QString &val1, const char *val2, const char *actual,
|
|
|
b85a01a |
+ const char *expected, const char *file, int line);
|
|
|
b85a01a |
}
|
|
|
b85a01a |
|
|
|
b85a01a |
//! Calls @a call and verifies status of @a resultable
|
|
|
b85a01a |
--
|
|
|
b85a01a |
2.31.1
|
|
|
b85a01a |
|