summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/tools')
-rw-r--r--tests/auto/tools/moc/tst_moc.cpp4
-rw-r--r--tests/auto/tools/uic/baseline/addtorrentform.ui.h4
-rw-r--r--tests/auto/tools/uic/baseline/config.ui.h4
-rw-r--r--tests/auto/tools/uic/baseline/finddialog.ui.h4
-rw-r--r--tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h4
-rw-r--r--tests/auto/tools/uic/baseline/sslclient.ui.h6
-rw-r--r--tests/auto/tools/uic/baseline/topicchooser.ui.h4
-rw-r--r--tests/auto/tools/uic/baseline/translatedialog.ui.h4
-rw-r--r--tests/auto/tools/uic/tst_uic.cpp94
9 files changed, 92 insertions, 36 deletions
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 08dc9581e1..00e5c60b29 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -83,6 +83,10 @@ QT_USE_NAMESPACE
template <bool b> struct QTBUG_31218 {};
struct QTBUG_31218_Derived : QTBUG_31218<-1<0> {};
+#if defined(Q_MOC_RUN)
+ class QTBUG_45790 : Bug() { };
+#endif
+
struct MyStruct {};
struct MyStruct2 {};
diff --git a/tests/auto/tools/uic/baseline/addtorrentform.ui.h b/tests/auto/tools/uic/baseline/addtorrentform.ui.h
index 29bae9735c..5aca0c4e47 100644
--- a/tests/auto/tools/uic/baseline/addtorrentform.ui.h
+++ b/tests/auto/tools/uic/baseline/addtorrentform.ui.h
@@ -97,7 +97,6 @@ public:
browseTorrents = new QPushButton(groupBox);
browseTorrents->setObjectName(QStringLiteral("browseTorrents"));
- browseTorrents->setDefault(true);
gridLayout->addWidget(browseTorrents, 0, 3, 1, 1);
@@ -205,6 +204,9 @@ public:
QObject::connect(okButton, SIGNAL(clicked()), AddTorrentFile, SLOT(accept()));
QObject::connect(cancelButton, SIGNAL(clicked()), AddTorrentFile, SLOT(reject()));
+ browseTorrents->setDefault(true);
+
+
QMetaObject::connectSlotsByName(AddTorrentFile);
} // setupUi
diff --git a/tests/auto/tools/uic/baseline/config.ui.h b/tests/auto/tools/uic/baseline/config.ui.h
index 0775c02346..2d9003b4b9 100644
--- a/tests/auto/tools/uic/baseline/config.ui.h
+++ b/tests/auto/tools/uic/baseline/config.ui.h
@@ -688,7 +688,6 @@ public:
buttonOk = new QPushButton(Config);
buttonOk->setObjectName(QStringLiteral("buttonOk"));
buttonOk->setAutoDefault(true);
- buttonOk->setDefault(true);
hboxLayout3->addWidget(buttonOk);
@@ -706,6 +705,9 @@ public:
QObject::connect(size_width, SIGNAL(valueChanged(int)), size_custom, SLOT(click()));
QObject::connect(size_height, SIGNAL(valueChanged(int)), size_custom, SLOT(click()));
+ buttonOk->setDefault(true);
+
+
QMetaObject::connectSlotsByName(Config);
} // setupUi
diff --git a/tests/auto/tools/uic/baseline/finddialog.ui.h b/tests/auto/tools/uic/baseline/finddialog.ui.h
index 50595edc8a..259d36569f 100644
--- a/tests/auto/tools/uic/baseline/finddialog.ui.h
+++ b/tests/auto/tools/uic/baseline/finddialog.ui.h
@@ -164,7 +164,6 @@ public:
vboxLayout1->setObjectName(QStringLiteral("vboxLayout1"));
findNxt = new QPushButton(FindDialog);
findNxt->setObjectName(QStringLiteral("findNxt"));
- findNxt->setDefault(true);
findNxt->setFlat(false);
vboxLayout1->addWidget(findNxt);
@@ -194,6 +193,9 @@ public:
retranslateUi(FindDialog);
QObject::connect(cancel, SIGNAL(clicked()), FindDialog, SLOT(reject()));
+ findNxt->setDefault(true);
+
+
QMetaObject::connectSlotsByName(FindDialog);
} // setupUi
diff --git a/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h b/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h
index 484c0877bc..31edb426fe 100644
--- a/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h
+++ b/tests/auto/tools/uic/baseline/qsqlconnectiondialog.ui.h
@@ -171,7 +171,6 @@ public:
okButton = new QPushButton(QSqlConnectionDialogUi);
okButton->setObjectName(QStringLiteral("okButton"));
- okButton->setDefault(true);
hboxLayout1->addWidget(okButton);
@@ -202,6 +201,9 @@ public:
retranslateUi(QSqlConnectionDialogUi);
+ okButton->setDefault(true);
+
+
QMetaObject::connectSlotsByName(QSqlConnectionDialogUi);
} // setupUi
diff --git a/tests/auto/tools/uic/baseline/sslclient.ui.h b/tests/auto/tools/uic/baseline/sslclient.ui.h
index a74a465955..f2071d8780 100644
--- a/tests/auto/tools/uic/baseline/sslclient.ui.h
+++ b/tests/auto/tools/uic/baseline/sslclient.ui.h
@@ -86,7 +86,6 @@ public:
connectButton = new QPushButton(Form);
connectButton->setObjectName(QStringLiteral("connectButton"));
connectButton->setEnabled(true);
- connectButton->setDefault(true);
vboxLayout->addWidget(connectButton);
@@ -136,7 +135,6 @@ public:
sendButton->setObjectName(QStringLiteral("sendButton"));
sendButton->setEnabled(false);
sendButton->setFocusPolicy(Qt::TabFocus);
- sendButton->setDefault(true);
hboxLayout1->addWidget(sendButton);
@@ -151,6 +149,10 @@ public:
QObject::connect(hostNameEdit, SIGNAL(returnPressed()), connectButton, SLOT(animateClick()));
QObject::connect(sessionInput, SIGNAL(returnPressed()), sendButton, SLOT(animateClick()));
+ connectButton->setDefault(true);
+ sendButton->setDefault(true);
+
+
QMetaObject::connectSlotsByName(Form);
} // setupUi
diff --git a/tests/auto/tools/uic/baseline/topicchooser.ui.h b/tests/auto/tools/uic/baseline/topicchooser.ui.h
index 06d34e9c63..3935a7a87b 100644
--- a/tests/auto/tools/uic/baseline/topicchooser.ui.h
+++ b/tests/auto/tools/uic/baseline/topicchooser.ui.h
@@ -77,7 +77,6 @@ public:
buttonDisplay = new QPushButton(Layout16);
buttonDisplay->setObjectName(QStringLiteral("buttonDisplay"));
buttonDisplay->setAutoDefault(true);
- buttonDisplay->setDefault(true);
hboxLayout->addWidget(buttonDisplay);
@@ -96,6 +95,9 @@ public:
retranslateUi(TopicChooser);
+ buttonDisplay->setDefault(true);
+
+
QMetaObject::connectSlotsByName(TopicChooser);
} // setupUi
diff --git a/tests/auto/tools/uic/baseline/translatedialog.ui.h b/tests/auto/tools/uic/baseline/translatedialog.ui.h
index 72a2b48f2e..c494ca77c3 100644
--- a/tests/auto/tools/uic/baseline/translatedialog.ui.h
+++ b/tests/auto/tools/uic/baseline/translatedialog.ui.h
@@ -164,7 +164,6 @@ public:
vboxLayout2->setContentsMargins(0, 0, 0, 0);
findNxt = new QPushButton(TranslateDialog);
findNxt->setObjectName(QStringLiteral("findNxt"));
- findNxt->setDefault(true);
findNxt->setFlat(false);
vboxLayout2->addWidget(findNxt);
@@ -206,6 +205,9 @@ public:
retranslateUi(TranslateDialog);
QObject::connect(cancel, SIGNAL(clicked()), TranslateDialog, SLOT(reject()));
+ findNxt->setDefault(true);
+
+
QMetaObject::connectSlotsByName(TranslateDialog);
} // setupUi
diff --git a/tests/auto/tools/uic/tst_uic.cpp b/tests/auto/tools/uic/tst_uic.cpp
index 1d1e327641..eac80bed7a 100644
--- a/tests/auto/tools/uic/tst_uic.cpp
+++ b/tests/auto/tools/uic/tst_uic.cpp
@@ -39,6 +39,7 @@
#include <QtCore/QByteArray>
#include <QtCore/QLibraryInfo>
#include <QtCore/QTemporaryDir>
+#include <QtCore/QStandardPaths>
class tst_uic : public QObject
{
@@ -67,10 +68,12 @@ private:
const QString m_command;
QString m_baseline;
QTemporaryDir m_generated;
+ QRegExp m_versionRegexp;
};
tst_uic::tst_uic()
: m_command(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/uic"))
+ , m_versionRegexp(QLatin1String("Created by: Qt User Interface Compiler version [.\\d]{5,5}"))
{
}
@@ -83,6 +86,7 @@ static QByteArray msgProcessStartFailed(const QString &command, const QString &w
void tst_uic::initTestCase()
{
+ QVERIFY(m_versionRegexp.isValid());
m_baseline = QFINDTESTDATA("baseline");
QVERIFY2(!m_baseline.isEmpty(), "Could not find 'baseline'.");
QProcess process;
@@ -171,6 +175,37 @@ void tst_uic::run_data() const
}
}
+// Helpers to generate a diff using the standard diff tool if present for failures.
+static inline QString diffBinary()
+{
+ QString binary = QLatin1String("diff");
+#ifdef Q_OS_WIN
+ binary += QLatin1String(".exe");
+#endif
+ return QStandardPaths::findExecutable(binary);
+}
+
+static QString generateDiff(const QString &originalFile, const QString &generatedFile)
+{
+ static const QString diff = diffBinary();
+ if (diff.isEmpty())
+ return QString();
+ const QStringList args = QStringList() << QLatin1String("-u")
+ << QDir::toNativeSeparators(originalFile)
+ << QDir::toNativeSeparators(generatedFile);
+ QProcess diffProcess;
+ diffProcess.start(diff, args);
+ return diffProcess.waitForStarted() && diffProcess.waitForFinished()
+ ? QString::fromLocal8Bit(diffProcess.readAllStandardOutput()) : QString();
+}
+
+static QByteArray msgCannotReadFile(const QFile &file)
+{
+ const QString result = QLatin1String("Could not read file: ")
+ + QDir::toNativeSeparators(file.fileName())
+ + QLatin1String(": ") + file.errorString();
+ return result.toLocal8Bit();
+}
void tst_uic::compare()
{
@@ -180,23 +215,23 @@ void tst_uic::compare()
QFile orgFile(originalFile);
QFile genFile(generatedFile);
- if (!orgFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
- QString err(QLatin1String("Could not read file: %1..."));
- QFAIL(err.arg(orgFile.fileName()).toUtf8());
- }
+ QVERIFY2(orgFile.open(QIODevice::ReadOnly | QIODevice::Text), msgCannotReadFile(orgFile));
- if (!genFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
- QString err(QLatin1String("Could not read file: %1..."));
- QFAIL(err.arg(genFile.fileName()).toUtf8());
- }
+ QVERIFY2(genFile.open(QIODevice::ReadOnly | QIODevice::Text), msgCannotReadFile(genFile));
- originalFile = orgFile.readAll();
- originalFile.replace(QRegExp(QLatin1String("Created by: Qt User Interface Compiler version [.\\d]{5,5}")), "");
+ QString originalFileContents = orgFile.readAll();
+ originalFileContents.replace(m_versionRegexp, QString());
- generatedFile = genFile.readAll();
- generatedFile.replace(QRegExp(QLatin1String("Created by: Qt User Interface Compiler version [.\\d]{5,5}")), "");
+ QString generatedFileContents = genFile.readAll();
+ generatedFileContents.replace(m_versionRegexp, QString());
- QCOMPARE(generatedFile, originalFile);
+ if (generatedFileContents != originalFileContents) {
+ const QString diff = generateDiff(originalFile, generatedFile);
+ if (!diff.isEmpty())
+ qWarning().noquote().nospace() << "Difference:\n" << diff;
+ }
+
+ QCOMPARE(generatedFileContents, originalFileContents);
}
void tst_uic::compare_data() const
@@ -240,28 +275,31 @@ void tst_uic::runTranslation()
void tst_uic::runCompare()
{
- QFile orgFile(m_baseline + QLatin1String("/translation/Dialog_without_Buttons_tr.h"));
+ const QString dialogFile = QLatin1String("/translation/Dialog_without_Buttons_tr.h");
+ const QString originalFile = m_baseline + dialogFile;
+ QFile orgFile(originalFile);
QDir generated(m_generated.path());
- QFile genFile(generated.absolutePath() + QLatin1String("/translation/Dialog_without_Buttons_tr.h"));
+ const QString generatedFile = generated.absolutePath() + dialogFile;
+ QFile genFile(generatedFile);
- if (!orgFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
- QString err(QLatin1String("Could not read file: %1..."));
- QFAIL(err.arg(orgFile.fileName()).toUtf8());
- }
+ QVERIFY2(orgFile.open(QIODevice::ReadOnly | QIODevice::Text), msgCannotReadFile(orgFile));
- if (!genFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
- QString err(QLatin1String("Could not read file: %1..."));
- QFAIL(err.arg(genFile.fileName()).toUtf8());
- }
+ QVERIFY2(genFile.open(QIODevice::ReadOnly | QIODevice::Text), msgCannotReadFile(genFile));
- QString originalFile = orgFile.readAll();
- originalFile.replace(QRegExp(QLatin1String("Created by: Qt User Interface Compiler version [.\\d]{5,5}")), "");
+ QString originalFileContents = orgFile.readAll();
+ originalFileContents.replace(m_versionRegexp, QString());
- QString generatedFile = genFile.readAll();
- generatedFile.replace(QRegExp(QLatin1String("Created by: Qt User Interface Compiler version [.\\d]{5,5}")), "");
+ QString generatedFileContents = genFile.readAll();
+ generatedFileContents.replace(m_versionRegexp, QString());
+
+ if (generatedFileContents != originalFileContents) {
+ const QString diff = generateDiff(originalFile, generatedFile);
+ if (!diff.isEmpty())
+ qWarning().noquote().nospace() << "Difference:\n" << diff;
+ }
- QCOMPARE(generatedFile, originalFile);
+ QCOMPARE(generatedFileContents, originalFileContents);
}
QTEST_MAIN(tst_uic)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 16:02:29 +0000