QSslEllipticCurve: add fromLongName

Since the conversion to a long name was already there, also support
creation from a long name.

Change-Id: Iad712db7447fb0a0a18f600b7db54da5b5b87154
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

1 files changed, 30 insertions, 0 deletions

diff --git a/tests/auto/network/ssl/qsslellipticcurve/tst_qsslellipticcurve.cpp b/tests/auto/network/ssl/qsslellipticcurve/tst_qsslellipticcurve.cpp
index a5b1d14a92..67d87530ec 100644
--- a/tests/auto/network/ssl/qsslellipticcurve/tst_qsslellipticcurve.cpp
+++ b/tests/auto/network/ssl/qsslellipticcurve/tst_qsslellipticcurve.cpp
@@ -54,6 +54,8 @@ private Q_SLOTS:
     void construction();
     void fromShortName_data();
     void fromShortName();
+    void fromLongName_data();
+    void fromLongName();
 #endif
 };
 
@@ -114,6 +116,34 @@ void tst_QSslEllipticCurve::fromShortName()
     QCOMPARE(result.shortName(), valid ? shortName : QString());
 }
 
+void tst_QSslEllipticCurve::fromLongName_data()
+{
+    QTest::addColumn<QString>("longName");
+    QTest::addColumn<QSslEllipticCurve>("curve");
+    QTest::addColumn<bool>("valid");
+
+    QTest::newRow("QString()") << QString() << QSslEllipticCurve() << false;
+    QTest::newRow("\"\"") << QString("") << QSslEllipticCurve() << false;
+    QTest::newRow("does-not-exist") << QStringLiteral("does-not-exist") << QSslEllipticCurve() << false;
+    Q_FOREACH (QSslEllipticCurve ec, QSslSocket::supportedEllipticCurves()) {
+        const QString lN = ec.longName();
+        QTest::newRow(qPrintable("supported EC \"" + lN + '"')) << lN << ec << true;
+    }
+}
+
+void tst_QSslEllipticCurve::fromLongName()
+{
+    QFETCH(QString, longName);
+    QFETCH(QSslEllipticCurve, curve);
+    QFETCH(bool, valid);
+
+    const QSslEllipticCurve result = QSslEllipticCurve::fromLongName(longName);
+    QCOMPARE(result, curve);
+    QCOMPARE(result.isValid(), valid);
+    QCOMPARE(result.longName(), curve.longName());
+    QCOMPARE(result.longName(), valid ? longName : QString());
+}
+
 #endif // QT_NO_SSL
 
 QTEST_MAIN(tst_QSslEllipticCurve)