From be8fe2e352eeda57c498d1450634e358c64e04ed Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 17 Jul 2018 11:42:02 +0200 Subject: tst_qquickstyle: avoid conflicts with other tests qrcStylePaths() uses :/qrcStyles1 and :/qrcStyles2, which conflicts with qrcInQtQuickControlsStylePathEnvVar() in a way that would require us (qrcInQtQuickControlsStylePathEnvVar()) to be aware of tests that ran before us. Avoid this issue by adding more qrc-based styles. Change-Id: I7a5e24f4ea532c19db30d240fe7c077ac2a09a4e Reviewed-by: Paul Wicking Reviewed-by: Simon Hausmann --- tests/auto/qquickstyle/qquickstyle.pro | 8 +++++ .../qquickstyle/qrcStyles3/QrcStyle3/Button.qml | 2 ++ .../qquickstyle/qrcStyles4/QrcStyle4/Button.qml | 2 ++ tests/auto/qquickstyle/tst_qquickstyle.cpp | 36 ++++++++++++---------- 4 files changed, 31 insertions(+), 17 deletions(-) create mode 100644 tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml create mode 100644 tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml diff --git a/tests/auto/qquickstyle/qquickstyle.pro b/tests/auto/qquickstyle/qquickstyle.pro index 983e5438..ef1dd2e0 100644 --- a/tests/auto/qquickstyle/qquickstyle.pro +++ b/tests/auto/qquickstyle/qquickstyle.pro @@ -18,3 +18,11 @@ RESOURCES += qrcStyles1 qrcStyles2.files = $$files(qrcStyles2/QrcStyle2/*.qml) qrcStyles2.prefix = / RESOURCES += qrcStyles2 + +qrcStyles3.files = $$files(qrcStyles3/QrcStyle3/*.qml) +qrcStyles3.prefix = / +RESOURCES += qrcStyles3 + +qrcStyles4.files = $$files(qrcStyles4/QrcStyle4/*.qml) +qrcStyles4.prefix = / +RESOURCES += qrcStyles4 diff --git a/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml b/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml new file mode 100644 index 00000000..5b08222c --- /dev/null +++ b/tests/auto/qquickstyle/qrcStyles3/QrcStyle3/Button.qml @@ -0,0 +1,2 @@ +import QtQuick.Templates 2.0 as T +T.Button { } diff --git a/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml b/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml new file mode 100644 index 00000000..5b08222c --- /dev/null +++ b/tests/auto/qquickstyle/qrcStyles4/QrcStyle4/Button.qml @@ -0,0 +1,2 @@ +import QtQuick.Templates 2.0 as T +T.Button { } diff --git a/tests/auto/qquickstyle/tst_qquickstyle.cpp b/tests/auto/qquickstyle/tst_qquickstyle.cpp index 2210bf69..c4cc4d27 100644 --- a/tests/auto/qquickstyle/tst_qquickstyle.cpp +++ b/tests/auto/qquickstyle/tst_qquickstyle.cpp @@ -220,13 +220,15 @@ void tst_QQuickStyle::qrcInQtQuickControlsStylePathEnvVar_data() { QString environmentVariable; QDebug stream(&environmentVariable); + // We use qrcStyles3 and qrcStyles4 in order to not conflict with + // qrcStylePaths(), since we currently have no way of clearing customStylePaths. stream.noquote().nospace() << "/some/bogus/path/" << listSeparator - << ":/qrcStyles1"; + << ":/qrcStyles3"; QStringList expectedAvailableStyles = defaultAvailableStyles; - // We need to move the Default style to the start of the list, + // We need to keep the Default style at the start of the list, // as that's what availableStyles() does. - expectedAvailableStyles.insert(1, QLatin1String("QrcStyle1")); + expectedAvailableStyles.insert(1, QLatin1String("QrcStyle3")); QTest::addRow("%s", qPrintable(environmentVariable)) << environmentVariable << expectedAvailableStyles; @@ -235,11 +237,11 @@ void tst_QQuickStyle::qrcInQtQuickControlsStylePathEnvVar_data() { QString environmentVariable; QDebug stream(&environmentVariable); - stream.noquote().nospace() << ":/qrcStyles2" << listSeparator + stream.noquote().nospace() << ":/qrcStyles4" << listSeparator << "/some/bogus/path"; QStringList expectedAvailableStyles = defaultAvailableStyles; - expectedAvailableStyles.insert(1, QLatin1String("QrcStyle2")); + expectedAvailableStyles.insert(1, QLatin1String("QrcStyle4")); QTest::addRow("%s", qPrintable(environmentVariable)) << environmentVariable << expectedAvailableStyles; @@ -248,14 +250,14 @@ void tst_QQuickStyle::qrcInQtQuickControlsStylePathEnvVar_data() { QString environmentVariable; QDebug stream(&environmentVariable); - stream.noquote().nospace() << ":/qrcStyles1" << listSeparator - << ":/qrcStyles2" << listSeparator + stream.noquote().nospace() << ":/qrcStyles3" << listSeparator + << ":/qrcStyles4" << listSeparator << QFINDTESTDATA("data"); QStringList expectedAvailableStyles = defaultAvailableStyles; expectedAvailableStyles.insert(1, QLatin1String("DummyStyle")); - expectedAvailableStyles.insert(1, QLatin1String("QrcStyle2")); - expectedAvailableStyles.insert(1, QLatin1String("QrcStyle1")); + expectedAvailableStyles.insert(1, QLatin1String("QrcStyle4")); + expectedAvailableStyles.insert(1, QLatin1String("QrcStyle3")); QTest::addRow("%s", qPrintable(environmentVariable)) << environmentVariable << expectedAvailableStyles; @@ -265,12 +267,12 @@ void tst_QQuickStyle::qrcInQtQuickControlsStylePathEnvVar_data() QString environmentVariable; QDebug stream(&environmentVariable); stream.noquote().nospace() << QFINDTESTDATA("data") << listSeparator - << ":/qrcStyles1" << listSeparator - << ":/qrcStyles2"; + << ":/qrcStyles3" << listSeparator + << ":/qrcStyles4"; QStringList expectedAvailableStyles = defaultAvailableStyles; - expectedAvailableStyles.insert(1, QLatin1String("QrcStyle2")); - expectedAvailableStyles.insert(1, QLatin1String("QrcStyle1")); + expectedAvailableStyles.insert(1, QLatin1String("QrcStyle4")); + expectedAvailableStyles.insert(1, QLatin1String("QrcStyle3")); expectedAvailableStyles.insert(1, QLatin1String("DummyStyle")); QTest::addRow("%s", qPrintable(environmentVariable)) @@ -283,12 +285,12 @@ void tst_QQuickStyle::qrcInQtQuickControlsStylePathEnvVar_data() // Same as the last row, except it adds a superfluous separator // to ensure that it handles it gracefully rather than failing an assertion. stream.noquote().nospace() << QFINDTESTDATA("data") << listSeparator - << ":/qrcStyles1" << listSeparator - << ":/qrcStyles2" << listSeparator; + << ":/qrcStyles3" << listSeparator + << ":/qrcStyles4" << listSeparator; QStringList expectedAvailableStyles = defaultAvailableStyles; - expectedAvailableStyles.insert(1, QLatin1String("QrcStyle2")); - expectedAvailableStyles.insert(1, QLatin1String("QrcStyle1")); + expectedAvailableStyles.insert(1, QLatin1String("QrcStyle4")); + expectedAvailableStyles.insert(1, QLatin1String("QrcStyle3")); expectedAvailableStyles.insert(1, QLatin1String("DummyStyle")); QTest::addRow("%s", qPrintable(environmentVariable)) -- cgit v1.2.3