diff options
Diffstat (limited to 'tests/auto/network/access')
3 files changed, 16 insertions, 20 deletions
diff --git a/tests/auto/network/access/qhttp/tst_qhttp.cpp b/tests/auto/network/access/qhttp/tst_qhttp.cpp index a0c4a4ebd4..d73a191ebc 100644 --- a/tests/auto/network/access/qhttp/tst_qhttp.cpp +++ b/tests/auto/network/access/qhttp/tst_qhttp.cpp @@ -97,8 +97,10 @@ private slots: void proxy2(); void proxy3(); void postAuthNtlm(); +#ifndef QT_NO_OPENSSL void proxyAndSsl(); void cachingProxyAndSsl(); +#endif void reconnect(); void setSocket(); void unexpectedRemoteClose(); @@ -1357,11 +1359,9 @@ void tst_QHttp::postAuthNtlm() QVERIFY(!QTestEventLoop::instance().timeout()); }; +#ifndef QT_NO_OPENSSL void tst_QHttp::proxyAndSsl() { -#ifdef QT_NO_OPENSSL - QSKIP("No OpenSSL support in this platform", SkipAll); -#else QFETCH_GLOBAL(bool, setProxy); if (setProxy) return; @@ -1388,14 +1388,12 @@ void tst_QHttp::proxyAndSsl() QHttpResponseHeader header = http.lastResponse(); QVERIFY(header.isValid()); QVERIFY(header.statusCode() < 400); // Should be 200, but as long as it's not an error, we're happy -#endif } +#endif +#ifndef QT_NO_OPENSSL void tst_QHttp::cachingProxyAndSsl() { -#ifdef QT_NO_OPENSSL - QSKIP("No OpenSSL support in this platform", SkipAll); -#else QFETCH_GLOBAL(bool, setProxy); if (setProxy) return; @@ -1420,8 +1418,8 @@ void tst_QHttp::cachingProxyAndSsl() QHttpResponseHeader header = http.lastResponse(); QVERIFY(!header.isValid()); -#endif } +#endif void tst_QHttp::emptyBodyInReply() { diff --git a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp index 1b4256bb00..5051aa5fee 100644 --- a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp +++ b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp @@ -54,8 +54,10 @@ private slots: void setCookiesFromUrl(); void cookiesForUrl_data(); void cookiesForUrl(); +#ifdef QT_BUILD_INTERNAL void effectiveTLDs_data(); void effectiveTLDs(); +#endif }; QT_BEGIN_NAMESPACE @@ -362,6 +364,8 @@ void tst_QNetworkCookieJar::cookiesForUrl() QCOMPARE(result, expectedResult); } +// This test requires private API. +#ifdef QT_BUILD_INTERNAL void tst_QNetworkCookieJar::effectiveTLDs_data() { QTest::addColumn<QString>("domain"); @@ -433,13 +437,11 @@ void tst_QNetworkCookieJar::effectiveTLDs_data() void tst_QNetworkCookieJar::effectiveTLDs() { -#ifndef QT_BUILD_INTERNAL - QSKIP("Test requires private API", SkipAll); -#endif QFETCH(QString, domain); QFETCH(bool, isTLD); QCOMPARE(qIsEffectiveTLD(domain), isTLD); } +#endif QTEST_MAIN(tst_QNetworkCookieJar) #include "tst_qnetworkcookiejar.moc" diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index f668930ffa..bc7ab7f24a 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -262,8 +262,10 @@ private Q_SLOTS: void ioPutToFileFromSocket(); void ioPutToFileFromLocalSocket_data(); void ioPutToFileFromLocalSocket(); +#if !defined(QT_NO_PROCESS) && !defined(Q_OS_WINCE) void ioPutToFileFromProcess_data(); void ioPutToFileFromProcess(); +#endif void ioPutToFtpFromFile_data(); void ioPutToFtpFromFile(); void ioPutToHttpFromFile_data(); @@ -3744,6 +3746,8 @@ void tst_QNetworkReply::ioPutToFileFromLocalSocket() QCOMPARE(contents, data); } +// Currently no stdin/out supported for Windows CE. +#if !defined(QT_NO_PROCESS) && !defined(Q_OS_WINCE) void tst_QNetworkReply::ioPutToFileFromProcess_data() { putToFile_data(); @@ -3751,19 +3755,12 @@ void tst_QNetworkReply::ioPutToFileFromProcess_data() void tst_QNetworkReply::ioPutToFileFromProcess() { -#if defined(Q_OS_WINCE) - QSKIP("Currently no stdin/out supported for Windows CE", SkipAll); -#else - #ifdef Q_OS_WIN if (qstrcmp(QTest::currentDataTag(), "small") == 0) QSKIP("When passing a CR-LF-LF sequence through Windows stdio, it gets converted, " "so this test fails. Disabled on Windows", SkipSingle); #endif -#if defined(QT_NO_PROCESS) - QSKIP("Qt was compiled with QT_NO_PROCESS", SkipAll); -#else QFile file(testFileName); QUrl url = QUrl::fromLocalFile(file.fileName()); @@ -3790,9 +3787,8 @@ void tst_QNetworkReply::ioPutToFileFromProcess() QCOMPARE(file.size(), qint64(data.size())); QByteArray contents = file.readAll(); QCOMPARE(contents, data); -#endif -#endif } +#endif void tst_QNetworkReply::ioPutToFtpFromFile_data() { |