summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2019-03-28 15:01:04 +0100
committerPeter Varga <pvarga@inf.u-szeged.hu>2019-04-09 14:37:19 +0000
commit649f960f9bf66ea3f49dc2f723ed6d8d51e1963f (patch)
tree62bc38b7c0f103ea921790e037ee8fc489a04fb4
parentc9a64fda178c32ac924977ac93bf83d7e47767fe (diff)
Unskip downloadUniqueFilenameWithTimestamp auto test
Task-number: QTBUG-74764 Change-Id: I0e872449584b37c484e4d5ea46ba0bbc47124f51 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp b/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp
index 8669c8f9..c41315cd 100644
--- a/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp
+++ b/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp
@@ -73,7 +73,7 @@ private Q_SLOTS:
void downloadDeletedByProfile();
void downloadUniqueFilename_data();
void downloadUniqueFilename();
- void downloadUniqueFileNameWithTimeStamp();
+ void downloadUniqueFilenameWithTimestamp();
void downloadToDefaultLocation();
void downloadToNonExistentDir();
void downloadToReadOnlyDir();
@@ -917,11 +917,8 @@ void tst_QWebEngineDownloadItem::downloadUniqueFilename()
}
}
-void tst_QWebEngineDownloadItem::downloadUniqueFileNameWithTimeStamp()
+void tst_QWebEngineDownloadItem::downloadUniqueFilenameWithTimestamp()
{
-#ifdef Q_OS_WIN
- QSKIP("QTBUG-74764: The download completes after the test fails thus would ruin subsequent tests on Windows.");
-#endif
// Set up HTTP server
QString baseName("test(1.test)");
QString extension("txt");
@@ -988,8 +985,8 @@ void tst_QWebEngineDownloadItem::downloadUniqueFileNameWithTimeStamp()
QRegularExpressionMatch match = fileNameCheck.match(downloadedFilePath);
QVERIFY(match.hasMatch());
// ISO 8601 Date and time in UTC
- QRegExp timeStamp("^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])([.][0-9]+)?(Z|[+-](?:2[0-3]|[01][0-9]):[0-5][0-9])?$");
- QVERIFY(timeStamp.exactMatch(match.captured(1)));
+ QRegExp timestamp("^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])T(2[0-3]|[01][0-9])([0-5][0-9])([0-5][0-9])([.][0-9]+)?(Z|[+-](?:2[0-3]|[01][0-9])[0-5][0-9])?$");
+ QVERIFY(timestamp.exactMatch(match.captured(1)));
}
}