qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace www.nokia.com by www.qt-project.org in tests. 

Task-number: QTBUG-32390

Change-Id: I595b1bf683d1e63e44354c042f23dd9e10847862
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
This commit is contained in:
Friedemann Kleint 2013-07-12 10:11:56 +02:00 committed by The Qt Project
parent 3a1a38b0d7
commit 4615ddde02
6 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp
View File

@ -83,9 +83,9 @@ void tst_qqmlcontext::baseUrl()
QCOMPARE(ctxt.baseUrl(), QUrl());
ctxt.setBaseUrl(QUrl("http://www.nokia.com/"));
ctxt.setBaseUrl(QUrl("http://www.qt-project.org/"));
QCOMPARE(ctxt.baseUrl(), QUrl("http://www.nokia.com/"));
QCOMPARE(ctxt.baseUrl(), QUrl("http://www.qt-project.org/"));
}
void tst_qqmlcontext::resolvedUrl()
@ -93,18 +93,18 @@ void tst_qqmlcontext::resolvedUrl()
// Relative to the component
{
QQmlContext ctxt(&engine);
ctxt.setBaseUrl(QUrl("http://www.nokia.com/"));
ctxt.setBaseUrl(QUrl("http://www.qt-project.org/"));
QCOMPARE(ctxt.resolvedUrl(QUrl("main.qml")), QUrl("http://www.nokia.com/main.qml"));
QCOMPARE(ctxt.resolvedUrl(QUrl("main.qml")), QUrl("http://www.qt-project.org/main.qml"));
}
// Relative to a parent
{
QQmlContext ctxt(&engine);
ctxt.setBaseUrl(QUrl("http://www.nokia.com/"));
ctxt.setBaseUrl(QUrl("http://www.qt-project.org/"));
QQmlContext ctxt2(&ctxt);
QCOMPARE(ctxt2.resolvedUrl(QUrl("main2.qml")), QUrl("http://www.nokia.com/main2.qml"));
QCOMPARE(ctxt2.resolvedUrl(QUrl("main2.qml")), QUrl("http://www.qt-project.org/main2.qml"));
}
// Relative to the engine
@ -116,10 +116,10 @@ void tst_qqmlcontext::resolvedUrl()
// Relative to a deleted parent
{
QQmlContext *ctxt = new QQmlContext(&engine);
ctxt->setBaseUrl(QUrl("http://www.nokia.com/"));
ctxt->setBaseUrl(QUrl("http://www.qt-project.org/"));
QQmlContext ctxt2(ctxt);
QCOMPARE(ctxt2.resolvedUrl(QUrl("main2.qml")), QUrl("http://www.nokia.com/main2.qml"));
QCOMPARE(ctxt2.resolvedUrl(QUrl("main2.qml")), QUrl("http://www.qt-project.org/main2.qml"));
delete ctxt; ctxt = 0;
@ -130,7 +130,7 @@ void tst_qqmlcontext::resolvedUrl()
{
QQmlContext ctxt(&engine);
QCOMPARE(ctxt.resolvedUrl(QUrl("http://www.nokia.com/main2.qml")), QUrl("http://www.nokia.com/main2.qml"));
QCOMPARE(ctxt.resolvedUrl(QUrl("http://www.qt-project.org/main2.qml")), QUrl("http://www.qt-project.org/main2.qml"));
QCOMPARE(ctxt.resolvedUrl(QUrl("file:///main2.qml")), QUrl("file:///main2.qml"));
}
}

26
tests/auto/qml/qqmlerror/tst_qqmlerror.cpp
View File

@ -64,18 +64,18 @@ void tst_qqmlerror::url()
QCOMPARE(error.url(), QUrl());
error.setUrl(QUrl("http://www.nokia.com/main.qml"));
error.setUrl(QUrl("http://www.qt-project.org/main.qml"));
QCOMPARE(error.url(), QUrl("http://www.nokia.com/main.qml"));
QCOMPARE(error.url(), QUrl("http://www.qt-project.org/main.qml"));
QQmlError error2 = error;
QCOMPARE(error2.url(), QUrl("http://www.nokia.com/main.qml"));
QCOMPARE(error2.url(), QUrl("http://www.qt-project.org/main.qml"));
error.setUrl(QUrl("http://qt.nokia.com/main.qml"));
QCOMPARE(error.url(), QUrl("http://qt.nokia.com/main.qml"));
QCOMPARE(error2.url(), QUrl("http://www.nokia.com/main.qml"));
QCOMPARE(error2.url(), QUrl("http://www.qt-project.org/main.qml"));
}
void tst_qqmlerror::description()
@ -142,28 +142,28 @@ void tst_qqmlerror::toString()
{
{
QQmlError error;
error.setUrl(QUrl("http://www.nokia.com/main.qml"));
error.setUrl(QUrl("http://www.qt-project.org/main.qml"));
error.setDescription("An Error");
error.setLine(92);
error.setColumn(13);
QCOMPARE(error.toString(), QString("http://www.nokia.com/main.qml:92:13: An Error"));
QCOMPARE(error.toString(), QString("http://www.qt-project.org/main.qml:92:13: An Error"));
}
{
QQmlError error;
error.setUrl(QUrl("http://www.nokia.com/main.qml"));
error.setUrl(QUrl("http://www.qt-project.org/main.qml"));
error.setDescription("An Error");
error.setLine(92);
QCOMPARE(error.toString(), QString("http://www.nokia.com/main.qml:92: An Error"));
QCOMPARE(error.toString(), QString("http://www.qt-project.org/main.qml:92: An Error"));
}
}
void tst_qqmlerror::copy()
{
QQmlError error;
error.setUrl(QUrl("http://www.nokia.com/main.qml"));
error.setUrl(QUrl("http://www.qt-project.org/main.qml"));
error.setDescription("An Error");
error.setLine(92);
error.setColumn(13);
@ -182,12 +182,12 @@ void tst_qqmlerror::copy()
QCOMPARE(error.line(), 2);
QCOMPARE(error.column(), 33);
QCOMPARE(error2.url(), QUrl("http://www.nokia.com/main.qml"));
QCOMPARE(error2.url(), QUrl("http://www.qt-project.org/main.qml"));
QCOMPARE(error2.description(), QString("An Error"));
QCOMPARE(error2.line(), 92);
QCOMPARE(error2.column(), 13);
QCOMPARE(error3.url(), QUrl("http://www.nokia.com/main.qml"));
QCOMPARE(error3.url(), QUrl("http://www.qt-project.org/main.qml"));
QCOMPARE(error3.description(), QString("An Error"));
QCOMPARE(error3.line(), 92);
QCOMPARE(error3.column(), 13);
@ -198,12 +198,12 @@ void tst_qqmlerror::debug()
{
{
QQmlError error;
error.setUrl(QUrl("http://www.nokia.com/main.qml"));
error.setUrl(QUrl("http://www.qt-project.org/main.qml"));
error.setDescription("An Error");
error.setLine(92);
error.setColumn(13);
QTest::ignoreMessage(QtWarningMsg, "http://www.nokia.com/main.qml:92:13: An Error ");
QTest::ignoreMessage(QtWarningMsg, "http://www.qt-project.org/main.qml:92:13: An Error ");
qWarning() << error;
}

4
tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp
View File

@ -158,7 +158,7 @@ void tst_qqmlinstruction::dump()
}
{
data->urls << QUrl("http://www.nokia.com");
data->urls << QUrl("http://www.qt-project.org");
QQmlCompiledData::Instruction::StoreUrl i;
i.propertyIndex = 8;
i.value = data->urls.count() - 1;
@ -510,7 +510,7 @@ void tst_qqmlinstruction::dump()
<< "8\t\tSTORE_INTEGER\t\t5\t9"
<< "9\t\tSTORE_BOOL\t\t6\ttrue"
<< "10\t\tSTORE_STRING\t\t7\t1\t\t\"Test String\""
<< "11\t\tSTORE_URL\t\t8\t0\t\tQUrl(\"http://www.nokia.com\") "
<< "11\t\tSTORE_URL\t\t8\t0\t\tQUrl(\"http://www.qt-project.org\") "
<< "12\t\tSTORE_COLOR\t\t9\t\t\t\"ff00ff00\""
<< "13\t\tSTORE_DATE\t\t10\t9"
<< "14\t\tSTORE_TIME\t\t11"

2
tests/auto/qml/qqmlxmlhttprequest/data/open_arg_count.2.qml
View File

@ -7,7 +7,7 @@ QtObject {
var x = new XMLHttpRequest;
try {
x.open("GET", "http://www.nokia.com", true, "user", "password", "extra");
x.open("GET", "http://www.qt-project.org", true, "user", "password", "extra");
} catch (e) {
if (e.code == DOMException.SYNTAX_ERR)
exceptionThrown = true;

2
tests/auto/qml/qqmlxmlhttprequest/data/open_invalid_method.qml
View File

@ -7,7 +7,7 @@ QtObject {
var x = new XMLHttpRequest;
try {
x.open("BLAH", "http://www.nokia.com");
x.open("BLAH", "http://www.qt-project.org");
} catch (e) {
if (e.code == DOMException.SYNTAX_ERR)
exceptionThrown = true;

2
tests/auto/qml/qqmlxmlhttprequest/data/open_sync.qml
View File

@ -7,7 +7,7 @@ QtObject {
var x = new XMLHttpRequest;
try {
x.open("GET", "http://www.nokia.com", false);
x.open("GET", "http://www.qt-project.org", false);
} catch (e) {
if (e.code == DOMException.NOT_SUPPORTED_ERR)
exceptionThrown = true;