1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Fix some more old references and links to Nokia

Browse Source 
Task-number: QTBUG-28156
Change-Id: Ifb768b167203c901c5e42ce58c9aaf3db2739320
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
This commit is contained in:
Sergio Ahumada 2013-01-30 00:58:55 +01:00 committed by The Qt Project
parent 256dc059ee
commit d011f64524
15 changed files with 153 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
tests/auto/corelib/io/qurl/tst_qurl.cpp
View File

@ -225,14 +225,14 @@ void tst_QUrl::constructing()
QVERIFY(url == url);
QVERIFY(!(url < url));
QUrl justHost("qt.nokia.com");
QUrl justHost("qt-project.org");
QVERIFY(!justHost.isEmpty());
QVERIFY(justHost.host().isEmpty());
QCOMPARE(justHost.path(), QString::fromLatin1("qt.nokia.com"));
QCOMPARE(justHost.path(), QString::fromLatin1("qt-project.org"));
QUrl hostWithSlashes("//qt.nokia.com");
QUrl hostWithSlashes("//qt-project.org");
QVERIFY(hostWithSlashes.path().isEmpty());
QCOMPARE(hostWithSlashes.host(), QString::fromLatin1("qt.nokia.com"));
QCOMPARE(hostWithSlashes.host(), QString::fromLatin1("qt-project.org"));
}
void tst_QUrl::hashInPath()
@ -269,7 +269,7 @@ void tst_QUrl::unc()
void tst_QUrl::assignment()
{
QUrl url("http://qt.nokia.com/");
QUrl url("http://qt-project.org/");
QVERIFY(url.isValid());
QUrl copy;
@ -280,10 +280,10 @@ void tst_QUrl::assignment()
void tst_QUrl::comparison()
{
QUrl url1("http://qt.nokia.com/");
QUrl url1("http://qt-project.org/");
QVERIFY(url1.isValid());
QUrl url2("http://qt.nokia.com/");
QUrl url2("http://qt-project.org/");
QVERIFY(url2.isValid());
QVERIFY(url1 == url2);
@ -367,7 +367,7 @@ void tst_QUrl::comparison2()
void tst_QUrl::copying()
{
QUrl url("http://qt.nokia.com/");
QUrl url("http://qt-project.org/");
QVERIFY(url.isValid());
QUrl copy(url);
@ -983,9 +983,9 @@ void tst_QUrl::toString_constructed_data()
QString n("");
QTest::newRow("data1") << n << n << n << QString::fromLatin1("qt.nokia.com") << -1 << QString::fromLatin1("/index.html")
<< QByteArray() << n << QString::fromLatin1("//qt.nokia.com/index.html")
<< QByteArray("//qt.nokia.com/index.html") << 0u;
QTest::newRow("data1") << n << n << n << QString::fromLatin1("qt-project.org") << -1 << QString::fromLatin1("/index.html")
<< QByteArray() << n << QString::fromLatin1("//qt-project.org/index.html")
<< QByteArray("//qt-project.org/index.html") << 0u;
QTest::newRow("data2") << QString::fromLatin1("file") << n << n << n << -1 << QString::fromLatin1("/root") << QByteArray()
<< n << QString::fromLatin1("file:///root") << QByteArray("file:///root") << 0u;
QTest::newRow("userAndPass") << QString::fromLatin1("http") << QString::fromLatin1("dfaure") << QString::fromLatin1("kde")
@ -1143,22 +1143,22 @@ void tst_QUrl::compat_legacy()
/* others
*/
{
QUrl u( "http://qt.nokia.com/images/ban/pgs_front.jpg" );
QUrl u( "http://qt-project.org/images/ban/pgs_front.jpg" );
QCOMPARE( u.path(), QString("/images/ban/pgs_front.jpg") );
}
{
QUrl tmp( "http://qt.nokia.com/images/ban/" );
QUrl tmp( "http://qt-project.org/images/ban/" );
QUrl u = tmp.resolved(QString("pgs_front.jpg"));
QCOMPARE( u.path(), QString("/images/ban/pgs_front.jpg") );
}
{
QUrl tmp;
QUrl u = tmp.resolved(QString("http://qt.nokia.com/images/ban/pgs_front.jpg"));
QUrl u = tmp.resolved(QString("http://qt-project.org/images/ban/pgs_front.jpg"));
QCOMPARE( u.path(), QString("/images/ban/pgs_front.jpg") );
}
{
QUrl tmp;
QUrl u = tmp.resolved(QString("http://qt.nokia.com/images/ban/pgs_front.jpg"));
QUrl u = tmp.resolved(QString("http://qt-project.org/images/ban/pgs_front.jpg"));
QFileInfo fi(u.path());
u.setPath(fi.path());
QCOMPARE( u.path(), QString("/images/ban") );
@ -1240,11 +1240,11 @@ void tst_QUrl::compat_constructor_03_data()
QTest::addColumn<QString>("res");
//next we fill it with data
QTest::newRow( "protocol00" ) << QString( "http://qt.nokia.com/index.html" ) << QString( "http://qt.nokia.com/index.html" );
QTest::newRow( "protocol01" ) << QString( "http://qt.nokia.com" ) << QString( "http://qt.nokia.com" );
QTest::newRow( "protocol02" ) << QString( "http://qt.nokia.com/" ) << QString( "http://qt.nokia.com/" );
QTest::newRow( "protocol03" ) << QString( "http://qt.nokia.com/foo" ) << QString( "http://qt.nokia.com/foo" );
QTest::newRow( "protocol04" ) << QString( "http://qt.nokia.com/foo/" ) << QString( "http://qt.nokia.com/foo/" );
QTest::newRow( "protocol00" ) << QString( "http://qt-project.org/index.html" ) << QString( "http://qt-project.org/index.html" );
QTest::newRow( "protocol01" ) << QString( "http://qt-project.org" ) << QString( "http://qt-project.org" );
QTest::newRow( "protocol02" ) << QString( "http://qt-project.org/" ) << QString( "http://qt-project.org/" );
QTest::newRow( "protocol03" ) << QString( "http://qt-project.org/foo" ) << QString( "http://qt-project.org/foo" );
QTest::newRow( "protocol04" ) << QString( "http://qt-project.org/foo/" ) << QString( "http://qt-project.org/foo/" );
QTest::newRow( "protocol05" ) << QString( "ftp://ftp.qt-project.org/foo/index.txt" ) << QString( "ftp://ftp.qt-project.org/foo/index.txt" );
QTest::newRow( "local00" ) << QString( "/foo" ) << QString( "/foo" );
@ -1371,7 +1371,7 @@ void tst_QUrl::compat_path_data()
QTest::addColumn<QString>("url");
QTest::addColumn<QString>("res");
QTest::newRow( "protocol00" ) << "http://qt.nokia.com/images/ban/pgs_front.jpg" << "/images/ban/pgs_front.jpg";
QTest::newRow( "protocol00" ) << "http://qt-project.org/images/ban/pgs_front.jpg" << "/images/ban/pgs_front.jpg";
#if defined( Q_OS_WIN32 )
QTest::newRow( "winShare00" ) << "//Anarki/homes" << "/homes";
@ -1421,8 +1421,8 @@ void tst_QUrl::compat_decode_data()
QTest::newRow("NormalString") << QByteArray("filename") << QString("filename");
QTest::newRow("NormalStringEncoded") << QByteArray("file%20name") << QString("file name");
QTest::newRow("JustEncoded") << QByteArray("%20") << QString(" ");
QTest::newRow("HTTPUrl") << QByteArray("http://qt.nokia.com") << QString("http://qt.nokia.com");
QTest::newRow("HTTPUrlEncoded") << QByteArray("http://qt%20nokia%20com") << QString("http://qt nokia com");
QTest::newRow("HTTPUrl") << QByteArray("http://qt-project.org") << QString("http://qt-project.org");
QTest::newRow("HTTPUrlEncoded") << QByteArray("http://qt-project%20org") << QString("http://qt-project org");
QTest::newRow("EmptyString") << QByteArray("") << QString("");
QTest::newRow("NulByte") << QByteArray("C%00%0A") << QString::fromLatin1("C\0\n", 3);
QTest::newRow("Task27166") << QByteArray("Fran%C3%A7aise") << QString::fromUtf8("Française");
@ -1444,8 +1444,8 @@ void tst_QUrl::compat_encode_data()
QTest::newRow("NormalString") << QString("filename") << QByteArray("filename");
QTest::newRow("NormalStringEncoded") << QString("file name") << QByteArray("file%20name");
QTest::newRow("JustEncoded") << QString(" ") << QByteArray("%20");
QTest::newRow("HTTPUrl") << QString("http://qt.nokia.com") << QByteArray("http%3A//qt.nokia.com");
QTest::newRow("HTTPUrlEncoded") << QString("http://qt nokia com") << QByteArray("http%3A//qt%20nokia%20com");
QTest::newRow("HTTPUrl") << QString("http://qt-project.org") << QByteArray("http%3A//qt-project.org");
QTest::newRow("HTTPUrlEncoded") << QString("http://qt-project org") << QByteArray("http%3A//qt-project%20org");
QTest::newRow("EmptyString") << QString("") << QByteArray("");
QTest::newRow("NulByte") << QString::fromLatin1("C\0\n", 3) << QByteArray("C%00%0A");
QTest::newRow("Task27166") << QString::fromUtf8("Française") << QByteArray("Fran%C3%A7aise");
@ -1541,9 +1541,9 @@ void tst_QUrl::toPercentEncoding()
void tst_QUrl::swap()
{
QUrl u1(QLatin1String("http://qt.nokia.com")), u2(QLatin1String("http://www.kdab.com"));
QUrl u1(QLatin1String("http://qt-project.org")), u2(QLatin1String("http://www.kdab.com"));
u1.swap(u2);
QCOMPARE(u2.host(),QLatin1String("qt.nokia.com"));
QCOMPARE(u2.host(),QLatin1String("qt-project.org"));
QCOMPARE(u1.host(),QLatin1String("www.kdab.com"));
}
@ -1557,8 +1557,8 @@ void tst_QUrl::symmetry()
QCOMPARE(url.encodedQuery().constData(), QString::fromLatin1("a=b&a=d%C3%B8&a=f").toLatin1().constData());
QCOMPARE(url.fragment(), QString::fromUtf8("vræl"));
QUrl onlyHost("//qt.nokia.com");
QCOMPARE(onlyHost.toString(), QString::fromLatin1("//qt.nokia.com"));
QUrl onlyHost("//qt-project.org");
QCOMPARE(onlyHost.toString(), QString::fromLatin1("//qt-project.org"));
{
QString urlString = QString::fromLatin1("http://desktop:33326/upnp/{32f525a6-6f31-426e-91ca-01c2e6c2c57e}");
@ -1676,7 +1676,7 @@ void tst_QUrl::isRelative_data()
QTest::addColumn<QString>("url");
QTest::addColumn<bool>("trueFalse");
QTest::newRow("not") << QString::fromLatin1("http://qt.nokia.com") << false;
QTest::newRow("not") << QString::fromLatin1("http://qt-project.org") << false;
QTest::newRow("55288") << QString::fromLatin1("node64.html#fig:form:ana") << true;
// kde
@ -1860,26 +1860,26 @@ void tst_QUrl::invalidSchemeValidator()
{
// test that if scheme does not start with an ALPHA, QUrl::isValid() returns false
{
QUrl url("1http://qt.nokia.com");
QUrl url("1http://qt-project.org");
QVERIFY(url.scheme().isEmpty());
QVERIFY(url.path().startsWith("1http"));
}
{
QUrl url("http://qt.nokia.com");
url.setScheme("111http://qt.nokia.com");
QUrl url("http://qt-project.org");
url.setScheme("111http://qt-project.org");
QCOMPARE(url.isValid(), false);
QVERIFY(url.toString().isEmpty());
}
// non-ALPHA character at other positions in the scheme are ok
{
QUrl url("ht111tp://qt.nokia.com", QUrl::StrictMode);
QUrl url("ht111tp://qt-project.org", QUrl::StrictMode);
QVERIFY(url.isValid());
QCOMPARE(url.scheme(), QString("ht111tp"));
QVERIFY(!url.toString().isEmpty());
}
{
QUrl url("http://qt.nokia.com");
url.setScheme("ht123tp://qt.nokia.com");
QUrl url("http://qt-project.org");
url.setScheme("ht123tp://qt-project.org");
QVERIFY(!url.isValid());
QVERIFY(url.toString().isEmpty());
url.setScheme("http");
@ -1887,7 +1887,7 @@ void tst_QUrl::invalidSchemeValidator()
QVERIFY(!url.toString().isEmpty());
}
{
QUrl url = QUrl::fromEncoded("ht321tp://qt.nokia.com", QUrl::StrictMode);
QUrl url = QUrl::fromEncoded("ht321tp://qt-project.org", QUrl::StrictMode);
QVERIFY(url.isValid());
QVERIFY(!url.toString().isEmpty());
}
@ -2431,7 +2431,7 @@ void tst_QUrl::hosts_data()
// normal hostnames
QTest::newRow("normal") << QString("http://intern") << QString("intern");
QTest::newRow("normal2") << QString("http://qt.nokia.com") << QString("qt.nokia.com");
QTest::newRow("normal2") << QString("http://qt-project.org") << QString("qt-project.org");
// IDN hostnames
QTest::newRow("idn") << QString(QLatin1String("http://\345r.no")) << QString(QLatin1String("\345r.no"));

12
tests/auto/corelib/io/qurlquery/tst_qurlquery.cpp
View File

@ -795,12 +795,12 @@ void tst_QUrl::removeAllEncodedQueryItems_data()
QTest::addColumn<QByteArray>("key");
QTest::addColumn<QUrl>("result");
QTest::newRow("test1") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&bbb=b&ccc=c") << QByteArray("bbb") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&ccc=c");
QTest::newRow("test2") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&bbb=b&ccc=c") << QByteArray("aaa") << QUrl::fromEncoded("http://qt.nokia.com/foo?bbb=b&ccc=c");
// QTest::newRow("test3") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&bbb=b&ccc=c") << QByteArray("ccc") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&bbb=b");
QTest::newRow("test4") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&bbb=b&ccc=c") << QByteArray("b%62b") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&bbb=b&ccc=c");
QTest::newRow("test5") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&b%62b=b&ccc=c") << QByteArray("b%62b") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&ccc=c");
QTest::newRow("test6") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&b%62b=b&ccc=c") << QByteArray("bbb") << QUrl::fromEncoded("http://qt.nokia.com/foo?aaa=a&b%62b=b&ccc=c");
QTest::newRow("test1") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&bbb=b&ccc=c") << QByteArray("bbb") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&ccc=c");
QTest::newRow("test2") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&bbb=b&ccc=c") << QByteArray("aaa") << QUrl::fromEncoded("http://qt-project.org/foo?bbb=b&ccc=c");
// QTest::newRow("test3") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&bbb=b&ccc=c") << QByteArray("ccc") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&bbb=b");
QTest::newRow("test4") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&bbb=b&ccc=c") << QByteArray("b%62b") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&bbb=b&ccc=c");
QTest::newRow("test5") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&b%62b=b&ccc=c") << QByteArray("b%62b") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&ccc=c");
QTest::newRow("test6") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&b%62b=b&ccc=c") << QByteArray("bbb") << QUrl::fromEncoded("http://qt-project.org/foo?aaa=a&b%62b=b&ccc=c");
}
void tst_QUrl::removeAllEncodedQueryItems()

6
tests/auto/corelib/kernel/qmimedata/tst_qmimedata.cpp
View File

@ -312,7 +312,7 @@ void tst_QMimeData::setUrls() const
QList<QUrl> longUrlList;
// set up
shortUrlList += QUrl("http://qt.nokia.com");
shortUrlList += QUrl("http://qt-project.org");
longUrlList = shortUrlList;
longUrlList += QUrl("http://www.google.com");
@ -322,12 +322,12 @@ void tst_QMimeData::setUrls() const
// set a few, verify
mimeData.setUrls(shortUrlList);
QCOMPARE(mimeData.urls(), shortUrlList);
QCOMPARE(mimeData.text(), QString("http://qt.nokia.com"));
QCOMPARE(mimeData.text(), QString("http://qt-project.org"));
// change them, verify
mimeData.setUrls(longUrlList);
QCOMPARE(mimeData.urls(), longUrlList);
QCOMPARE(mimeData.text(), QString("http://qt.nokia.com\nhttp://www.google.com\n"));
QCOMPARE(mimeData.text(), QString("http://qt-project.org\nhttp://www.google.com\n"));
// clear, verify
mimeData.clear();

2
tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
View File

@ -2029,7 +2029,7 @@ void tst_QVariant::saveLoadCustomTypes()
void tst_QVariant::url()
{
QString str("http://qt.nokia.com");
QString str("http://qt-project.org");
QUrl url(str);
QVariant v(url); //built with a QUrl

8
tests/auto/corelib/tools/qbytearray/tst_qbytearray.cpp
View File

@ -1458,8 +1458,8 @@ void tst_QByteArray::fromPercentEncoding_data()
QTest::newRow("NormalString") << QByteArray("filename") << QByteArray("filename");
QTest::newRow("NormalStringEncoded") << QByteArray("file%20name") << QByteArray("file name");
QTest::newRow("JustEncoded") << QByteArray("%20") << QByteArray(" ");
QTest::newRow("HTTPUrl") << QByteArray("http://qt.nokia.com") << QByteArray("http://qt.nokia.com");
QTest::newRow("HTTPUrlEncoded") << QByteArray("http://qt%20nokia%20com") << QByteArray("http://qt nokia com");
QTest::newRow("HTTPUrl") << QByteArray("http://qt-project.org") << QByteArray("http://qt-project.org");
QTest::newRow("HTTPUrlEncoded") << QByteArray("http://qt-project%20org") << QByteArray("http://qt-project org");
QTest::newRow("EmptyString") << QByteArray("") << QByteArray("");
QTest::newRow("Task27166") << QByteArray("Fran%C3%A7aise") << QByteArray("Française");
}
@ -1480,8 +1480,8 @@ void tst_QByteArray::toPercentEncoding_data()
QTest::newRow("NormalString") << QByteArray("filename") << QByteArray("filename");
QTest::newRow("NormalStringEncoded") << QByteArray("file name") << QByteArray("file%20name");
QTest::newRow("JustEncoded") << QByteArray(" ") << QByteArray("%20");
QTest::newRow("HTTPUrl") << QByteArray("http://qt.nokia.com") << QByteArray("http%3A//qt.nokia.com");
QTest::newRow("HTTPUrlEncoded") << QByteArray("http://qt nokia com") << QByteArray("http%3A//qt%20nokia%20com");
QTest::newRow("HTTPUrl") << QByteArray("http://qt-project.org") << QByteArray("http%3A//qt-project.org");
QTest::newRow("HTTPUrlEncoded") << QByteArray("http://qt-project org") << QByteArray("http%3A//qt-project%20org");
QTest::newRow("EmptyString") << QByteArray("") << QByteArray("");
QTest::newRow("Task27166") << QByteArray("Française") << QByteArray("Fran%C3%A7aise");
}

16
tests/auto/corelib/xml/qxmlstream/data/namespaceCDATA.ref
View File

@ -1,21 +1,21 @@
StartDocument( )
DTD( text="<!DOCTYPE footype [
<!ATTLIST foo xmlns CDATA #FIXED "http://qt.nokia.com">
<!ATTLIST pre:bar xmlns:pre CDATA #FIXED "http://qt.nokia.com">
<!ATTLIST foo xmlns CDATA #FIXED "http://qt-project.org">
<!ATTLIST pre:bar xmlns:pre CDATA #FIXED "http://qt-project.org">
]>" dtdName="footype" )
StartElement( name="body" qualifiedName="body" )
Characters( whitespace text="
" )
StartElement( name="foo" namespaceUri="http://qt.nokia.com" qualifiedName="foo"
NamespaceDeclaration( namespaceUri="http://qt.nokia.com" )
StartElement( name="foo" namespaceUri="http://qt-project.org" qualifiedName="foo"
NamespaceDeclaration( namespaceUri="http://qt-project.org" )
)
EndElement( name="foo" namespaceUri="http://qt.nokia.com" qualifiedName="foo" )
EndElement( name="foo" namespaceUri="http://qt-project.org" qualifiedName="foo" )
Characters( whitespace text="
" )
StartElement( name="bar" namespaceUri="http://qt.nokia.com" qualifiedName="pre:bar" prefix="pre"
NamespaceDeclaration( prefix="pre" namespaceUri="http://qt.nokia.com" )
StartElement( name="bar" namespaceUri="http://qt-project.org" qualifiedName="pre:bar" prefix="pre"
NamespaceDeclaration( prefix="pre" namespaceUri="http://qt-project.org" )
)
EndElement( name="bar" namespaceUri="http://qt.nokia.com" qualifiedName="pre:bar" )
EndElement( name="bar" namespaceUri="http://qt-project.org" qualifiedName="pre:bar" )
Characters( whitespace text="
" )
EndElement( name="body" qualifiedName="body" )

4
tests/auto/corelib/xml/qxmlstream/data/namespaceCDATA.xml
View File

@ -1,6 +1,6 @@
<!DOCTYPE footype [
<!ATTLIST foo xmlns CDATA #FIXED "http://qt.nokia.com">
<!ATTLIST pre:bar xmlns:pre CDATA #FIXED "http://qt.nokia.com">
<!ATTLIST foo xmlns CDATA #FIXED "http://qt-project.org">
<!ATTLIST pre:bar xmlns:pre CDATA #FIXED "http://qt-project.org">
]>
<body>
<foo/>

48
tests/auto/network/access/qnetworkcookie/tst_qnetworkcookie.cpp
View File

@ -256,17 +256,17 @@ void tst_QNetworkCookie::parseSingleCookie_data()
QTest::newRow("path-with-utf8-2") << "a=b;path=/R%C3%A9sum%C3%A9" << cookie;
cookie.setPath(QString());
cookie.setDomain("qt.nokia.com");
QTest::newRow("plain-domain1") << "a=b;domain=qt.nokia.com" << cookie;
QTest::newRow("plain-domain2") << "a=b; domain=qt.nokia.com " << cookie;
QTest::newRow("plain-domain3") << "a=b;domain=QT.NOKIA.COM" << cookie;
QTest::newRow("plain-domain4") << "a=b;DOMAIN = QT.NOKIA.COM" << cookie;
cookie.setDomain("qt-project.org");
QTest::newRow("plain-domain1") << "a=b;domain=qt-project.org" << cookie;
QTest::newRow("plain-domain2") << "a=b; domain=qt-project.org " << cookie;
QTest::newRow("plain-domain3") << "a=b;domain=QT-PROJECT.ORG" << cookie;
QTest::newRow("plain-domain4") << "a=b;DOMAIN = QT-PROJECT.ORG" << cookie;
cookie.setDomain(".qt.nokia.com");
QTest::newRow("dot-domain1") << "a=b;domain=.qt.nokia.com" << cookie;
QTest::newRow("dot-domain2") << "a=b; domain=.qt.nokia.com" << cookie;
QTest::newRow("dot-domain3") << "a=b; domain=.QT.NOKIA.COM" << cookie;
QTest::newRow("dot-domain4") << "a=b; Domain = .QT.NOKIA.COM" << cookie;
cookie.setDomain(".qt-project.org");
QTest::newRow("dot-domain1") << "a=b;domain=.qt-project.org" << cookie;
QTest::newRow("dot-domain2") << "a=b; domain=.qt-project.org" << cookie;
QTest::newRow("dot-domain3") << "a=b; domain=.QT-PROJECT.ORG" << cookie;
QTest::newRow("dot-domain4") << "a=b; Domain = .QT-PROJECT.ORG" << cookie;
cookie.setDomain(QString::fromUtf8(".d\303\270gn\303\245pent.troll.no"));
QTest::newRow("idn-domain1") << "a=b;domain=.xn--dgnpent-gxa2o.troll.no" << cookie;
@ -274,20 +274,20 @@ void tst_QNetworkCookie::parseSingleCookie_data()
QTest::newRow("idn-domain3") << "a=b;domain=.XN--DGNPENT-GXA2O.TROLL.NO" << cookie;
QTest::newRow("idn-domain4") << QString::fromUtf8("a=b;domain=.D\303\230GN\303\205PENT.troll.NO") << cookie;
cookie.setDomain(".qt.nokia.com");
cookie.setDomain(".qt-project.org");
cookie.setPath("/");
QTest::newRow("two-fields") << "a=b;domain=.qt.nokia.com;path=/" << cookie;
QTest::newRow("two-fields2") << "a=b; domain=.qt.nokia.com; path=/" << cookie;
QTest::newRow("two-fields3") << "a=b; domain=.qt.nokia.com ; path=/ " << cookie;
QTest::newRow("two-fields4") << "a=b;path=/; domain=.qt.nokia.com" << cookie;
QTest::newRow("two-fields5") << "a=b; path=/ ; domain=.qt.nokia.com" << cookie;
QTest::newRow("two-fields6") << "a=b; path= / ; domain =.qt.nokia.com" << cookie;
QTest::newRow("two-fields") << "a=b;domain=.qt-project.org;path=/" << cookie;
QTest::newRow("two-fields2") << "a=b; domain=.qt-project.org; path=/" << cookie;
QTest::newRow("two-fields3") << "a=b; domain=.qt-project.org ; path=/ " << cookie;
QTest::newRow("two-fields4") << "a=b;path=/; domain=.qt-project.org" << cookie;
QTest::newRow("two-fields5") << "a=b; path=/ ; domain=.qt-project.org" << cookie;
QTest::newRow("two-fields6") << "a=b; path= / ; domain =.qt-project.org" << cookie;
cookie.setSecure(true);
QTest::newRow("three-fields") << "a=b;domain=.qt.nokia.com;path=/;secure" << cookie;
QTest::newRow("three-fields2") << "a=b;secure;path=/;domain=.qt.nokia.com" << cookie;
QTest::newRow("three-fields3") << "a=b;secure;domain=.qt.nokia.com; path=/" << cookie;
QTest::newRow("three-fields4") << "a = b;secure;domain=.qt.nokia.com; path=/" << cookie;
QTest::newRow("three-fields") << "a=b;domain=.qt-project.org;path=/;secure" << cookie;
QTest::newRow("three-fields2") << "a=b;secure;path=/;domain=.qt-project.org" << cookie;
QTest::newRow("three-fields3") << "a=b;secure;domain=.qt-project.org; path=/" << cookie;
QTest::newRow("three-fields4") << "a = b;secure;domain=.qt-project.org; path=/" << cookie;
cookie = QNetworkCookie();
cookie.setName("a");
@ -575,9 +575,9 @@ void tst_QNetworkCookie::parseSingleCookie_data()
QTest::newRow("expires+path") << "a=b; expires=Wed, 09-Nov-1999 23:12:40 GMT; path=/" << cookie;
QTest::newRow("path+expires") << "a=b; path=/;expires=Wed, 09-Nov-1999 23:12:40 GMT " << cookie;
cookie.setDomain(".qt.nokia.com");
QTest::newRow("full") << "a=b; domain=.qt.nokia.com;expires=Wed, 09-Nov-1999 23:12:40 GMT;path=/" << cookie;
QTest::newRow("full2") << "a=b;path=/; expires=Wed, 09-Nov-1999 23:12:40 GMT ;domain=.qt.nokia.com" << cookie;
cookie.setDomain(".qt-project.org");
QTest::newRow("full") << "a=b; domain=.qt-project.org;expires=Wed, 09-Nov-1999 23:12:40 GMT;path=/" << cookie;
QTest::newRow("full2") << "a=b;path=/; expires=Wed, 09-Nov-1999 23:12:40 GMT ;domain=.qt-project.org" << cookie;
// cookies obtained from the network:
cookie = QNetworkCookie("__siteid", "1");

80
tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
View File

@ -275,74 +275,74 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
QNetworkCookie cookie;
cookie.setName("a");
cookie.setPath("/web");
cookie.setDomain(".nokia.com");
cookie.setDomain(".qt-project.org");
allCookies += cookie;
QTest::newRow("no-match-1") << allCookies << "http://foo.bar/" << result;
QTest::newRow("no-match-2") << allCookies << "http://foo.bar/web" << result;
QTest::newRow("no-match-3") << allCookies << "http://foo.bar/web/wiki" << result;
QTest::newRow("no-match-4") << allCookies << "http://nokia.com" << result;
QTest::newRow("no-match-5") << allCookies << "http://qt.nokia.com" << result;
QTest::newRow("no-match-6") << allCookies << "http://nokia.com/webinar" << result;
QTest::newRow("no-match-7") << allCookies << "http://qt.nokia.com/webinar" << result;
QTest::newRow("no-match-8") << allCookies << "http://qt.nokia.com./web" << result;
QTest::newRow("no-match-9") << allCookies << "http://nokia.com./web" << result;
QTest::newRow("no-match-4") << allCookies << "http://qt-project.org" << result;
QTest::newRow("no-match-5") << allCookies << "http://qt-project.org" << result;
QTest::newRow("no-match-6") << allCookies << "http://qt-project.org/webinar" << result;
QTest::newRow("no-match-7") << allCookies << "http://qt-project.org/webinar" << result;
QTest::newRow("no-match-8") << allCookies << "http://qt-project.org./web" << result;
QTest::newRow("no-match-9") << allCookies << "http://qt-project.org./web" << result;
result = allCookies;
QTest::newRow("match-1") << allCookies << "http://nokia.com/web" << result;
QTest::newRow("match-2") << allCookies << "http://nokia.com/web/" << result;
QTest::newRow("match-3") << allCookies << "http://nokia.com/web/content" << result;
QTest::newRow("match-4") << allCookies << "http://qt.nokia.com/web" << result;
QTest::newRow("match-5") << allCookies << "http://qt.nokia.com/web/" << result;
QTest::newRow("match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
QTest::newRow("match-1") << allCookies << "http://qt-project.org/web" << result;
QTest::newRow("match-2") << allCookies << "http://qt-project.org/web/" << result;
QTest::newRow("match-3") << allCookies << "http://qt-project.org/web/content" << result;
QTest::newRow("match-4") << allCookies << "http://qt-project.org/web" << result;
QTest::newRow("match-5") << allCookies << "http://qt-project.org/web/" << result;
QTest::newRow("match-6") << allCookies << "http://qt-project.org/web/content" << result;
cookie.setPath("/web/wiki");
allCookies += cookie;
// exact same results as before:
QTest::newRow("one-match-1") << allCookies << "http://nokia.com/web" << result;
QTest::newRow("one-match-2") << allCookies << "http://nokia.com/web/" << result;
QTest::newRow("one-match-3") << allCookies << "http://nokia.com/web/content" << result;
QTest::newRow("one-match-4") << allCookies << "http://qt.nokia.com/web" << result;
QTest::newRow("one-match-5") << allCookies << "http://qt.nokia.com/web/" << result;
QTest::newRow("one-match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
QTest::newRow("one-match-1") << allCookies << "http://qt-project.org/web" << result;
QTest::newRow("one-match-2") << allCookies << "http://qt-project.org/web/" << result;
QTest::newRow("one-match-3") << allCookies << "http://qt-project.org/web/content" << result;
QTest::newRow("one-match-4") << allCookies << "http://qt-project.org/web" << result;
QTest::newRow("one-match-5") << allCookies << "http://qt-project.org/web/" << result;
QTest::newRow("one-match-6") << allCookies << "http://qt-project.org/web/content" << result;
result.prepend(cookie); // longer path, it must match first
QTest::newRow("two-matches-1") << allCookies << "http://nokia.com/web/wiki" << result;
QTest::newRow("two-matches-2") << allCookies << "http://qt.nokia.com/web/wiki" << result;
QTest::newRow("two-matches-1") << allCookies << "http://qt-project.org/web/wiki" << result;
QTest::newRow("two-matches-2") << allCookies << "http://qt-project.org/web/wiki" << result;
// invert the order;
allCookies.clear();
allCookies << result.at(1) << result.at(0);
QTest::newRow("two-matches-3") << allCookies << "http://nokia.com/web/wiki" << result;
QTest::newRow("two-matches-4") << allCookies << "http://qt.nokia.com/web/wiki" << result;
QTest::newRow("two-matches-3") << allCookies << "http://qt-project.org/web/wiki" << result;
QTest::newRow("two-matches-4") << allCookies << "http://qt-project.org/web/wiki" << result;
// expired cookie
allCookies.clear();
cookie.setExpirationDate(QDateTime::fromString("09-Nov-1999", "dd-MMM-yyyy"));
allCookies += cookie;
result.clear();
QTest::newRow("exp-match-1") << allCookies << "http://nokia.com/web" << result;
QTest::newRow("exp-match-2") << allCookies << "http://nokia.com/web/" << result;
QTest::newRow("exp-match-3") << allCookies << "http://nokia.com/web/content" << result;
QTest::newRow("exp-match-4") << allCookies << "http://qt.nokia.com/web" << result;
QTest::newRow("exp-match-5") << allCookies << "http://qt.nokia.com/web/" << result;
QTest::newRow("exp-match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
QTest::newRow("exp-match-1") << allCookies << "http://qt-project.org/web" << result;
QTest::newRow("exp-match-2") << allCookies << "http://qt-project.org/web/" << result;
QTest::newRow("exp-match-3") << allCookies << "http://qt-project.org/web/content" << result;
QTest::newRow("exp-match-4") << allCookies << "http://qt-project.org/web" << result;
QTest::newRow("exp-match-5") << allCookies << "http://qt-project.org/web/" << result;
QTest::newRow("exp-match-6") << allCookies << "http://qt-project.org/web/content" << result;
// path matching
allCookies.clear();
QNetworkCookie anotherCookie;
anotherCookie.setName("a");
anotherCookie.setPath("/web");
anotherCookie.setDomain(".nokia.com");
anotherCookie.setDomain(".qt-project.org");
allCookies += anotherCookie;
result.clear();
QTest::newRow("path-unmatch-1") << allCookies << "http://nokia.com/" << result;
QTest::newRow("path-unmatch-2") << allCookies << "http://nokia.com/something/else" << result;
QTest::newRow("path-unmatch-1") << allCookies << "http://qt-project.org/" << result;
QTest::newRow("path-unmatch-2") << allCookies << "http://qt-project.org/something/else" << result;
result += anotherCookie;
QTest::newRow("path-match-1") << allCookies << "http://nokia.com/web" << result;
QTest::newRow("path-match-2") << allCookies << "http://nokia.com/web/" << result;
QTest::newRow("path-match-3") << allCookies << "http://nokia.com/web/content" << result;
QTest::newRow("path-match-1") << allCookies << "http://qt-project.org/web" << result;
QTest::newRow("path-match-2") << allCookies << "http://qt-project.org/web/" << result;
QTest::newRow("path-match-3") << allCookies << "http://qt-project.org/web/content" << result;
// secure cookies
allCookies.clear();
@ -350,14 +350,14 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
QNetworkCookie secureCookie;
secureCookie.setName("a");
secureCookie.setPath("/web");
secureCookie.setDomain(".nokia.com");
secureCookie.setDomain(".qt-project.org");
secureCookie.setSecure(true);
allCookies += secureCookie;
QTest::newRow("no-match-secure-1") << allCookies << "http://nokia.com/web" << result;
QTest::newRow("no-match-secure-2") << allCookies << "http://qt.nokia.com/web" << result;
QTest::newRow("no-match-secure-1") << allCookies << "http://qt-project.org/web" << result;
QTest::newRow("no-match-secure-2") << allCookies << "http://qt-project.org/web" << result;
result += secureCookie;
QTest::newRow("match-secure-1") << allCookies << "https://nokia.com/web" << result;
QTest::newRow("match-secure-2") << allCookies << "https://qt.nokia.com/web" << result;
QTest::newRow("match-secure-1") << allCookies << "https://qt-project.org/web" << result;
QTest::newRow("match-secure-2") << allCookies << "https://qt-project.org/web" << result;
// domain ending in .
allCookies.clear();

2
tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
View File

@ -102,7 +102,7 @@ void tst_QNetworkRequest::ctor_data()
QTest::newRow("nothing") << QUrl();
QTest::newRow("empty") << QUrl();
QTest::newRow("http") << QUrl("http://qt.nokia.com");
QTest::newRow("http") << QUrl("http://qt-project.org");
}
void tst_QNetworkRequest::ctor()

8
tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
View File

@ -273,7 +273,7 @@ void tst_QNetworkProxyFactory::fromConfigurations()
{
QNetworkConfigurationManager manager;
QList<QNetworkProxy> proxies;
QUrl url(QLatin1String("http://qt.nokia.com"));
QUrl url(QLatin1String("http://qt-project.org"));
//get from known configurations
foreach (QNetworkConfiguration config, manager.allConfigurations()) {
QNetworkProxyQuery query(config, url, QNetworkProxyQuery::UrlRequest);
@ -320,7 +320,7 @@ void tst_QNetworkProxyFactory::inNetworkAccessManager_data()
QNetworkConfigurationManager manager;
//get from known configurations
foreach (QNetworkConfiguration config, manager.allConfigurations()) {
QNetworkProxyQuery query(config, QUrl(QString("http://qt.nokia.com")), QNetworkProxyQuery::UrlRequest);
QNetworkProxyQuery query(config, QUrl(QString("http://qt-project.org")), QNetworkProxyQuery::UrlRequest);
QList<QNetworkProxy> proxies = QNetworkProxyFactory::systemProxyForQuery(query);
QTest::newRow(config.name().toUtf8()) << config << proxies;
}
@ -339,7 +339,7 @@ void tst_QNetworkProxyFactory::inNetworkAccessManager()
manager.setConfiguration(config);
//using an internet server, because cellular APs won't have a route to the test server.
QNetworkRequest req(QUrl(QString("http://qt.nokia.com")));
QNetworkRequest req(QUrl(QString("http://qt-project.org")));
QNetworkReply *reply = manager.get(req);
connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
QTestEventLoop::instance().enterLoop(30);
@ -383,7 +383,7 @@ public:
//regression test for QTBUG-18799
void tst_QNetworkProxyFactory::systemProxyForQueryCalledFromThread()
{
QUrl url(QLatin1String("http://qt.nokia.com"));
QUrl url(QLatin1String("http://qt-project.org"));
QNetworkProxyQuery query(url);
QSPFQThread thread;
thread.query = query;

36
tests/auto/sql/kernel/qsqldatabase/tst_databases.h
View File

@ -232,7 +232,7 @@ public:
// addDb( "QOCI8", "//horsehead.nokia.troll.no:1521/ustest.troll.no", "scott", "tiger", "" ); // Oracle 9i on horsehead
// addDb( "QOCI8", "//iceblink.nokia.troll.no:1521/ice.troll.no", "scott", "tiger", "" ); // Oracle 8 on iceblink (not currently working)
// addDb( "QOCI", "//silence.nokia.troll.no:1521/testdb", "scott", "tiger" ); // Oracle 10g on silence
// addDb( "QOCI", "//bq-oracle10g.apac.nokia.com:1521/XE", "scott", "tiger" ); // Oracle 10gexpress
// addDb( "QOCI", "//bq-oracle10g.qt-project.org:1521/XE", "scott", "tiger" ); // Oracle 10gexpress
// This requires a local ODBC data source to be configured( pointing to a MySql database )
// addDb( "QODBC", "mysqlodbc", "troll", "trond" );
@ -247,9 +247,9 @@ public:
// addDb( "QMYSQL3", "testdb", "troll", "trond", "horsehead.nokia.troll.no", 3309, "CLIENT_COMPRESS=1;CLIENT_SSL=1" ); // MySQL 5.0.18 Linux
// addDb( "QMYSQL3", "testdb", "troll", "trond", "silence.nokia.troll.no" ); // MySQL 5.1.36 Windows
// addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "bq-mysql41.apac.nokia.com" ); // MySQL 4.1.22-2.el4 linux
// addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "bq-mysql50.apac.nokia.com" ); // MySQL 5.0.45-7.el5 linux
// addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "bq-mysql51.apac.nokia.com" ); // MySQL 5.1.36-6.7.2.i586 linux
// addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "bq-mysql41.qt-project.org" ); // MySQL 4.1.22-2.el4 linux
// addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "bq-mysql50.qt-project.org" ); // MySQL 5.0.45-7.el5 linux
// addDb( "QMYSQL3", "testdb", "testuser", "Ee4Gabf6_", "bq-mysql51.qt-project.org" ); // MySQL 5.1.36-6.7.2.i586 linux
// addDb( "QPSQL7", "testdb", "troll", "trond", "horsehead.nokia.troll.no" ); // V7.2 NOT SUPPORTED!
// addDb( "QPSQL7", "testdb", "troll", "trond", "horsehead.nokia.troll.no", 5434 ); // V7.2 NOT SUPPORTED! Multi-byte
@ -258,14 +258,14 @@ public:
// addDb( "QPSQL7", "testdb", "troll", "trond", "horsehead.nokia.troll.no", 5437 ); // V8.0.3
// addDb( "QPSQL7", "testdb", "troll", "trond", "silence.nokia.troll.no" ); // V8.2.1, UTF-8
// addDb( "QPSQL7", "testdb", "testuser", "Ee4Gabf6_", "bq-postgres74.apac.nokia.com" ); // Version 7.4.19-1.el4_6.1
// addDb( "QPSQL7", "testdb", "testuser", "Ee4Gabf6_", "bq-pgsql81.apac.nokia.com" ); // Version 8.1.11-1.el5_1.1
// addDb( "QPSQL7", "testdb", "testuser", "Ee4Gabf6_", "bq-pgsql84.apac.nokia.com" ); // Version 8.4.1-2.1.i586
// addDb( "QPSQL7", "testdb", "testuser", "Ee4Gabf6_", "bq-pgsql90.apac.nokia.com" ); // Version 9.0.0
// addDb( "QPSQL7", "testdb", "testuser", "Ee4Gabf6_", "bq-postgres74.qt-project.org" ); // Version 7.4.19-1.el4_6.1
// addDb( "QPSQL7", "testdb", "testuser", "Ee4Gabf6_", "bq-pgsql81.qt-project.org" ); // Version 8.1.11-1.el5_1.1
// addDb( "QPSQL7", "testdb", "testuser", "Ee4Gabf6_", "bq-pgsql84.qt-project.org" ); // Version 8.4.1-2.1.i586
// addDb( "QPSQL7", "testdb", "testuser", "Ee4Gabf6_", "bq-pgsql90.qt-project.org" ); // Version 9.0.0
// addDb( "QDB2", "testdb", "troll", "trond", "silence.nokia.troll.no" ); // DB2 v9.1 on silence
// addDb( "QDB2", "testdb", "testuser", "Ee4Gabf6_", "bq-db2-972.apac.nokia.com" ); // DB2
// addDb( "QDB2", "testdb", "testuser", "Ee4Gabf6_", "bq-db2-972.qt-project.org" ); // DB2
// yes - interbase really wants the physical path on the host machine.
// addDb( "QIBASE", "/opt/interbase/qttest.gdb", "SYSDBA", "masterkey", "horsehead.nokia.troll.no" );
@ -274,8 +274,8 @@ public:
// addDb( "QIBASE", "/opt/firebird/databases/testdb.fdb", "testuser", "Ee4Gabf6_", "firebird1-nokia.trolltech.com.au" ); // Firebird 1.5.5
// addDb( "QIBASE", "/opt/firebird/databases/testdb.fdb", "testuser", "Ee4Gabf6_", "firebird2-nokia.trolltech.com.au" ); // Firebird 2.1.1
// addDb( "QIBASE", "/opt/firebird/databases/testdb.fdb", "testuser", "Ee4Gabf6_", "bq-firebird1.apac.nokia.com" ); // Firebird 1.5.5
// addDb( "QIBASE", "/opt/firebird/databases/testdb.fdb", "testuser", "Ee4Gabf6_", "bq-firebird2.apac.nokia.com" ); // Firebird 2.1.1
// addDb( "QIBASE", "/opt/firebird/databases/testdb.fdb", "testuser", "Ee4Gabf6_", "bq-firebird1.qt-project.org" ); // Firebird 1.5.5
// addDb( "QIBASE", "/opt/firebird/databases/testdb.fdb", "testuser", "Ee4Gabf6_", "bq-firebird2.qt-project.org" ); // Firebird 2.1.1
// use in-memory database to prevent local files
// addDb("QSQLITE", ":memory:");
@ -284,18 +284,18 @@ public:
// addDb( "QODBC3", "DRIVER={SQL SERVER};SERVER=iceblink.nokia.troll.no\\ICEBLINK", "troll", "trond", "" );
// addDb( "QODBC3", "DRIVER={SQL Native Client};SERVER=silence.nokia.troll.no\\SQLEXPRESS", "troll", "trond", "" );
// addDb( "QODBC", "DRIVER={MySQL ODBC 5.1 Driver};SERVER=bq-mysql50.apac.nokia.com;DATABASE=testdb", "testuser", "Ee4Gabf6_", "" );
// addDb( "QODBC", "DRIVER={MySQL ODBC 5.1 Driver};SERVER=bq-mysql51.apac.nokia.com;DATABASE=testdb", "testuser", "Ee4Gabf6_", "" );
// addDb( "QODBC", "DRIVER={MySQL ODBC 5.1 Driver};SERVER=bq-mysql50.qt-project.org;DATABASE=testdb", "testuser", "Ee4Gabf6_", "" );
// addDb( "QODBC", "DRIVER={MySQL ODBC 5.1 Driver};SERVER=bq-mysql51.qt-project.org;DATABASE=testdb", "testuser", "Ee4Gabf6_", "" );
// addDb( "QODBC", "DRIVER={FreeTDS};SERVER=horsehead.nokia.troll.no;DATABASE=testdb;PORT=4101;UID=troll;PWD=trondk", "troll", "trondk", "" );
// addDb( "QODBC", "DRIVER={FreeTDS};SERVER=silence.nokia.troll.no;DATABASE=testdb;PORT=2392;UID=troll;PWD=trond", "troll", "trond", "" );
// addDb( "QODBC", "DRIVER={FreeTDS};SERVER=bq-winserv2003-x86-01.apac.nokia.com;DATABASE=testdb;PORT=1433;UID=testuser;PWD=Ee4Gabf6_;TDS_Version=8.0", "", "", "" );
// addDb( "QODBC", "DRIVER={FreeTDS};SERVER=bq-winserv2008-x86-01.apac.nokia.com;DATABASE=testdb;PORT=1433;UID=testuser;PWD=Ee4Gabf6_;TDS_Version=8.0", "", "", "" );
// addDb( "QODBC", "DRIVER={FreeTDS};SERVER=bq-winserv2003-x86-01.qt-project.org;DATABASE=testdb;PORT=1433;UID=testuser;PWD=Ee4Gabf6_;TDS_Version=8.0", "", "", "" );
// addDb( "QODBC", "DRIVER={FreeTDS};SERVER=bq-winserv2008-x86-01.qt-project.org;DATABASE=testdb;PORT=1433;UID=testuser;PWD=Ee4Gabf6_;TDS_Version=8.0", "", "", "" );
// addDb( "QTDS7", "testdb", "testuser", "Ee4Gabf6_", "bq-winserv2003" );
// addDb( "QTDS7", "testdb", "testuser", "Ee4Gabf6_", "bq-winserv2008" );
// addDb( "QODBC3", "DRIVER={SQL SERVER};SERVER=bq-winserv2003-x86-01.apac.nokia.com;DATABASE=testdb;PORT=1433", "testuser", "Ee4Gabf6_", "" );
// addDb( "QODBC3", "DRIVER={SQL SERVER};SERVER=bq-winserv2008-x86-01.apac.nokia.com;DATABASE=testdb;PORT=1433", "testuser", "Ee4Gabf6_", "" );
// addDb( "QODBC3", "DRIVER={SQL SERVER};SERVER=bq-winserv2003-x86-01.qt-project.org;DATABASE=testdb;PORT=1433", "testuser", "Ee4Gabf6_", "" );
// addDb( "QODBC3", "DRIVER={SQL SERVER};SERVER=bq-winserv2008-x86-01.qt-project.org;DATABASE=testdb;PORT=1433", "testuser", "Ee4Gabf6_", "" );
// addDb( "QODBC", "DRIVER={Microsoft Access Driver (*.mdb)};DBQ=c:\\dbs\\access\\testdb.mdb", "", "", "" );
// addDb( "QODBC", "DRIVER={Postgresql};SERVER=bq-pgsql84.apac.nokia.com;DATABASE=testdb", "testuser", "Ee4Gabf6_", "" );
// addDb( "QODBC", "DRIVER={Postgresql};SERVER=bq-pgsql84.qt-project.org;DATABASE=testdb", "testuser", "Ee4Gabf6_", "" );
}
void open()

2
tests/baselineserver/shared/baselineprotocol.cpp
View File

@ -373,7 +373,7 @@ bool BaselineProtocol::connect(const QString &testCase, bool *dryrun, const Plat
errMsg.clear();
QByteArray serverName(qgetenv("QT_LANCELOT_SERVER"));
if (serverName.isNull())
serverName = "lancelot.test.qt.nokia.com";
serverName = "lancelot.test.qt-project.org";
socket.connectToHost(serverName, ServerPort);
if (!socket.waitForConnected(Timeout)) {

4
tests/baselineserver/src/baselineserver.cpp
View File

@ -691,8 +691,8 @@ void BaselineHandler::testPathMapping()
QStringList hosts;
hosts << QLS("bq-ubuntu910-x86-01")
<< QLS("bq-ubuntu910-x86-15")
<< QLS("osl-mac-master-5.test.qt.nokia.com")
<< QLS("osl-mac-master-6.test.qt.nokia.com")
<< QLS("osl-mac-master-5.test.qt-project.org")
<< QLS("osl-mac-master-6.test.qt-project.org")
<< QLS("sv-xp-vs-010")
<< QLS("sv-xp-vs-011")
<< QLS("sv-solaris-sparc-008")

2
tests/benchmarks/network/kernel/qhostinfo/main.cpp
View File

@ -94,7 +94,7 @@ void tst_qhostinfo::lookupSpeed()
qt_qhostinfo_enable_cache(cache);
QStringList hostnameList;
hostnameList << "www.ovi.com" << "www.nokia.com" << "qt.nokia.com" << "www.trolltech.com" << "troll.no"
hostnameList << "www.ovi.com" << "www.nokia.com" << "qt-project.org" << "www.trolltech.com" << "troll.no"
<< "www.qtcentre.org" << "forum.nokia.com" << "www.forum.nokia.com" << "wiki.forum.nokia.com"
<< "www.nokia.no" << "nokia.de" << "127.0.0.1" << "----";
// also add some duplicates: