yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix activites_test check

Browse source 
client->isOnActivity("foo") will return true if the client is on no
activities, as that's the equivalent of saying we are on all activities.

In our case we do want to check activities() shows the right thing.
This commit is contained in:
David Edmundson 2016-08-12 12:39:08 +01:00
parent 0dd927c4a4
commit 628fe79d3e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
autotests/integration/activities_test.cpp
View file

@ -125,15 +125,15 @@ void ActivitiesTest::testSetOnActivitiesValidates()
QCOMPARE(client->window(), w); QCOMPARE(client->window(), w);
QVERIFY(client->isDecorated()); QVERIFY(client->isDecorated());
//verify the test machine doesn't have the following activities used
QVERIFY(!Activities::self()->all().contains(QStringLiteral("foo"))); QVERIFY(!Activities::self()->all().contains(QStringLiteral("foo")));
QVERIFY(!Activities::self()->all().contains(QStringLiteral("bar"))); QVERIFY(!Activities::self()->all().contains(QStringLiteral("bar")));
//setting the client to an invalid activities should result in the client being on all activities
client->setOnActivities(QStringList{QStringLiteral("foo"), QStringLiteral("bar")}); client->setOnActivities(QStringList{QStringLiteral("foo"), QStringLiteral("bar")});
QEXPECT_FAIL("", "D1982", Continue);
QVERIFY(client->isOnAllActivities()); QVERIFY(client->isOnAllActivities());
QEXPECT_FAIL("", "D1982", Continue); QVERIFY(!client->activities().contains(QLatin1String("foo")));
QVERIFY(!client->isOnActivity(QStringLiteral("foo"))); QVERIFY(!client->activities().contains(QLatin1String("bar")));
QEXPECT_FAIL("", "D1982", Continue);
QVERIFY(!client->isOnActivity(QStringLiteral("bar")));
// and destroy the window again // and destroy the window again
xcb_unmap_window(c.data(), w); xcb_unmap_window(c.data(), w);