From 4615ddde02306f704b5eab11a5f6e2ba73c0d411 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 12 Jul 2013 10:11:56 +0200 Subject: [PATCH] Replace www.nokia.com by www.qt-project.org in tests. Task-number: QTBUG-32390 Change-Id: I595b1bf683d1e63e44354c042f23dd9e10847862 Reviewed-by: Sergio Ahumada --- tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp | 18 +++++++-------- tests/auto/qml/qqmlerror/tst_qqmlerror.cpp | 26 +++++++++++----------- .../qml/qqmlinstruction/tst_qqmlinstruction.cpp | 4 ++-- .../qqmlxmlhttprequest/data/open_arg_count.2.qml | 2 +- .../data/open_invalid_method.qml | 2 +- .../auto/qml/qqmlxmlhttprequest/data/open_sync.qml | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp index b1f92e3..e0c2030 100644 --- a/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp +++ b/tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp @@ -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")); } } diff --git a/tests/auto/qml/qqmlerror/tst_qqmlerror.cpp b/tests/auto/qml/qqmlerror/tst_qqmlerror.cpp index 6f24210..65e8e65 100644 --- a/tests/auto/qml/qqmlerror/tst_qqmlerror.cpp +++ b/tests/auto/qml/qqmlerror/tst_qqmlerror.cpp @@ -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; } diff --git a/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp b/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp index 8d8b913..925eec9 100644 --- a/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp +++ b/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp @@ -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" diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/open_arg_count.2.qml b/tests/auto/qml/qqmlxmlhttprequest/data/open_arg_count.2.qml index 677759c..9a4e76b 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/open_arg_count.2.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/open_arg_count.2.qml @@ -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; diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/open_invalid_method.qml b/tests/auto/qml/qqmlxmlhttprequest/data/open_invalid_method.qml index 0f29031..09ba1b5 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/open_invalid_method.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/open_invalid_method.qml @@ -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; diff --git a/tests/auto/qml/qqmlxmlhttprequest/data/open_sync.qml b/tests/auto/qml/qqmlxmlhttprequest/data/open_sync.qml index eafdda7..0f31c96 100644 --- a/tests/auto/qml/qqmlxmlhttprequest/data/open_sync.qml +++ b/tests/auto/qml/qqmlxmlhttprequest/data/open_sync.qml @@ -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; -- 2.7.4