From 22720d294bdd6d0529069a0dacf39531681afe63 Mon Sep 17 00:00:00 2001
From: Dmitry Bespalov <dmitry.bespalov@zalando.de>
Date: Wed, 1 Nov 2017 15:38:00 +0100
Subject: [PATCH] GH-4 Refactored into method and used in both private and ui
 automation apis

---
 SwiftMonkey/MonkeyUIAutomation.swift  | 48 +++++++-------
 SwiftMonkey/MonkeyXCTestPrivate.swift | 96 ++++++++++++---------------
 2 files changed, 67 insertions(+), 77 deletions(-)

diff --git a/SwiftMonkey/MonkeyUIAutomation.swift b/SwiftMonkey/MonkeyUIAutomation.swift
index 2ceb784..5ebb353 100644
--- a/SwiftMonkey/MonkeyUIAutomation.swift
+++ b/SwiftMonkey/MonkeyUIAutomation.swift
@@ -62,9 +62,9 @@ extension Monkey {
           of all relative probabilities.
     */
     public func addUIAutomationSingleTapAction(weight: Double) {
-        addAction(weight: weight) { [weak self] in
+        addAction(weight: weight, action: actInForeground { [weak self] in
             eventGenerator.sendTap(self!.randomPoint())
-        }
+        })
     }
 
     /**
@@ -85,7 +85,7 @@ extension Monkey {
     */
     public func addUIAutomationTapAction(weight: Double, multipleTapProbability: Double = 0.05,
     multipleTouchProbability: Double = 0.05, longPressProbability: Double = 0.05) {
-        addAction(weight: weight) { [weak self] in
+        addAction(weight: weight, action: actInForeground { [weak self] in
             let numberOfTaps: Int
             if self!.r.randomDouble()<multipleTapProbability {
                 numberOfTaps = Int(self!.r.randomUInt32() % 2) + 2
@@ -111,7 +111,7 @@ extension Monkey {
                 eventGenerator.liftUpAtPoints(touches, touchCount: UInt64(touches.count))
                 if i != numberOfTaps { self!.sleep(0.2) }
             }
-        }
+        })
     }
 
     /**
@@ -124,11 +124,11 @@ extension Monkey {
           of all relative probabilities.
     */
     public func addUIAutomationDragAction(weight: Double) {
-        addAction(weight: weight) { [weak self] in
+        addAction(weight: weight, action: actInForeground { [weak self] in
             let start = self!.randomPointAvoidingPanelAreas()
             let end = self!.randomPoint()
             eventGenerator.sendDragWithStartPoint(start, endPoint: end, duration: 0.5)
-        }
+        })
     }
 
     /**
@@ -141,11 +141,11 @@ extension Monkey {
           of all relative probabilities.
     */
     public func addUIAutomationFlickAction(weight: Double) {
-        addAction(weight: weight) { [weak self] in
+        addAction(weight: weight, action: actInForeground { [weak self] in
             let start = self!.randomPointAvoidingPanelAreas()
             let end = self!.randomPoint()
             eventGenerator.sendFlickWithStartPoint(start, endPoint: end, duration: 0.5)
-        }
+        })
     }
 
     /**
@@ -158,11 +158,11 @@ extension Monkey {
           of all relative probabilities.
     */
     public func addUIAutomationPinchCloseAction(weight: Double) {
-        addAction(weight: weight) { [weak self] in
+        addAction(weight: weight, action: actInForeground { [weak self] in
             let start = self!.randomPoint()
             let end = self!.randomPoint()
             eventGenerator.sendPinchCloseWithStartPoint(start, endPoint: end, duration: 0.5)
-        }
+        })
     }
 
     /**
@@ -175,11 +175,11 @@ extension Monkey {
           of all relative probabilities.
     */
     public func addUIAutomationPinchOpenAction(weight: Double) {
-        addAction(weight: weight) { [weak self] in
+        addAction(weight: weight, action: actInForeground { [weak self] in
             let start = self!.randomPoint()
             let end = self!.randomPoint()
             eventGenerator.sendPinchOpenWithStartPoint(start, endPoint: end, duration: 0.5)
-        }
+        })
     }
 
     /**
@@ -194,12 +194,12 @@ extension Monkey {
     */
     public func addUIAutomationRotateAction(weight: Double) {
         // Not working for some reason.
-        addAction(weight: weight) { [weak self] in
+        addAction(weight: weight, action: actInForeground { [weak self] in
             let point = self!.randomPoint()
             let radius = self!.r.randomDouble() * 100 + 50
             let angle = self!.r.randomDouble() * 2 * Double.pi
             eventGenerator.sendRotate(point, withRadius: radius, rotation: angle, duration: 0.5, touchCount: 2)
-        }
+        })
     }
 
     /**
@@ -212,7 +212,7 @@ extension Monkey {
           of all relative probabilities.
     */
     public func addUIAutomationOrientationAction(weight: Double) {
-        addAction(weight: weight) { [weak self] in
+        addAction(weight: weight, action: actInForeground { [weak self] in
             let orientations: [UIDeviceOrientation] = [
                 .portrait,
                 .portraitUpsideDown,
@@ -227,7 +227,7 @@ extension Monkey {
 
             eventGenerator.setOrientation(Int32(orientation.rawValue))
             self!.sleep(0.9)
-        }
+        })
     }
 
     /**
@@ -240,9 +240,9 @@ extension Monkey {
           of all relative probabilities.
     */
     public func addUIAutomationClickVolumeUpAction(weight: Double) {
-        addAction(weight: weight) {
+        addAction(weight: weight, action: actInForeground {
             eventGenerator.clickVolumeUp()
-        }
+        })
     }
 
     /**
@@ -255,9 +255,9 @@ extension Monkey {
           of all relative probabilities.
     */
     public func addUIAutomationClickVolumeDownAction(weight: Double) {
-        addAction(weight: weight) {
+        addAction(weight: weight, action: actInForeground {
             eventGenerator.clickVolumeDown()
-        }
+        })
     }
 
     /**
@@ -270,9 +270,9 @@ extension Monkey {
           of all relative probabilities.
     */
     public func addUIAutomationShakeAction(weight: Double) {
-        addAction(weight: weight) {
+        addAction(weight: weight, action: actInForeground {
             eventGenerator.shake()
-        }
+        })
     }
 
     /**
@@ -285,12 +285,12 @@ extension Monkey {
           of all relative probabilities.
     */
     public func addUIAutomationLockAction(weight: Double) {
-        addAction(weight: weight) { [weak self] in
+        addAction(weight: weight, action: actInForeground { [weak self] in
             let duration = 3 * self!.r.randomDouble()
             eventGenerator.lockDevice()
             self!.sleep(duration)
             eventGenerator.sendDragWithStartPoint(CGPoint(x: 20, y: 400), endPoint: CGPoint(x: 300, y: 400), duration: 0.5)
-        }
+        })
     }
 }
 
diff --git a/SwiftMonkey/MonkeyXCTestPrivate.swift b/SwiftMonkey/MonkeyXCTestPrivate.swift
index 8a8e177..8e56317 100644
--- a/SwiftMonkey/MonkeyXCTestPrivate.swift
+++ b/SwiftMonkey/MonkeyXCTestPrivate.swift
@@ -28,11 +28,30 @@ extension Monkey {
         return generatorClass.sharedGenerator()
     }
 
-    private var isInForeground: Bool {
-        if #available(iOS 9.0, *) {
-            return XCUIApplication().state == .runningForeground
+    typealias ActionClousre = () -> Void
+
+    /**
+     Wrap your action with this function to make sure your actions are dispatched inside the app under test
+     and not in some other app that the Monkey randomly opened.
+     */
+    func actInForeground(_ action: @escaping ActionClousre) -> ActionClousre {
+        return {
+            guard #available(iOS 9.0, *) else {
+                action()
+                return
+            }
+            let closure: ActionClousre = {
+                if XCUIApplication().state != .runningForeground {
+                    XCUIApplication().activate()
+                }
+                action()
+            }
+            if Thread.isMainThread {
+                closure()
+            } else {
+                DispatchQueue.main.async(execute: closure)
+            }
         }
-        return true
     }
 
     /**
@@ -67,8 +86,7 @@ extension Monkey {
      */
     public func addXCTestTapAction(weight: Double, multipleTapProbability: Double = 0.05,
                                    multipleTouchProbability: Double = 0.05) {
-        addAction(weight: weight) { [weak self] in
-            guard self?.isInForeground == true else { return }
+        addAction(weight: weight, action: actInForeground { [weak self] in
             let numberOfTaps: UInt
             if self!.r.randomDouble() < multipleTapProbability {
                 numberOfTaps = UInt(self!.r.randomUInt32() % 2) + 2
@@ -90,12 +108,11 @@ extension Monkey {
             let semaphore = DispatchSemaphore(value: 0)
             self!.sharedXCEventGenerator.tapAtTouchLocations(locations,
                                                              numberOfTaps: numberOfTaps,
-                                                             orientation: orientationValue) { [weak self] in
-                                                                self?.reactivateApplicationIfNeeded()
+                                                             orientation: orientationValue) {
                                                                 semaphore.signal()
             }
             semaphore.wait()
-        }
+        })
     }
 
     /**
@@ -108,18 +125,15 @@ extension Monkey {
      of all relative probabilities.
      */
     public func addXCTestLongPressAction(weight: Double) {
-        addAction(weight: weight) { [weak self] in
-            guard self?.isInForeground == true else { return }
-
+        addAction(weight: weight, action: actInForeground { [weak self] in
             let point = self!.randomPoint()
             let semaphore = DispatchSemaphore(value: 0)
             self!.sharedXCEventGenerator.pressAtPoint(point, forDuration: 0.5,
-                                                      orientation: orientationValue) { [weak self] in
-                                                        self?.reactivateApplicationIfNeeded()
+                                                      orientation: orientationValue) {
                                                         semaphore.signal()
             }
             semaphore.wait()
-        }
+        })
     }
 
     /**
@@ -132,9 +146,7 @@ extension Monkey {
      of all relative probabilities.
      */
     public func addXCTestDragAction(weight: Double) {
-        addAction(weight: weight) { [weak self] in
-            guard self?.isInForeground == true else { return }
-
+        addAction(weight: weight, action: actInForeground { [weak self] in
             let start = self!.randomPointAvoidingPanelAreas()
             let end = self!.randomPoint()
 
@@ -144,12 +156,11 @@ extension Monkey {
                                                       liftAtPoint: end,
                                                       velocity: 1000,
                                                       orientation: orientationValue,
-                                                      name: "Monkey drag" as NSString) { [weak self] in
-                                                        self?.reactivateApplicationIfNeeded()
+                                                      name: "Monkey drag" as NSString) {
                                                         semaphore.signal()
             }
             semaphore.wait()
-        }
+        })
     }
     
     /**
@@ -162,9 +173,7 @@ extension Monkey {
      of all relative probabilities.
      */
     public func addXCTestPinchCloseAction(weight: Double) {
-        addAction(weight: weight) { [weak self] in
-            guard self?.isInForeground == true else { return }
-
+        addAction(weight: weight, action: actInForeground { [weak self] in
             let rect = self!.randomRect(sizeFraction: 2)
             let scale = 1 / CGFloat(self!.r.randomDouble() * 4 + 1)
 
@@ -172,12 +181,11 @@ extension Monkey {
             self!.sharedXCEventGenerator.pinchInRect(rect,
                                                      withScale: scale,
                                                      velocity: 1,
-                                                     orientation: orientationValue) { [weak self] in
-                                                        self?.reactivateApplicationIfNeeded()
+                                                     orientation: orientationValue) {
                                                         semaphore.signal()
             }
             semaphore.wait()
-        }
+        })
     }
 
     /**
@@ -190,9 +198,7 @@ extension Monkey {
      of all relative probabilities.
      */
     public func addXCTestPinchOpenAction(weight: Double) {
-        addAction(weight: weight) { [weak self] in
-            guard self?.isInForeground == true else { return }
-
+        addAction(weight: weight, action: actInForeground { [weak self] in
             let rect = self!.randomRect(sizeFraction: 2)
             let scale = CGFloat(self!.r.randomDouble() * 4 + 1)
 
@@ -200,12 +206,11 @@ extension Monkey {
             self!.sharedXCEventGenerator.pinchInRect(rect,
                                                      withScale: scale,
                                                      velocity: 3,
-                                                     orientation: orientationValue) { [weak self] in
-                                                        self?.reactivateApplicationIfNeeded()
+                                                     orientation: orientationValue) {
                                                         semaphore.signal()
             }
             semaphore.wait()
-        }
+        })
     }
 
     /**
@@ -219,9 +224,7 @@ extension Monkey {
      of all relative probabilities.
      */
     public func addXCTestRotateAction(weight: Double) {
-        addAction(weight: weight) { [weak self] in
-            guard self?.isInForeground == true else { return }
-
+        addAction(weight: weight, action: actInForeground { [weak self] in
             let rect = self!.randomRect(sizeFraction: 2)
             let angle = CGFloat(self!.r.randomDouble() * 2 * 3.141592)
 
@@ -229,12 +232,11 @@ extension Monkey {
             self!.sharedXCEventGenerator.rotateInRect(rect,
                                                       withRotation: angle,
                                                       velocity: 5,
-                                                      orientation: orientationValue) { [weak self] in
-                                                        self?.reactivateApplicationIfNeeded()
+                                                      orientation: orientationValue) {
                                                         semaphore.signal()
             }
             semaphore.wait()
-        }
+        })
     }
 
     /**
@@ -247,9 +249,7 @@ extension Monkey {
      of all relative probabilities.
      */
     public func addXCTestOrientationAction(weight: Double) {
-        addAction(weight: weight) { [weak self] in
-            guard self?.isInForeground == true else { return }
-
+        addAction(weight: weight, action: actInForeground { [weak self] in
             let orientations: [UIDeviceOrientation] = [
                 .portrait,
                 .portraitUpsideDown,
@@ -261,17 +261,7 @@ extension Monkey {
 
             let index = Int(self!.r.randomUInt32() % UInt32(orientations.count))
             orientationValue = orientations[index]
-        }
-    }
-
-    private func reactivateApplicationIfNeeded() {
-        if #available(iOS 9.0, *) {
-            DispatchQueue.main.async {
-                if XCUIApplication().state != .runningForeground{
-                    XCUIApplication().activate()
-                }
-            }
-        }
+        })
     }
 
 }