fix(#193): issue with combination unmovable and alwaysOnTop

Author: SMartorelli

Notification Agent Core/Extensions/EFCLController-Extension.swift

@@ -194,28 +194,28 @@ extension EFCLController {
 
     private func buildDict(from keys: [String], and values: [String]) throws -> [String: Any] {
         var checkedValues = values
+        var checkedKeys = keys
         guard !keys.isEmpty && !values.isEmpty else {
             HelpBuilder.printNoArgumentsPage()
             throw NAError.efclController(type: .invalidArgumentsSyntax)
         }
         for arg in Self.standaloneBooleanArguments {
-            guard let index = keys.firstIndex(where: { $0 == arg }) else { continue }
-            if index > checkedValues.count {
-                checkedValues.append("true")
-            } else {
-                checkedValues.insert("true", at: index)
-            }
+            guard let index = checkedKeys.firstIndex(where: { $0 == arg }) else { continue }
+            let standAloneArgument = checkedKeys[index]
+            checkedKeys.remove(at: index)
+            checkedKeys.append(standAloneArgument)
+            checkedValues.append("true")
         }
-        guard keys.count == checkedValues.count else {
+        guard checkedKeys.count == checkedValues.count else {
             throw NAError.efclController(type: .invalidArgumentsFormat)
         }
         var dict: [String: Any] = [:]
-        for index in keys.indices {
-            dict[keys[index]] = checkedValues[index]
+        for index in checkedKeys.indices {
+            dict[checkedKeys[index]] = checkedValues[index]
         }
         return dict
     }
-    
+            
     /// Try to create a NotificationObject from the passed dictionary.
     /// - Parameter dict: the passed dictionary.
     /// - Throws: NAError.

Notification Agent Popup UI Tests/NAPUITests.swift

@@ -980,5 +980,79 @@ class NAPUITests: XCTestCase {
             XCTAssert(false, "Failed to encode the usecase.")
         }
     }
+    
+    /// Testing Pop-up with:
+    /// Title: This is a title
+    /// Subtitle: This is a subtitle
+    /// Main Button: Primary
+    /// Secondary Button: Secondary
+    /// Unmovable: true
+    func testD4Popup() throws {
+        let useCase = """
+        {"notification":{"topicID":"untracked","mainButton":{"label":"Primary","callToActionType":"none","callToActionPayload":""},"secondaryButton":{"label":"Secondary","callToActionType":"none","callToActionPayload":""},"iconPath":"","hideTitleBarButtons":false,"retainValues":false,"alwaysOnTop":false,"type":"popup","title":"This is a title","subtitle":"This is a subtitle","silent":false,"showSuppressionButton":false,"miniaturizable":false,"timeout":"30","barTitle":"Some","forceLightMode":false,"notificationID":"untracked","isMovable":false,"disableQuit":false, "accessoryViews":[]},"settings":{"isVerboseModeEnabled":false,"environment":"prod"}}
+        """ // pragma: allowlist-secret
+        if let useCaseData = useCase.data(using: .utf8) {
+            let app = XCUIApplication()
+            app.launchArguments = [useCaseData.base64EncodedString()]
+            app.launch()
+            XCTAssert(app.windows["main_window"].exists)
+            XCTAssert(app.windows["main_window"].isHittable)
+            XCTAssert(app.buttons["main_button"].exists)
+            XCTAssert(app.buttons["main_button"].isEnabled)
+            XCTAssert(app.buttons["secondary_button"].exists)
+            XCTAssert(app.staticTexts["popup_title"].exists)
+            XCTAssertEqual(app.staticTexts["popup_title"].value as? String ?? "", "This is a title")
+            XCTAssert(app.staticTexts["popup_subtitle"].exists)
+            XCTAssertEqual(app.staticTexts["popup_subtitle"].value as? String ?? "", "This is a subtitle")
+            let initialPositionY = app.windows["main_window"].frame.minY
+            let initialPositionX = app.windows["main_window"].frame.minX
+            let coordinate = app.windows["main_window"].coordinate(withNormalizedOffset: CGVector(dx: 0.02, dy: 0.04))
+            coordinate.click(forDuration: 1, thenDragTo: app.buttons["main_button"].coordinate(withNormalizedOffset: .zero))
+            let finalPositionY = app.windows["main_window"].frame.minY
+            let finalPositionX = app.windows["main_window"].frame.minX
+            XCTAssert(initialPositionX == finalPositionX)
+            XCTAssert(initialPositionY == finalPositionY)
+            app.terminate()
+        } else {
+            XCTAssert(false, "Failed to encode the usecase.")
+        }
+    }
+    
+    /// Testing Pop-up with:
+    /// Title: This is a title
+    /// Subtitle: This is a subtitle
+    /// Main Button: Primary
+    /// Secondary Button: Secondary
+    /// Unmovable: false
+    func testD5Popup() throws {
+        let useCase = """
+        {"notification":{"topicID":"untracked","mainButton":{"label":"Primary","callToActionType":"none","callToActionPayload":""},"secondaryButton":{"label":"Secondary","callToActionType":"none","callToActionPayload":""},"iconPath":"","hideTitleBarButtons":false,"retainValues":false,"alwaysOnTop":false,"type":"popup","title":"This is a title","subtitle":"This is a subtitle","silent":false,"showSuppressionButton":false,"miniaturizable":false,"timeout":"30","barTitle":"Some","forceLightMode":false,"notificationID":"untracked","isMovable":true,"disableQuit":false, "accessoryViews":[]},"settings":{"isVerboseModeEnabled":false,"environment":"prod"}}
+        """ // pragma: allowlist-secret
+        if let useCaseData = useCase.data(using: .utf8) {
+            let app = XCUIApplication()
+            app.launchArguments = [useCaseData.base64EncodedString()]
+            app.launch()
+            XCTAssert(app.windows["main_window"].exists)
+            XCTAssert(app.windows["main_window"].isHittable)
+            XCTAssert(app.buttons["main_button"].exists)
+            XCTAssert(app.buttons["main_button"].isEnabled)
+            XCTAssert(app.buttons["secondary_button"].exists)
+            XCTAssert(app.staticTexts["popup_title"].exists)
+            XCTAssertEqual(app.staticTexts["popup_title"].value as? String ?? "", "This is a title")
+            XCTAssert(app.staticTexts["popup_subtitle"].exists)
+            XCTAssertEqual(app.staticTexts["popup_subtitle"].value as? String ?? "", "This is a subtitle")
+            let initialPositionY = app.windows["main_window"].frame.minY
+            let initialPositionX = app.windows["main_window"].frame.minX
+            let coordinate = app.windows["main_window"].coordinate(withNormalizedOffset: CGVector(dx: 0.02, dy: 0.04))
+            coordinate.click(forDuration: 1, thenDragTo: app.buttons["main_button"].coordinate(withNormalizedOffset: .zero))
+            let finalPositionY = app.windows["main_window"].frame.minY
+            let finalPositionX = app.windows["main_window"].frame.minX
+            XCTAssertFalse(initialPositionX == finalPositionX)
+            XCTAssertFalse(initialPositionY == finalPositionY)
+            app.terminate()
+        } else {
+            XCTAssert(false, "Failed to encode the usecase.")
+        }
+    }
 }
 // swiftlint:enable type_body_length file_length