1 files changed, 32 insertions, 0 deletions
diff --git a/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp b/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
index 62c29229e1..811e9a0010 100644
--- a/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
+++ b/tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp
@@ -44,6 +44,7 @@ private slots:
 
     // In-process tests
     void testInvalidOptions();
+    void testDuplicateOption();
     void testPositionalArguments();
     void testBooleanOption_data();
     void testBooleanOption();
@@ -74,6 +75,7 @@ private slots:
     void testHelpOption_data();
     void testHelpOption();
     void testQuoteEscaping();
+    void testUnknownOption();
 };
 
 static char *empty_argv[] = { 0 };
@@ -103,6 +105,15 @@ void tst_QCommandLineParser::testInvalidOptions()
     QVERIFY(!parser.addOption(QCommandLineOption(QStringLiteral("-v"), QStringLiteral("Displays version information."))));
 }
 
+void tst_QCommandLineParser::testDuplicateOption()
+{
+    QCoreApplication app(empty_argc, empty_argv);
+    QCommandLineParser parser;
+    QVERIFY(parser.addOption(QCommandLineOption(QStringLiteral("h"), QStringLiteral("Hostname."), QStringLiteral("hostname"))));
+    QTest::ignoreMessage(QtWarningMsg, "QCommandLineParser: already having an option named \"h\"");
+    parser.addHelpOption();
+}
+
 void tst_QCommandLineParser::testPositionalArguments()
 {
     QCoreApplication app(empty_argc, empty_argv);
@@ -648,6 +659,27 @@ void tst_QCommandLineParser::testQuoteEscaping()
 #endif // QT_CONFIG(process)
 }
 
+void tst_QCommandLineParser::testUnknownOption()
+{
+#if !QT_CONFIG(process)
+    QSKIP("This test requires QProcess support");
+#elif defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_EMBEDDED)
+    QSKIP("Deploying executable applications to file system on Android not supported.");
+#else
+    QCoreApplication app(empty_argc, empty_argv);
+    QProcess process;
+    process.start("testhelper/qcommandlineparser_test_helper", QStringList() <<
+            QString::number(QCommandLineParser::ParseAsLongOptions) <<
+            "-unknown-option");
+    QVERIFY(process.waitForFinished(5000));
+    QCOMPARE(process.exitStatus(), QProcess::NormalExit);
+    process.setReadChannel(QProcess::StandardError);
+    QString output = process.readAll();
+    QVERIFY2(output.contains("qcommandlineparser_test_helper"), qPrintable(output)); // separate in case of .exe extension
+    QVERIFY2(output.contains(": Unknown option 'unknown-option'"), qPrintable(output));
+#endif // QT_CONFIG(process)
+}
+
 QTEST_APPLESS_MAIN(tst_QCommandLineParser)
 #include "tst_qcommandlineparser.moc"