From bb9cef3f5e1a17f8ddfbe7359f60c30701301001 Mon Sep 17 00:00:00 2001 From: Charles Yin Date: Mon, 30 May 2011 15:24:49 +1000 Subject: fix qmltest unit test failures Change-Id: I489d1559411f5804f11f4601e34011bc38742b02 --- tests/auto/qmltest/borderimage/InvalidSciFile.qml | 48 ++++ tests/auto/qmltest/borderimage/colors-round.sci | 7 + tests/auto/qmltest/borderimage/colors.png | Bin 0 -> 1655 bytes tests/auto/qmltest/borderimage/invalid.sci | 7 + tests/auto/qmltest/borderimage/tst_borderimage.qml | 247 +++++++++++++++++++++ .../qdeclarativeborderimage/InvalidSciFile.qml | 48 ---- .../qdeclarativeborderimage/colors-round.sci | 7 - .../qmltest/qdeclarativeborderimage/colors.png | Bin 1655 -> 0 bytes .../qmltest/qdeclarativeborderimage/invalid.sci | 7 - .../qdeclarativeborderimage/tst_borderimage.qml | 247 --------------------- 10 files changed, 309 insertions(+), 309 deletions(-) create mode 100644 tests/auto/qmltest/borderimage/InvalidSciFile.qml create mode 100644 tests/auto/qmltest/borderimage/colors-round.sci create mode 100644 tests/auto/qmltest/borderimage/colors.png create mode 100644 tests/auto/qmltest/borderimage/invalid.sci create mode 100644 tests/auto/qmltest/borderimage/tst_borderimage.qml delete mode 100644 tests/auto/qmltest/qdeclarativeborderimage/InvalidSciFile.qml delete mode 100644 tests/auto/qmltest/qdeclarativeborderimage/colors-round.sci delete mode 100644 tests/auto/qmltest/qdeclarativeborderimage/colors.png delete mode 100644 tests/auto/qmltest/qdeclarativeborderimage/invalid.sci delete mode 100644 tests/auto/qmltest/qdeclarativeborderimage/tst_borderimage.qml (limited to 'tests/auto/qmltest') diff --git a/tests/auto/qmltest/borderimage/InvalidSciFile.qml b/tests/auto/qmltest/borderimage/InvalidSciFile.qml new file mode 100644 index 0000000000..d8a6d89b92 --- /dev/null +++ b/tests/auto/qmltest/borderimage/InvalidSciFile.qml @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 + +BorderImage { + source: "invalid.sci" + width: 300 + height: 300 +} diff --git a/tests/auto/qmltest/borderimage/colors-round.sci b/tests/auto/qmltest/borderimage/colors-round.sci new file mode 100644 index 0000000000..5d2f49f0e1 --- /dev/null +++ b/tests/auto/qmltest/borderimage/colors-round.sci @@ -0,0 +1,7 @@ +border.left:10 +border.top:20 +border.right:30 +border.bottom:40 +horizontalTileRule:Round +verticalTileRule:Repeat +source:colors.png diff --git a/tests/auto/qmltest/borderimage/colors.png b/tests/auto/qmltest/borderimage/colors.png new file mode 100644 index 0000000000..dfb62f3d64 Binary files /dev/null and b/tests/auto/qmltest/borderimage/colors.png differ diff --git a/tests/auto/qmltest/borderimage/invalid.sci b/tests/auto/qmltest/borderimage/invalid.sci new file mode 100644 index 0000000000..98c72c9bf1 --- /dev/null +++ b/tests/auto/qmltest/borderimage/invalid.sci @@ -0,0 +1,7 @@ +border.left:10 +border.top:20 +border.down:30 +border.up:40 +horizontalTileRule:Roun +verticalTileRule:Repea +source:colors.png diff --git a/tests/auto/qmltest/borderimage/tst_borderimage.qml b/tests/auto/qmltest/borderimage/tst_borderimage.qml new file mode 100644 index 0000000000..d488fcf2b2 --- /dev/null +++ b/tests/auto/qmltest/borderimage/tst_borderimage.qml @@ -0,0 +1,247 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 + +Item { + id: top + + BorderImage { + id: noSource + source: "" + } + + property string srcImage: "colors.png" + + BorderImage { + id: clearSource + source: srcImage + } + + BorderImage { + id: resized + source: "colors.png" + width: 300 + height: 300 + } + + BorderImage { + id: smooth + source: "colors.png" + smooth: true + width: 300 + height: 300 + } + + BorderImage { + id: tileModes1 + source: "colors.png" + width: 100 + height: 300 + horizontalTileMode: BorderImage.Repeat + verticalTileMode: BorderImage.Repeat + } + + BorderImage { + id: tileModes2 + source: "colors.png" + width: 300 + height: 150 + horizontalTileMode: BorderImage.Round + verticalTileMode: BorderImage.Round + } + + TestCase { + name: "BorderImage" + + function test_noSource() { + compare(noSource.source, "") + compare(noSource.width, 0) + compare(noSource.height, 0) + compare(noSource.horizontalTileMode, BorderImage.Stretch) + compare(noSource.verticalTileMode, BorderImage.Stretch) + } + + function test_imageSource_data() { + return [ + { + tag: "local", + source: "colors.png", + remote: false, + error: "" + }, + { + tag: "local not found", + source: "no-such-file.png", + remote: false, + error: "SUBinline:1:21: QML BorderImage: Cannot open: SUBno-such-file.png" + } + // TODO: remote tests that need to use http + ] + } + + function test_imageSource(row) { + var expectError = (row.error.length != 0) + if (expectError) { + var parentUrl = Qt.resolvedUrl(".") + ignoreWarning(row.error.replace(/SUB/g, parentUrl)) + } + + var img = Qt.createQmlObject + ('import QtQuick 1.0; BorderImage { source: "' + + row.source + '" }', top) + + if (row.remote) + tryCompare(img, "status", BorderImage.Loading) + + if (!expectError) { + tryCompare(img, "status", BorderImage.Ready) + compare(img.width, 120) + compare(img.height, 120) + compare(img.horizontalTileMode, BorderImage.Stretch) + compare(img.verticalTileMode, BorderImage.Stretch) + } else { + tryCompare(img, "status", BorderImage.Error) + } + + img.destroy() + } + + function test_clearSource() { + compare(clearSource.source, Qt.resolvedUrl("colors.png")) + compare(clearSource.width, 120) + compare(clearSource.height, 120) + + srcImage = "" + compare(clearSource.source, "") + compare(clearSource.width, 0) + compare(clearSource.height, 0) + } + + function test_resized() { + compare(resized.width, 300) + compare(resized.height, 300) + compare(resized.horizontalTileMode, BorderImage.Stretch) + compare(resized.verticalTileMode, BorderImage.Stretch) + } + + function test_smooth() { + compare(smooth.smooth, true) + compare(smooth.width, 300) + compare(smooth.height, 300) + compare(smooth.horizontalTileMode, BorderImage.Stretch) + compare(smooth.verticalTileMode, BorderImage.Stretch) + } + + function test_tileModes() { + compare(tileModes1.width, 100) + compare(tileModes1.height, 300) + compare(tileModes1.horizontalTileMode, BorderImage.Repeat) + compare(tileModes1.verticalTileMode, BorderImage.Repeat) + + compare(tileModes2.width, 300) + compare(tileModes2.height, 150) + compare(tileModes2.horizontalTileMode, BorderImage.Round) + compare(tileModes2.verticalTileMode, BorderImage.Round) + } + + function test_sciSource_data() { + return [ + { + tag: "local", + source: "colors-round.sci", + remote: false, + valid: true + }, + { + tag: "local not found", + source: "no-such-file.sci", + remote: false, + valid: false + } + // TODO: remote tests that need to use http + ] + } + + function test_sciSource(row) { + var img = Qt.createQmlObject + ('import QtQuick 1.0; BorderImage { source: "' + + row.source + '"; width: 300; height: 300 }', top) + + if (row.remote) + tryCompare(img, "status", BorderImage.Loading) + + compare(img.source, Qt.resolvedUrl(row.source)) + compare(img.width, 300) + compare(img.height, 300) + + if (row.valid) { + tryCompare(img, "status", BorderImage.Ready) + compare(img.border.left, 10) + compare(img.border.top, 20) + compare(img.border.right, 30) + compare(img.border.bottom, 40) + compare(img.horizontalTileMode, BorderImage.Round) + compare(img.verticalTileMode, BorderImage.Repeat) + } else { + tryCompare(img, "status", BorderImage.Error) + } + + img.destroy() + } + + + function test_invalidSciFile() { + ignoreWarning("QSGGridScaledImage: Invalid tile rule specified. Using Stretch.") // for "Roun" + ignoreWarning("QSGGridScaledImage: Invalid tile rule specified. Using Stretch.") // for "Repea" + + var component = Qt.createComponent("InvalidSciFile.qml") + var invalidSciFile = component.createObject(top) + + compare(invalidSciFile.status, Image.Error) + compare(invalidSciFile.width, 300) + compare(invalidSciFile.height, 300) + compare(invalidSciFile.horizontalTileMode, BorderImage.Stretch) + compare(invalidSciFile.verticalTileMode, BorderImage.Stretch) + } + } +} diff --git a/tests/auto/qmltest/qdeclarativeborderimage/InvalidSciFile.qml b/tests/auto/qmltest/qdeclarativeborderimage/InvalidSciFile.qml deleted file mode 100644 index d8a6d89b92..0000000000 --- a/tests/auto/qmltest/qdeclarativeborderimage/InvalidSciFile.qml +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 - -BorderImage { - source: "invalid.sci" - width: 300 - height: 300 -} diff --git a/tests/auto/qmltest/qdeclarativeborderimage/colors-round.sci b/tests/auto/qmltest/qdeclarativeborderimage/colors-round.sci deleted file mode 100644 index 5d2f49f0e1..0000000000 --- a/tests/auto/qmltest/qdeclarativeborderimage/colors-round.sci +++ /dev/null @@ -1,7 +0,0 @@ -border.left:10 -border.top:20 -border.right:30 -border.bottom:40 -horizontalTileRule:Round -verticalTileRule:Repeat -source:colors.png diff --git a/tests/auto/qmltest/qdeclarativeborderimage/colors.png b/tests/auto/qmltest/qdeclarativeborderimage/colors.png deleted file mode 100644 index dfb62f3d64..0000000000 Binary files a/tests/auto/qmltest/qdeclarativeborderimage/colors.png and /dev/null differ diff --git a/tests/auto/qmltest/qdeclarativeborderimage/invalid.sci b/tests/auto/qmltest/qdeclarativeborderimage/invalid.sci deleted file mode 100644 index 98c72c9bf1..0000000000 --- a/tests/auto/qmltest/qdeclarativeborderimage/invalid.sci +++ /dev/null @@ -1,7 +0,0 @@ -border.left:10 -border.top:20 -border.down:30 -border.up:40 -horizontalTileRule:Roun -verticalTileRule:Repea -source:colors.png diff --git a/tests/auto/qmltest/qdeclarativeborderimage/tst_borderimage.qml b/tests/auto/qmltest/qdeclarativeborderimage/tst_borderimage.qml deleted file mode 100644 index 4c2c369fe6..0000000000 --- a/tests/auto/qmltest/qdeclarativeborderimage/tst_borderimage.qml +++ /dev/null @@ -1,247 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtTest 1.0 - -Item { - id: top - - BorderImage { - id: noSource - source: "" - } - - property string srcImage: "colors.png" - - BorderImage { - id: clearSource - source: srcImage - } - - BorderImage { - id: resized - source: "colors.png" - width: 300 - height: 300 - } - - BorderImage { - id: smooth - source: "colors.png" - smooth: true - width: 300 - height: 300 - } - - BorderImage { - id: tileModes1 - source: "colors.png" - width: 100 - height: 300 - horizontalTileMode: BorderImage.Repeat - verticalTileMode: BorderImage.Repeat - } - - BorderImage { - id: tileModes2 - source: "colors.png" - width: 300 - height: 150 - horizontalTileMode: BorderImage.Round - verticalTileMode: BorderImage.Round - } - - TestCase { - name: "BorderImage" - - function test_noSource() { - compare(noSource.source, "") - compare(noSource.width, 0) - compare(noSource.height, 0) - compare(noSource.horizontalTileMode, BorderImage.Stretch) - compare(noSource.verticalTileMode, BorderImage.Stretch) - } - - function test_imageSource_data() { - return [ - { - tag: "local", - source: "colors.png", - remote: false, - error: "" - }, - { - tag: "local not found", - source: "no-such-file.png", - remote: false, - error: "SUBinline:1:21: QML BorderImage: Cannot open: SUBno-such-file.png" - } - // TODO: remote tests that need to use http - ] - } - - function test_imageSource(row) { - var expectError = (row.error.length != 0) - if (expectError) { - var parentUrl = Qt.resolvedUrl(".") - ignoreWarning(row.error.replace(/SUB/g, parentUrl)) - } - - var img = Qt.createQmlObject - ('import QtQuick 1.0; BorderImage { source: "' + - row.source + '" }', top) - - if (row.remote) - tryCompare(img, "status", BorderImage.Loading) - - if (!expectError) { - tryCompare(img, "status", BorderImage.Ready) - compare(img.width, 120) - compare(img.height, 120) - compare(img.horizontalTileMode, BorderImage.Stretch) - compare(img.verticalTileMode, BorderImage.Stretch) - } else { - tryCompare(img, "status", BorderImage.Error) - } - - img.destroy() - } - - function test_clearSource() { - compare(clearSource.source, Qt.resolvedUrl("colors.png")) - compare(clearSource.width, 120) - compare(clearSource.height, 120) - - srcImage = "" - compare(clearSource.source, "") - compare(clearSource.width, 0) - compare(clearSource.height, 0) - } - - function test_resized() { - compare(resized.width, 300) - compare(resized.height, 300) - compare(resized.horizontalTileMode, BorderImage.Stretch) - compare(resized.verticalTileMode, BorderImage.Stretch) - } - - function test_smooth() { - compare(smooth.smooth, true) - compare(smooth.width, 300) - compare(smooth.height, 300) - compare(smooth.horizontalTileMode, BorderImage.Stretch) - compare(smooth.verticalTileMode, BorderImage.Stretch) - } - - function test_tileModes() { - compare(tileModes1.width, 100) - compare(tileModes1.height, 300) - compare(tileModes1.horizontalTileMode, BorderImage.Repeat) - compare(tileModes1.verticalTileMode, BorderImage.Repeat) - - compare(tileModes2.width, 300) - compare(tileModes2.height, 150) - compare(tileModes2.horizontalTileMode, BorderImage.Round) - compare(tileModes2.verticalTileMode, BorderImage.Round) - } - - function test_sciSource_data() { - return [ - { - tag: "local", - source: "colors-round.sci", - remote: false, - valid: true - }, - { - tag: "local not found", - source: "no-such-file.sci", - remote: false, - valid: false - } - // TODO: remote tests that need to use http - ] - } - - function test_sciSource(row) { - var img = Qt.createQmlObject - ('import QtQuick 1.0; BorderImage { source: "' + - row.source + '"; width: 300; height: 300 }', top) - - if (row.remote) - tryCompare(img, "status", BorderImage.Loading) - - compare(img.source, Qt.resolvedUrl(row.source)) - compare(img.width, 300) - compare(img.height, 300) - - if (row.valid) { - tryCompare(img, "status", BorderImage.Ready) - compare(img.border.left, 10) - compare(img.border.top, 20) - compare(img.border.right, 30) - compare(img.border.bottom, 40) - compare(img.horizontalTileMode, BorderImage.Round) - compare(img.verticalTileMode, BorderImage.Repeat) - } else { - tryCompare(img, "status", BorderImage.Error) - } - - img.destroy() - } - - - function test_invalidSciFile() { - ignoreWarning("QDeclarativeGridScaledImage: Invalid tile rule specified. Using Stretch.") // for "Roun" - ignoreWarning("QDeclarativeGridScaledImage: Invalid tile rule specified. Using Stretch.") // for "Repea" - - var component = Qt.createComponent("InvalidSciFile.qml") - var invalidSciFile = component.createObject(top) - - compare(invalidSciFile.status, Image.Error) - compare(invalidSciFile.width, 300) - compare(invalidSciFile.height, 300) - compare(invalidSciFile.horizontalTileMode, BorderImage.Stretch) - compare(invalidSciFile.verticalTileMode, BorderImage.Stretch) - } - } -} -- cgit v1.2.3