diff options
Diffstat (limited to 'tests/auto/network/access/qnetworkreply')
7 files changed, 90 insertions, 7 deletions
diff --git a/tests/auto/network/access/qnetworkreply/BLACKLIST b/tests/auto/network/access/qnetworkreply/BLACKLIST index 801ac65d71..a2c6224ce0 100644 --- a/tests/auto/network/access/qnetworkreply/BLACKLIST +++ b/tests/auto/network/access/qnetworkreply/BLACKLIST @@ -15,8 +15,6 @@ linux # QTBUG-71953 [getFromHttp] * !android !winrt -[getFromHttp:success-external] -* [getFromHttpIntoBuffer] osx [getFromHttpIntoBuffer2] diff --git a/tests/auto/network/access/qnetworkreply/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/CMakeLists.txt new file mode 100644 index 0000000000..f7efa8f7f3 --- /dev/null +++ b/tests/auto/network/access/qnetworkreply/CMakeLists.txt @@ -0,0 +1,7 @@ +# Generated from qnetworkreply.pro. + +add_subdirectory(test) + +if(NOT WINRT) + add_subdirectory(echo) +endif() diff --git a/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt b/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt new file mode 100644 index 0000000000..e43272d7e8 --- /dev/null +++ b/tests/auto/network/access/qnetworkreply/echo/.prev_CMakeLists.txt @@ -0,0 +1,10 @@ +# Generated from echo.pro. + +##################################################################### +## echo Binary: +##################################################################### + +add_qt_executable(echo + SOURCES + main.cpp +) diff --git a/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt new file mode 100644 index 0000000000..f260b97b8d --- /dev/null +++ b/tests/auto/network/access/qnetworkreply/echo/CMakeLists.txt @@ -0,0 +1,11 @@ +# Generated from echo.pro. + +##################################################################### +## echo Binary: +##################################################################### + +add_qt_executable(echo + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case + SOURCES + main.cpp +) diff --git a/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt new file mode 100644 index 0000000000..97d0da3d34 --- /dev/null +++ b/tests/auto/network/access/qnetworkreply/test/CMakeLists.txt @@ -0,0 +1,61 @@ +# Generated from test.pro. + +##################################################################### +## tst_qnetworkreply Test: +##################################################################### + +# Collect test data +list(APPEND test_data "../empty") +list(APPEND test_data "../rfc3252.txt") +list(APPEND test_data "../resource") +list(APPEND test_data "../bigfile") +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ../*.jpg) +list(APPEND test_data ${test_data_glob}) +list(APPEND test_data "../certs") +list(APPEND test_data "../index.html") +list(APPEND test_data "../smb-file.txt") + +add_qt_test(tst_qnetworkreply + SOURCES + ../../../../../shared/emulationdetector.h + ../tst_qnetworkreply.cpp + INCLUDE_DIRECTORIES + ../../../../../shared + LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate + PUBLIC_LIBRARIES + Qt::Network + TESTDATA ${test_data} +) + +# Resources: +set_source_files_properties("../resource" + PROPERTIES QT_RESOURCE_ALIAS "resource" +) +set(qnetworkreply_resource_files + "resource" +) + +add_qt_resource(tst_qnetworkreply "qnetworkreply" + PREFIX + "/" + BASE + ".." + FILES + ${qnetworkreply_resource_files} +) + + +#### Keys ignored in scope 1:.:.:test.pro:<TRUE>: +# QT_FOR_CONFIG = "gui-private" +# QT_TEST_SERVER_LIST = "vsftpd" "apache2" "ftp-proxy" "danted" "squid" +# testcase.timeout = "600" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:test.pro:NOT ANDROID AND NOT WINRT: +# TEST_HELPER_INSTALLS = "../echo/echo" diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro index 4cc1f6431e..d3385c1929 100644 --- a/tests/auto/network/access/qnetworkreply/test/test.pro +++ b/tests/auto/network/access/qnetworkreply/test/test.pro @@ -4,7 +4,7 @@ CONFIG -= debug_and_release_target INCLUDEPATH += ../../../../../shared/ HEADERS += ../../../../../shared/emulationdetector.h SOURCES += ../tst_qnetworkreply.cpp -TARGET = ../tst_qnetworkreply +TARGET = tst_qnetworkreply QT = core-private network-private testlib QT_FOR_CONFIG += gui-private diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 1494ebbcd8..83fe83fe3d 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -1914,10 +1914,6 @@ void tst_QNetworkReply::getFromHttp_data() << testDataDir + "/rfc3252.txt" << "http://" + QtNetworkSettings::httpServerName() + "/qtest/rfc3252.txt"; - QTest::newRow("success-external") - << testDataDir + "/rfc3252.txt" - << "http://www.ietf.org/rfc/rfc3252.txt"; - QTest::newRow("bigfile-internal") << testDataDir + "/bigfile" << "http://" + QtNetworkSettings::httpServerName() + "/qtest/bigfile"; |