From 628fe79d3e4978bf4ff57d070b803b1f50daa2f6 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Fri, 12 Aug 2016 12:39:08 +0100 Subject: [PATCH] Fix activites_test check 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. --- autotests/integration/activities_test.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/autotests/integration/activities_test.cpp b/autotests/integration/activities_test.cpp index 88b6aa4403..76e79fa4e8 100644 --- a/autotests/integration/activities_test.cpp +++ b/autotests/integration/activities_test.cpp @@ -125,15 +125,15 @@ void ActivitiesTest::testSetOnActivitiesValidates() QCOMPARE(client->window(), w); 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("bar"))); + + //setting the client to an invalid activities should result in the client being on all activities client->setOnActivities(QStringList{QStringLiteral("foo"), QStringLiteral("bar")}); - QEXPECT_FAIL("", "D1982", Continue); QVERIFY(client->isOnAllActivities()); - QEXPECT_FAIL("", "D1982", Continue); - QVERIFY(!client->isOnActivity(QStringLiteral("foo"))); - QEXPECT_FAIL("", "D1982", Continue); - QVERIFY(!client->isOnActivity(QStringLiteral("bar"))); + QVERIFY(!client->activities().contains(QLatin1String("foo"))); + QVERIFY(!client->activities().contains(QLatin1String("bar"))); // and destroy the window again xcb_unmap_window(c.data(), w);