alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

IconItemTest: Set plasma theme to default rather than skipping tests if not default

Browse Source 
Default plasma theme is installed with plasma-framework, so there
shouldn't be reason to skip tests.

REVIEW: 128408
This commit is contained in:
David Rosca 2016-07-12 10:01:29 +02:00
parent 66bb67a017
commit 80dcba46b5
2 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
autotests/iconitemtest.cpp
View File

@ -92,6 +92,11 @@ void IconItemTest::cleanupTestCase()
delete m_view; delete m_view;
} }
void IconItemTest::init()
{
Plasma::Theme().setThemeName(QStringLiteral("default"));
}
void IconItemTest::cleanup() void IconItemTest::cleanup()
{ {
qDeleteAll(m_view->rootObject()->childItems()); qDeleteAll(m_view->rootObject()->childItems());
@ -187,11 +192,6 @@ void IconItemTest::invalidIcon()
void IconItemTest::usesPlasmaTheme() void IconItemTest::usesPlasmaTheme()
{ {
Plasma::Theme theme;
if (!theme.themeName().startsWith("default")) {
QSKIP("Current Plasma theme is not Breeze.");
}
// usesPlasmaTheme = true (default) // usesPlasmaTheme = true (default)
QQuickItem *item1 = createIconItem(); QQuickItem *item1 = createIconItem();
item1->setProperty("source", "konversation"); item1->setProperty("source", "konversation");
@ -221,11 +221,6 @@ void IconItemTest::usesPlasmaTheme()
void IconItemTest::animation() void IconItemTest::animation()
{ {
if (!Plasma::Theme().themeName().startsWith("default")) {
// This this depends on the production default theme.
QSKIP("Current Plasma theme is not Breeze.");
}
// animated = true (default) // animated = true (default)
QQuickItem *item1 = createIconItem(); QQuickItem *item1 = createIconItem();
item1->setProperty("source", "user-away"); item1->setProperty("source", "user-away");
@ -253,11 +248,6 @@ void IconItemTest::animation()
void IconItemTest::animationAfterHide() void IconItemTest::animationAfterHide()
{ {
if (!Plasma::Theme().themeName().startsWith("default")) {
// This this depends on the production default theme.
QSKIP("Current Plasma theme is not Breeze.");
}
QQuickItem *item1 = createIconItem(); QQuickItem *item1 = createIconItem();
QQuickItem *item2 = createIconItem(); QQuickItem *item2 = createIconItem();
item1->setProperty("source", "user-away"); item1->setProperty("source", "user-away");
@ -332,11 +322,6 @@ void IconItemTest::loadSvg()
void IconItemTest::themeChange() void IconItemTest::themeChange()
{ {
if (!Plasma::Theme().themeName().startsWith("default")) {
// This this depends on the production themes (infer their presence from default).
QSKIP("Current Plasma theme is not Breeze.");
}
// Icon from Plasma theme // Icon from Plasma theme
QQuickItem *item1 = createIconItem(); QQuickItem *item1 = createIconItem();
item1->setProperty("animated", false); item1->setProperty("animated", false);
@ -383,11 +368,6 @@ void IconItemTest::qiconFromTheme()
void IconItemTest::changeColorGroup() void IconItemTest::changeColorGroup()
{ {
if (!Plasma::Theme().themeName().startsWith("default")) {
// This this depends on the production default theme.
QSKIP("Current Plasma theme is not Breeze.");
}
// Icon from Plasma theme // Icon from Plasma theme
QQuickItem *item = createIconItem(); QQuickItem *item = createIconItem();
item->setProperty("animated", false); item->setProperty("animated", false);

1
autotests/iconitemtest.h
View File

@ -36,6 +36,7 @@ class IconItemTest : public QObject
private Q_SLOTS: private Q_SLOTS:
void initTestCase(); void initTestCase();
void cleanupTestCase(); void cleanupTestCase();
void init();
void cleanup(); void cleanup();
void loadPixmap(); void loadPixmap();