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

TestCase: Fix colors comparison in fuzzyCompare() 

fuzzyCompare() messed up the arguments and compared the first color
argument with itself (ignoring the second color).

Fixes: QTBUG-91694
Pick-to: 5.15 6.0 6.1
Change-Id: I86453c937e27a2112f8375b144ca21a9d088f017
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Alexander Akulich 2021-03-09 16:13:38 +03:00
parent b3567c177f
commit 35a0c2552f
4 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qmltest/quicktestresult.cpp
View File

@ -516,7 +516,7 @@ bool QuickTestResult::fuzzyCompare(const QVariant &actual, const QVariant &expec
return false;
act = var.value<QColor>();
QQml_colorProvider()->colorFromString(expected.toString(), &ok);
var = QQml_colorProvider()->colorFromString(expected.toString(), &ok);
if (!ok)
return false;
exp = var.value<QColor>();

1
tests/auto/qmltest/CMakeLists.txt
View File

@ -7,6 +7,7 @@ add_subdirectory(buttonclick)
add_subdirectory(createbenchmark)
add_subdirectory(events)
add_subdirectory(fontloader)
add_subdirectory(fuzzycompare)
add_subdirectory(gradient)
add_subdirectory(image)
add_subdirectory(itemgrabber)

12
tests/auto/qmltest/fuzzycompare/CMakeLists.txt Normal file
View File

@ -0,0 +1,12 @@
# Generated from fuzzycompare.pro
#####################################################################
## fuzzycompare Test:
#####################################################################
qt_internal_add_test(fuzzycompare
GUI
QMLTEST
PUBLIC_LIBRARIES
Qt::Gui
)

62
tests/auto/qmltest/fuzzycompare/tst_FuzzyCompare.qml Normal file
View File

@ -0,0 +1,62 @@
/****************************************************************************
**
** Copyright (C) 2021 Alexander Akulich <akulichalexander@gmail.com>
** Contact: https://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** BSD License Usage
** Alternatively, you may use this file under the terms of the BSD license
** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
import QtTest 1.0
TestCase {
name: "FuzzyCompare"
function test_differentColors()
{
const color1 = Qt.rgba(0, 0, 0, 0)
const color2 = Qt.rgba(1, 1, 1, 1)
expectFail("", "The colors are very different so fuzzyCompare should fail")
fuzzyCompare(color1, color2, 1)
}
}