[Fix] This patch resolves removing incorrect Activity from stack.

void process() method in Activity.
void markAsCompleted() method in Activity.

Change-Id: I1de7f9a266b32919add25607e3a0ee55b5909d5c

diff --git a/src/Activity.cpp b/src/Activity.cpp
index 5d62ef2..d8e585a 100644 (file)
--- a/src/Activity.cpp
+++ b/src/Activity.cpp
@@ -4,12 +4,17 @@ Activity::Activity(const std::string &activityType)
        : completed(false), type(activityType)
 {}
 
-std::string Activity::getType()
+std::string Activity::getType() const
 {
        return type;
 }
 
-bool Activity::isCompleted()
+bool Activity::isCompleted() const
 {
        return completed;
 }
+
+void Activity::markAsCompleted()
+{
+       completed = true;
+}

diff --git a/src/Activity.hpp b/src/Activity.hpp
index 812e853..b45ad8c 100644 (file)
--- a/src/Activity.hpp
+++ b/src/Activity.hpp
@@ -12,14 +12,17 @@ public:
        Activity(const std::string &activityType);
        virtual ~Activity() = default;
 
-       std::string getType();
+       std::string getType() const;
 
        virtual void initialize()
        {}
 
-       virtual bool process() = 0;
+       virtual void process() = 0;
+
+       bool isCompleted() const;
+       void markAsCompleted();
+
 
-       virtual bool isCompleted();
 
 protected:
        bool completed;

diff --git a/src/AppControlActivity.cpp b/src/AppControlActivity.cpp
index ed3253a..2f7e9da 100644 (file)
--- a/src/AppControlActivity.cpp
+++ b/src/AppControlActivity.cpp
@@ -12,7 +12,8 @@
 #define RETURN_ON_ERROR(ret) do {                                              \
                if (ret != APP_CONTROL_ERROR_NONE) {                    \
                        CHECK_ERROR(ret);                                                       \
-                       return true;                                                            \
+                       markAsCompleted();                                                      \
+                       return;                                                                         \
                }                                                                                               \
        } while (false)
 
@@ -33,7 +34,7 @@ public:
                }
        }
 
-       bool process() override
+       void process() override
        {
                auto ret = app_control_create(&appControlHandle);
                RETURN_ON_ERROR(ret);
@@ -50,7 +51,7 @@ public:
                ret = app_control_send_launch_request(appControlHandle, NULL, NULL);
                RETURN_ON_ERROR(ret);
 
-               return true;
+               markAsCompleted();
        }
 protected:
        virtual int addExtraDataToCall()

diff --git a/src/CallActivity.cpp b/src/CallActivity.cpp
index c62f175..4b40c0f 100644 (file)
--- a/src/CallActivity.cpp
+++ b/src/CallActivity.cpp
@@ -18,11 +18,11 @@ public:
                : Activity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                DBus::DBusClient dbus{dbusLocators::callmgr::BUS, dbusLocators::callmgr::OBJ_PATH, dbusLocators::callmgr::INTERFACE, DBus::ConnectionType::SYSTEM};
                dbus.method<int(int)>("AnswerCall").call(CM_TEL_CALL_ANSWER_TYPE_NORMAL);
-               return true;
+               markAsCompleted();
        }
 };
 
@@ -35,11 +35,11 @@ public:
                : Activity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                DBus::DBusClient dbus{dbusLocators::callmgr::BUS, dbusLocators::callmgr::OBJ_PATH, dbusLocators::callmgr::INTERFACE, DBus::ConnectionType::SYSTEM};
                dbus.method<int()>("RejectCall").call();
-               return true;
+               markAsCompleted();
        }
 };
 
@@ -52,10 +52,10 @@ public:
                : Activity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                DBus::DBusClient dbus{dbusLocators::callmgr::BUS, dbusLocators::callmgr::OBJ_PATH, dbusLocators::callmgr::INTERFACE, DBus::ConnectionType::SYSTEM};
                dbus.method<int(unsigned, int)>("EndCall").call(0, CM_TEL_CALL_RELEASE_TYPE_ALL_CALLS);
-               return true;
+               markAsCompleted();
        }
 };

diff --git a/src/ChangeScanningMethodActivity.cpp b/src/ChangeScanningMethodActivity.cpp
index fa4a118..967d992 100644 (file)
--- a/src/ChangeScanningMethodActivity.cpp
+++ b/src/ChangeScanningMethodActivity.cpp
@@ -15,15 +15,17 @@ public:
                : Activity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                auto method = Singleton<VConfInterface>::instance().get(VCONF_KEY_SCAN_METHOD, 0);
-               if (!method)
-                       return true;
+               if (!method) {
+                       markAsCompleted();
+                       return;
+               }
 
                method = method % 2 + 1;
                Singleton<VConfInterface>::instance().set(VCONF_KEY_SCAN_METHOD, method);
                Singleton<UniversalSwitch>::instance().getScreenScannerManager()->startAutoscanning();
-               return true;
+               markAsCompleted();
        }
 };

diff --git a/src/ChangeSoundProfileActivity.cpp b/src/ChangeSoundProfileActivity.cpp
index b07e60b..7dbc729 100644 (file)
--- a/src/ChangeSoundProfileActivity.cpp
+++ b/src/ChangeSoundProfileActivity.cpp
@@ -11,7 +11,7 @@ public:
                : Activity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                auto sound = Singleton<VConfInterface>::instance().get(VCONF_KEY_SOUND_ENABLED, true) ? 1 : 0;
                auto vibration = Singleton<VConfInterface>::instance().get(VCONF_KEY_VIBRATION_ENABLED, false) ? 1 : 0;
@@ -28,7 +28,7 @@ public:
                        changeProfile(false, false);
                        break;
                }
-               return true;
+               markAsCompleted();
        }
 
        void changeProfile(bool sound, bool vibration)

diff --git a/src/ChangeSpeedAutoScanActivity.cpp b/src/ChangeSpeedAutoScanActivity.cpp
index 4235beb..d8cd5cd 100644 (file)
--- a/src/ChangeSpeedAutoScanActivity.cpp
+++ b/src/ChangeSpeedAutoScanActivity.cpp
@@ -24,13 +24,13 @@ public:
                : Activity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                changeKeyValue([](double currentValue) {
                        auto newValue = currentValue - VCONF_KEY_AUTO_SCAN_INTERVAL_VALUE_INCREMENT;
                        return newValue < VCONF_KEY_AUTO_SCAN_INTERVAL_VALUE_MIN ? VCONF_KEY_AUTO_SCAN_INTERVAL_VALUE_MIN : newValue;
                });
-               return true;
+               markAsCompleted();
        }
 };
 
@@ -42,12 +42,12 @@ public:
                : Activity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                changeKeyValue([](double currentValue) {
                        auto newValue = currentValue + VCONF_KEY_AUTO_SCAN_INTERVAL_VALUE_INCREMENT;
                        return newValue > VCONF_KEY_AUTO_SCAN_INTERVAL_VALUE_MAX ? VCONF_KEY_AUTO_SCAN_INTERVAL_VALUE_MAX : newValue;
                });
-               return true;
+               markAsCompleted();
        }
 };

diff --git a/src/ChangeValueActivity.cpp b/src/ChangeValueActivity.cpp
index 58e0256..a375d6f 100644 (file)
--- a/src/ChangeValueActivity.cpp
+++ b/src/ChangeValueActivity.cpp
@@ -12,11 +12,11 @@ public:
                : UIActivity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                ASSERT(uiElement, "process invoked before uiElement initialization");
                uiElement->increment();
-               return true;
+               markAsCompleted();
        }
 };
 
@@ -28,10 +28,10 @@ public:
                : UIActivity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                ASSERT(uiElement, "process invoked before uiElement initialization");
                uiElement->decrement();
-               return true;
+               markAsCompleted();
        }
 };

diff --git a/src/GestureActivity.cpp b/src/GestureActivity.cpp
index d36548d..698c414 100644 (file)
--- a/src/GestureActivity.cpp
+++ b/src/GestureActivity.cpp
@@ -25,13 +25,13 @@ public:
                : UIActivity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                auto point = uiElement->getScanningCoordinates();
                DBus::DBusClient dbus {dbusLocators::accessibilityEMod::BUS, dbusLocators::accessibilityEMod::OBJ_PATH, dbusLocators::accessibilityEMod::INTERFACE, DBus::ConnectionType::SYSTEM};
                SwipeType swipeType = DerivedType::swipeType;
                dbus.method<void(int, int, int)>("DispatchGestureEvent").call(swipeType, point.x, point.y);
-               return true;
+               markAsCompleted();
        }
 };
 

diff --git a/src/HardwareKeyActivity.cpp b/src/HardwareKeyActivity.cpp
index b057022..16549a2 100644 (file)
--- a/src/HardwareKeyActivity.cpp
+++ b/src/HardwareKeyActivity.cpp
@@ -12,10 +12,10 @@ public:
                : Activity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                utils::EventGenerator::generateKeyPress(DerivedType::buttonCode, DerivedType::multiplicity);
-               return true;
+               markAsCompleted();
        }
 };
 

diff --git a/src/MoveElementActivity.cpp b/src/MoveElementActivity.cpp
index 105e555..a5459de 100644 (file)
--- a/src/MoveElementActivity.cpp
+++ b/src/MoveElementActivity.cpp
@@ -13,12 +13,12 @@ public:
        constexpr static const char *activityType = DerivedType::activityType;
        MoveElementActivity() : Activity(activityType) {}
 
-       bool process() override
+       void process() override
        {
                auto s = Singleton<UniversalSwitch>::instance().getScreenScannerManager();
                if (s) DerivedType::move(s);
                else ERROR("ScreenScannerManager not found");
-               return true;
+               markAsCompleted();
        }
 };
 

diff --git a/src/PowerKeyMenuActivity.cpp b/src/PowerKeyMenuActivity.cpp
index 6c66d10..dd82d62 100644 (file)
--- a/src/PowerKeyMenuActivity.cpp
+++ b/src/PowerKeyMenuActivity.cpp
@@ -14,25 +14,26 @@ public:
        PowerKeyMenuActivity()
                : Activity(activityType) {}
 
-       bool process() override
+       void process() override
        {
                auto bundleHandle = std::unique_ptr<bundle, int(*)(bundle *)>(bundle_create(), bundle_free);
                if (!bundleHandle) {
-                       ERROR("bundle_create failure");
-                       return true;
+                       markAsCompleted();
+                       return;
                }
 
                auto ret = bundle_add(bundleHandle.get(), POPUP_CONTENT, POPUP_NAME_POWERKEY);
                if (ret < 0) {
                        ERROR("Failed to add bundle (%s,%s), error: %d", POPUP_CONTENT, POPUP_NAME_POWERKEY, ret);
-                       return true;
+                       markAsCompleted();
+                       return;
                }
 
                ret = syspopup_launch(const_cast<char *>(POPUP_POWERKEY), bundleHandle.get());
                if (ret < 0)
                        ERROR("Failed to launch popup, error: %d", ret);
 
-               return true;
+               markAsCompleted();
        }
 
 private:

diff --git a/src/QuickpanelActivity.cpp b/src/QuickpanelActivity.cpp
index 57d9a66..ebf9542 100644 (file)
--- a/src/QuickpanelActivity.cpp
+++ b/src/QuickpanelActivity.cpp
@@ -15,10 +15,10 @@ public:
                : Activity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                DerivedType::changeQuickpanelState();
-               return true;
+               markAsCompleted();
        }
 };
 

diff --git a/src/ScreenshotActivity.cpp b/src/ScreenshotActivity.cpp
index 0bcc063..a2dc6bf 100644 (file)
--- a/src/ScreenshotActivity.cpp
+++ b/src/ScreenshotActivity.cpp
@@ -23,7 +23,7 @@ class ScreenshotActivity : public UIActivity, private RegisterActivity<Screensho
 {
 public:
        ScreenshotActivity();
-       bool process() override;
+       void process() override;
 
        constexpr static const char *activityType = "SCREENSHOT";
 
@@ -37,7 +37,7 @@ private:
 
 ScreenshotActivity::ScreenshotActivity() : UIActivity(activityType) {}
 
-bool ScreenshotActivity::process()
+void ScreenshotActivity::process()
 {
        char *path = nullptr;
        storage_get_directory(STORAGE_TYPE_INTERNAL, STORAGE_DIRECTORY_IMAGES, &path);
@@ -46,7 +46,8 @@ bool ScreenshotActivity::process()
 
        if (directory.empty()) {
                ERROR("No storage path");
-               return true;
+               markAsCompleted();
+               return;
        }
 
        auto filename = directory + "/" + generateFileName();
@@ -57,11 +58,9 @@ bool ScreenshotActivity::process()
                else
                        ERROR("No main window");
 
-               completed = true;
+               markAsCompleted();
                return ecore::TimerRepetitionPolicy::cancel;
        });
-
-       return false;
 }
 
 

diff --git a/src/SelectActivity.cpp b/src/SelectActivity.cpp
index 7608d29..42b3f02 100644 (file)
--- a/src/SelectActivity.cpp
+++ b/src/SelectActivity.cpp
@@ -37,7 +37,7 @@ public:
        ~SelectActivity();
        SelectActivity(SelectActivity &&) = delete;
 
-       bool process() override;
+       void process() override;
        void update(const std::shared_ptr<UIElement> &elem) override;
        void update(const std::shared_ptr<MenuItem> &menuitem) override;
 
@@ -91,11 +91,9 @@ SelectActivity::~SelectActivity()
        removeMenu();
 }
 
-bool SelectActivity::process()
+void SelectActivity::process()
 {
        DEBUG("Select - process called");
-       if (completed)
-               return true;
 
        if (timer.isSet()) {
                timer.reset();
@@ -107,8 +105,6 @@ bool SelectActivity::process()
 
        if (screenScannerManager)
                screenScannerManager->acceptAutoscanning();
-
-       return false;
 }
 
 void SelectActivity::update(const std::shared_ptr<UIElement> &elem)
@@ -252,7 +248,7 @@ void SelectActivity::navigateThroughSubMenuOrCreateActivityChangeRequest(MenuIte
 
        if (!menuItem->isRepeatable()) {
                removeMenu();
-               completed = true;
+               markAsCompleted();
        }
 
        notify(std::make_shared<ActivityChangeRequest>(menuItem->getActivityType(), realUiElement));
@@ -272,7 +268,7 @@ void SelectActivity::navigateBack()
        removeMenu();
        nestedMenusLabels.pop_back();
        if (nestedMenusLabels.empty())
-               completed = true;
+               markAsCompleted();
        else
                refreshMenu();
 }
@@ -280,7 +276,7 @@ void SelectActivity::navigateBack()
 void SelectActivity::sendTapActivityChangeRequest()
 {
        ASSERT(realUiElement, "realUiElement is NULL");
-       completed = true;
+       markAsCompleted();
        notify(std::make_shared<ActivityChangeRequest>("TAP", realUiElement));
 }
 

diff --git a/src/SwitchManager.cpp b/src/SwitchManager.cpp
index dd8fb7a..35c5142 100644 (file)
--- a/src/SwitchManager.cpp
+++ b/src/SwitchManager.cpp
@@ -215,11 +215,6 @@ void SwitchManager::changeActivity(const std::shared_ptr<ActivityChangeRequest>
                return;
        }
 
-       bool completed = activities.top()->process();
-
-       if (completed) {
-               DEBUG("Pop from stack: %s", activities.top()->getType().c_str());
-               activities.pop();
-       }
+       activities.top()->process();
        //TODO: check if activity change request observers are properly detached from activity object removed from activity stack
 }

diff --git a/src/TapActivity.cpp b/src/TapActivity.cpp
index 043f130..2fc616a 100644 (file)
--- a/src/TapActivity.cpp
+++ b/src/TapActivity.cpp
@@ -12,15 +12,16 @@ public:
                : UIActivity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                if (!uiElement) {
                        ERROR("process invoked before uiElement initialization");
-                       return true;
+                       markAsCompleted();
+                       return;
                }
 
                uiElement->activate();
-               return true;
+               markAsCompleted();
        }
 
 };

diff --git a/src/ToggleAutoScanActivity.cpp b/src/ToggleAutoScanActivity.cpp
index 506cdb8..5aaa0ab 100644 (file)
--- a/src/ToggleAutoScanActivity.cpp
+++ b/src/ToggleAutoScanActivity.cpp
@@ -11,10 +11,10 @@ public:
                : Activity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                Singleton<VConfInterface>::instance().set(VCONF_KEY_AUTO_SCAN_ENABLED, true);
-               return true;
+               markAsCompleted();
        }
 };
 
@@ -26,9 +26,9 @@ public:
                : Activity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                Singleton<VConfInterface>::instance().set(VCONF_KEY_AUTO_SCAN_ENABLED, false);
-               return true;
+               markAsCompleted();
        }
 };

diff --git a/src/ToggleSoundFeedbackEnabledActivity.cpp b/src/ToggleSoundFeedbackEnabledActivity.cpp
index 59ce737..ecc79d3 100644 (file)
--- a/src/ToggleSoundFeedbackEnabledActivity.cpp
+++ b/src/ToggleSoundFeedbackEnabledActivity.cpp
@@ -11,10 +11,10 @@ public:
                : Activity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                auto isEnabled = Singleton<VConfInterface>::instance().get(VCONF_KEY_FEEDBACK_SOUND_ENABLED, false);
                Singleton<VConfInterface>::instance().set(VCONF_KEY_FEEDBACK_SOUND_ENABLED, !isEnabled);
-               return true;
+               markAsCompleted();
        }
 };

diff --git a/src/ToggleVoiceFeedbackEnabledActivity.cpp b/src/ToggleVoiceFeedbackEnabledActivity.cpp
index 697323c..89d9d93 100644 (file)
--- a/src/ToggleVoiceFeedbackEnabledActivity.cpp
+++ b/src/ToggleVoiceFeedbackEnabledActivity.cpp
@@ -13,10 +13,10 @@ public:
                : Activity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                auto isEnabled = Singleton<VConfInterface>::instance().get(VCONF_KEY_FEEDBACK_VOICE_ENABLED, true);
                Singleton<VConfInterface>::instance().set(VCONF_KEY_FEEDBACK_VOICE_ENABLED, !isEnabled);
-               return true;
+               markAsCompleted();
        }
 };

diff --git a/src/VolumeControlActivity.cpp b/src/VolumeControlActivity.cpp
index 345497c..f2d8e99 100644 (file)
--- a/src/VolumeControlActivity.cpp
+++ b/src/VolumeControlActivity.cpp
@@ -5,11 +5,12 @@
 
 #include <sound_manager.h>
 
-#define RETURN_ON_ERROR(status) do {                                                                                           \
-               if (status != SOUND_MANAGER_ERROR_NONE) {                                                                       \
-                       ERROR("Sound manager error %d", status);                                                                \
-                       return true;                                                                                                                    \
-               }                                                                                                                                                       \
+#define RETURN_ON_ERROR(status) do {                                   \
+               if (status != SOUND_MANAGER_ERROR_NONE) {               \
+                       ERROR("Sound manager error %d", status);        \
+                       markAsCompleted();                                                      \
+                       return;                                                                         \
+               }                                                                                               \
        } while (false)
 
 #define RETURN_DEFAULT_SOUND_TYPE_ON_ERROR(status) do {                                                                \
@@ -31,7 +32,7 @@ public:
                : Activity(activityType)
        {}
 
-       bool process() override
+       void process() override
        {
                int volume = 0;
                int maxVolume = 0;
@@ -44,7 +45,7 @@ public:
                volume = utils::clamp(volume + DerivedType::step, minVolume, maxVolume);
                RETURN_ON_ERROR(sound_manager_set_volume(soundType, volume));
 
-               return true;
+               markAsCompleted();
        }
 
        virtual sound_type_e getSoundType() const

diff --git a/tests/ui-scenarios/ActivityProcessingTests.cpp b/tests/ui-scenarios/ActivityProcessingTests.cpp
index a19a696..2579f96 100644 (file)
--- a/tests/ui-scenarios/ActivityProcessingTests.cpp
+++ b/tests/ui-scenarios/ActivityProcessingTests.cpp
@@ -37,8 +37,10 @@ TEST_F(ActivityProcessingFixture, ActivityReady)
                EXPECT_EQ(activity->getType(), "TWO_STEP_PROCESS_ACTIVITY");
 
        simulateKeyPress(keyMappedToTwoStepProcessActivity_);
-       auto isEmpty = switchManager_->getActivities().empty();
-       EXPECT_EQ(isEmpty, true);
+       activity = switchManager_->getActivities().top();
+       EXPECT_NE(activity, nullptr);
+       if (activity)
+               EXPECT_TRUE(activity->isCompleted());
 }
 
 /*
@@ -48,30 +50,45 @@ TEST_F(ActivityProcessingFixture, ActivityReady)
 TEST_F(ActivityProcessingFixture, ActivityAbandoned)
 {
        initialEnvironmentExpect();
-       auto activity = switchManager_->getActivities().top();
-       EXPECT_NE(activity, nullptr);
-       if (activity)
-               EXPECT_EQ(activity->getType(), "TWO_STEP_PROCESS_ACTIVITY");
+
+       auto twoStepProcessActivity = switchManager_->getActivities().top();
+       EXPECT_NE(twoStepProcessActivity, nullptr);
+       if (!twoStepProcessActivity)
+               return;
+
+       EXPECT_EQ(twoStepProcessActivity->getType(), "TWO_STEP_PROCESS_ACTIVITY");
+       EXPECT_FALSE(twoStepProcessActivity->isCompleted());
 
        simulateKeyPress(keyMappedToThreeStepProcessActivity_);
+
        EXPECT_EQ(switchManager_->getActivities().size(), 2u);
-       activity = switchManager_->getActivities().top();
-       EXPECT_NE(activity, nullptr);
-       if (activity)
-               EXPECT_EQ(activity->getType(), "THREE_STEP_PROCESS_ACTIVITY");
+
+       auto threeStepProcessActivity = switchManager_->getActivities().top();
+       EXPECT_NE(threeStepProcessActivity, nullptr);
+       if (!threeStepProcessActivity)
+               return;
+
+       EXPECT_EQ(threeStepProcessActivity->getType(), "THREE_STEP_PROCESS_ACTIVITY");
+       EXPECT_FALSE(twoStepProcessActivity->isCompleted());
+       EXPECT_FALSE(threeStepProcessActivity->isCompleted());
 
        simulateKeyPress(keyMappedToThreeStepProcessActivity_);
        EXPECT_EQ(switchManager_->getActivities().size(), 2u);
-       activity = switchManager_->getActivities().top();
+       EXPECT_EQ(threeStepProcessActivity, switchManager_->getActivities().top());
+       EXPECT_FALSE(twoStepProcessActivity->isCompleted());
+       EXPECT_FALSE(threeStepProcessActivity->isCompleted());
 
-       EXPECT_NE(activity, nullptr);
-       if (activity)
-               EXPECT_EQ(activity->getType(), "THREE_STEP_PROCESS_ACTIVITY");
 
        simulateKeyPress(keyMappedToThreeStepProcessActivity_);
+
+       EXPECT_EQ(switchManager_->getActivities().size(), 2u);
+       EXPECT_EQ(threeStepProcessActivity, switchManager_->getActivities().top());
+       EXPECT_FALSE(twoStepProcessActivity->isCompleted());
+       EXPECT_TRUE(threeStepProcessActivity->isCompleted());
+
+       simulateKeyPress(keyMappedToTwoStepProcessActivity_);
+
        EXPECT_EQ(switchManager_->getActivities().size(), 1u);
-       activity = switchManager_->getActivities().top();
-       EXPECT_NE(activity, nullptr);
-       if (activity)
-               EXPECT_EQ(activity->getType(), "TWO_STEP_PROCESS_ACTIVITY");
+       EXPECT_EQ(twoStepProcessActivity, switchManager_->getActivities().top());
+       EXPECT_TRUE(twoStepProcessActivity->isCompleted());
 }

diff --git a/tests/ui-scenarios/ConfigurationTests.hpp b/tests/ui-scenarios/ConfigurationTests.hpp
index 21272c5..f0b96f2 100644 (file)
--- a/tests/ui-scenarios/ConfigurationTests.hpp
+++ b/tests/ui-scenarios/ConfigurationTests.hpp
@@ -33,9 +33,10 @@ public:
                static constexpr const char *activityType = "TWO_STEP_PROCESS_ACTIVITY";
                TwoStepProcessActivity(): Activity(activityType) {}
 
-               bool process() override
+               void process() override
                {
-                       return ++state > 1;
+                       if (++state > 1)
+                               markAsCompleted();
                };
                int state = 0;
        };
@@ -46,9 +47,10 @@ public:
                static constexpr const char *activityType = "THREE_STEP_PROCESS_ACTIVITY";
                ThreeStepProcessActivity(): Activity(activityType) {}
 
-               bool process() override
+               void process() override
                {
-                       return ++state > 2;
+                       if (++state > 2)
+                               markAsCompleted();
                };
                int state = 0;
        };