From 8a5e1fbd4f42a0f5cc23ac797d06424c1b362536 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 11 Aug 2009 20:50:53 +1000 Subject: Update URL for Qt FTP site. Reviewed-by: Trust Me --- tests/auto/q3dns/tst_q3dns.cpp | 4 ++-- tests/auto/qftp/tst_qftp.cpp | 2 +- tests/auto/qurl/tst_qurl.cpp | 44 +++++++++++++++++++++--------------------- 3 files changed, 25 insertions(+), 25 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/q3dns/tst_q3dns.cpp b/tests/auto/q3dns/tst_q3dns.cpp index 018ce84142..222a1d7821 100644 --- a/tests/auto/q3dns/tst_q3dns.cpp +++ b/tests/auto/q3dns/tst_q3dns.cpp @@ -113,7 +113,7 @@ void tst_Q3Dns::destructor() { QApplication a( argc, argv ); Q3Socket *s = new Q3Socket( &a ); - s->connectToHost( "ftp.trolltech.com", 21 ); + s->connectToHost( "ftp.qt.nokia.com", 21 ); return 0; } */ @@ -121,7 +121,7 @@ void tst_Q3Dns::destructor() char **v = 0; QCoreApplication a(c, v); Q3Socket *s = new Q3Socket(&a); - s->connectToHost("ftp.trolltech.com", 21); + s->connectToHost("ftp.qt.nokia.com", 21); // dummy verify since this test only makes shure that it does not crash QVERIFY( TRUE ); diff --git a/tests/auto/qftp/tst_qftp.cpp b/tests/auto/qftp/tst_qftp.cpp index d883c0ce19..7fa5601867 100644 --- a/tests/auto/qftp/tst_qftp.cpp +++ b/tests/auto/qftp/tst_qftp.cpp @@ -2002,7 +2002,7 @@ void tst_QFtp::queueMoreCommandsInDoneSlot() this->ftp = &ftp; connect(&ftp, SIGNAL(done(bool)), this, SLOT(cdUpSlot(bool))); - ftp.connectToHost("ftp.trolltech.com"); + ftp.connectToHost("ftp.qt.nokia.com"); ftp.login(); ftp.cd("qt"); ftp.rmdir("qtest-removedir-noexist"); diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp index cccb1db632..be709e1432 100644 --- a/tests/auto/qurl/tst_qurl.cpp +++ b/tests/auto/qurl/tst_qurl.cpp @@ -1814,8 +1814,8 @@ void tst_QUrl::compat_constructor_01_data() //next we fill it with data QTest::newRow( "data0" ) << QString("Makefile") << QString("Makefile"); // nolonger add file by defualt QTest::newRow( "data1" ) << QString("Makefile") << QString("Makefile"); - QTest::newRow( "data2" ) << QString("ftp://ftp.trolltech.com/qt/INSTALL") << QString("ftp://ftp.trolltech.com/qt/INSTALL"); - QTest::newRow( "data3" ) << QString("ftp://ftp.trolltech.com/qt/INSTALL") << QString("ftp://ftp.trolltech.com/qt/INSTALL"); + QTest::newRow( "data2" ) << QString("ftp://ftp.qt.nokia.com/qt/INSTALL") << QString("ftp://ftp.trolltech.com/qt/INSTALL"); + QTest::newRow( "data3" ) << QString("ftp://ftp.qt.nokia.com/qt/INSTALL") << QString("ftp://ftp.trolltech.com/qt/INSTALL"); } void tst_QUrl::compat_constructor_01() @@ -1830,7 +1830,7 @@ void tst_QUrl::compat_constructor_01() * as well as the following: * * QUrlOperator op; - * op.copy(QString("ftp://ftp.trolltech.com/qt/INSTALL"), "."); + * op.copy(QString("ftp://ftp.qt.nokia.com/qt/INSTALL"), "."); */ QFETCH( QString, urlStr ); @@ -1855,15 +1855,15 @@ void tst_QUrl::compat_constructor_02_data() QTest::addColumn("res"); //next we fill it with data - QTest::newRow( "data0" ) << QString("ftp://ftp.trolltech.com/qt") << QString("INSTALL") << QString("ftp://ftp.trolltech.com/INSTALL"); - QTest::newRow( "data1" ) << QString("ftp://ftp.trolltech.com/qt/") << QString("INSTALL") << QString("ftp://ftp.trolltech.com/qt/INSTALL"); + QTest::newRow( "data0" ) << QString("ftp://ftp.qt.nokia.com/qt") << QString("INSTALL") << QString("ftp://ftp.trolltech.com/INSTALL"); + QTest::newRow( "data1" ) << QString("ftp://ftp.qt.nokia.com/qt/") << QString("INSTALL") << QString("ftp://ftp.trolltech.com/qt/INSTALL"); } void tst_QUrl::compat_constructor_02() { /* The following should work as expected: * - * QUrlOperator op( "ftp://ftp.trolltech.com/qt" ); + * QUrlOperator op( "ftp://ftp.qt.nokia.com/qt" ); * op.copy(QString("INSTALL"), "."); */ QFETCH( QString, urlStr ); @@ -1886,7 +1886,7 @@ void tst_QUrl::compat_constructor_03_data() QTest::newRow( "protocol02" ) << QString( "http://qt.nokia.com/" ) << QString( "http://www.trolltech.com/" ); QTest::newRow( "protocol03" ) << QString( "http://qt.nokia.com/foo" ) << QString( "http://www.trolltech.com/foo" ); QTest::newRow( "protocol04" ) << QString( "http://qt.nokia.com/foo/" ) << QString( "http://www.trolltech.com/foo/" ); - QTest::newRow( "protocol05" ) << QString( "ftp://ftp.trolltech.com/foo/index.txt" ) << QString( "ftp://ftp.trolltech.com/foo/index.txt" ); + QTest::newRow( "protocol05" ) << QString( "ftp://ftp.qt.nokia.com/foo/index.txt" ) << QString( "ftp://ftp.trolltech.com/foo/index.txt" ); QTest::newRow( "local00" ) << QString( "/foo" ) << QString( "/foo" ); QTest::newRow( "local01" ) << QString( "/foo/" ) << QString( "/foo/" ); @@ -1928,11 +1928,11 @@ void tst_QUrl::compat_isValid_01_data() QTest::addColumn("urlStr"); QTest::addColumn("res"); - QTest::newRow( "ok_01" ) << QString("ftp://ftp.trolltech.com/qt/INSTALL") << (bool)true; + QTest::newRow( "ok_01" ) << QString("ftp://ftp.qt.nokia.com/qt/INSTALL") << (bool)true; QTest::newRow( "ok_02" ) << QString( "file:/foo") << (bool)true; QTest::newRow( "ok_03" ) << QString( "file:foo") << (bool)true; - QTest::newRow( "err_01" ) << QString("#ftp://ftp.trolltech.com/qt/INSTALL") << (bool)true; + QTest::newRow( "err_01" ) << QString("#ftp://ftp.qt.nokia.com/qt/INSTALL") << (bool)true; QTest::newRow( "err_02" ) << QString( "file:/::foo") << (bool)true; } @@ -1958,18 +1958,18 @@ void tst_QUrl::compat_isValid_02_data() QString n = ""; QTest::newRow( "ok_01" ) << n << n << n << n << -1 << QString("path") << (bool)true; - QTest::newRow( "ok_02" ) << QString("ftp") << n << n << QString("ftp.trolltech.com") << -1 << n << (bool)true; - QTest::newRow( "ok_03" ) << QString("ftp") << QString("foo") << n << QString("ftp.trolltech.com") << -1 << n << (bool)true; - QTest::newRow( "ok_04" ) << QString("ftp") << QString("foo") << QString("bar") << QString("ftp.trolltech.com") << -1 << n << (bool)true; - QTest::newRow( "ok_05" ) << QString("ftp") << n << n << QString("ftp.trolltech.com") << -1 << QString("path")<< (bool)true; - QTest::newRow( "ok_06" ) << QString("ftp") << QString("foo") << n << QString("ftp.trolltech.com") << -1 << QString("path") << (bool)true; - QTest::newRow( "ok_07" ) << QString("ftp") << QString("foo") << QString("bar") << QString("ftp.trolltech.com") << -1 << QString("path")<< (bool)true; + QTest::newRow( "ok_02" ) << QString("ftp") << n << n << QString("ftp.qt.nokia.com") << -1 << n << (bool)true; + QTest::newRow( "ok_03" ) << QString("ftp") << QString("foo") << n << QString("ftp.qt.nokia.com") << -1 << n << (bool)true; + QTest::newRow( "ok_04" ) << QString("ftp") << QString("foo") << QString("bar") << QString("ftp.qt.nokia.com") << -1 << n << (bool)true; + QTest::newRow( "ok_05" ) << QString("ftp") << n << n << QString("ftp.qt.nokia.com") << -1 << QString("path")<< (bool)true; + QTest::newRow( "ok_06" ) << QString("ftp") << QString("foo") << n << QString("ftp.qt.nokia.com") << -1 << QString("path") << (bool)true; + QTest::newRow( "ok_07" ) << QString("ftp") << QString("foo") << QString("bar") << QString("ftp.qt.nokia.com") << -1 << QString("path")<< (bool)true; QTest::newRow( "err_01" ) << n << n << n << n << -1 << n << (bool)false; QTest::newRow( "err_02" ) << QString("ftp") << n << n << n << -1 << n << (bool)true; QTest::newRow( "err_03" ) << n << QString("foo") << n << n << -1 << n << (bool)true; QTest::newRow( "err_04" ) << n << n << QString("bar") << n << -1 << n << (bool)true; - QTest::newRow( "err_05" ) << n << n << n << QString("ftp.trolltech.com") << -1 << n << (bool)true; + QTest::newRow( "err_05" ) << n << n << n << QString("ftp.qt.nokia.com") << -1 << n << (bool)true; QTest::newRow( "err_06" ) << n << n << n << n << 80 << n << (bool)true; QTest::newRow( "err_07" ) << QString("ftp") << QString("foo") << n << n << -1 << n << (bool)true; QTest::newRow( "err_08" ) << QString("ftp") << n << QString("bar") << n << -1 << n << (bool)true; @@ -2452,12 +2452,12 @@ void tst_QUrl::schemeValidator_data() // ftp QTest::newRow("ftp:") << QByteArray("ftp:") << true << QString("ftp:"); - QTest::newRow("ftp://ftp.trolltech.com") - << QByteArray("ftp://ftp.trolltech.com") - << true << QString("ftp://ftp.trolltech.com"); - QTest::newRow("ftp://ftp.trolltech.com/") - << QByteArray("ftp://ftp.trolltech.com/") - << true << QString("ftp://ftp.trolltech.com/"); + QTest::newRow("ftp://ftp.qt.nokia.com") + << QByteArray("ftp://ftp.qt.nokia.com") + << true << QString("ftp://ftp.qt.nokia.com"); + QTest::newRow("ftp://ftp.qt.nokia.com/") + << QByteArray("ftp://ftp.qt.nokia.com/") + << true << QString("ftp://ftp.qt.nokia.com/"); QTest::newRow("ftp:/index.html") << QByteArray("ftp:/index.html") << false << QString(); -- cgit v1.2.3