Skip to content
This repository was archived by the owner on Oct 16, 2025. It is now read-only.

reworked startup, changed order of checks. Updated isStartup function… #11

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

reworked startup, changed order of checks. Updated isStartup function… #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dbe3796
reworked startup, changed order of checks. Updated isStartup function…
cloud9team Mar 9, 2020
277a2dc
Cleaner handling of variable inside of isStartup function. Changed to…
cloud9team Mar 9, 2020
b0b3c74
lint fixes
cloud9team Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 27 additions & 21 deletions RealDeviceMap-UIControl/Misc.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ extension XCTestCase {
}

func checkHasWarning(screenshot: XCUIScreenshot?=nil) -> Bool {
Log.debug("Checking for the warning pop-up")
Log.debug("Checking for the red warning")
let screenshotComp = screenshot ?? getScreenshot()
if screenshotComp.rgbAtLocation(
pos: deviceConfig.compareWarningL,
Expand All @@ -170,6 +170,7 @@ extension XCTestCase {
pos: deviceConfig.compareWarningR,
min: (red: 0.03, green: 0.07, blue: 0.10),
max: (red: 0.07, green: 0.11, blue: 0.14)) {
Log.debug("Look like you have been warned...")
return true
} else {
return false
Expand Down Expand Up @@ -299,8 +300,7 @@ extension XCTestCase {

}

func isStartup(screenshot: XCUIScreenshot?=nil) -> Bool {

func isStartup(click: Bool=false, screenshot: XCUIScreenshot?=nil) -> Bool {
let screenshotComp = screenshot ?? XCUIScreen.main.screenshot()

if screenshotComp.rgbAtLocation(
Expand All @@ -312,8 +312,10 @@ extension XCTestCase {
min: (red: 0.28, green: 0.79, blue: 0.62),
max: (red: 0.33, green: 0.85, blue: 0.68)
) {
Log.startup("Should be clearing Caution Sign new startup prompt")
deviceConfig.startupNewButton.toXCUICoordinate(app: app).tap()
if click {
Log.startup("Clearing Caution Sign prompt")
deviceConfig.startupNewButton.toXCUICoordinate(app: app).tap()
}
return true
} else if screenshotComp.rgbAtLocation(
pos: deviceConfig.startupOldOkButton,
Expand All @@ -324,8 +326,10 @@ extension XCTestCase {
min: (red: 0.15, green: 0.41, blue: 0.45),
max: (red: 0.19, green: 0.46, blue: 0.49)
) {
Log.startup("Should be Clearing the 2 line long, old style startup prompt")
deviceConfig.startupOldOkButton.toXCUICoordinate(app: app).tap()
if click {
Log.startup("Clearing 2 line caution prompt")
deviceConfig.startupOldOkButton.toXCUICoordinate(app: app).tap()
}
return true
} else if screenshotComp.rgbAtLocation(
pos: deviceConfig.startupOldOkButton,
Expand All @@ -336,8 +340,10 @@ extension XCTestCase {
min: (red: 0.99, green: 0.99, blue: 0.99),
max: (red: 1.01, green: 1.01, blue: 1.01)
) {
Log.startup("Should be clearing the 3 line long, old school style prompt")
deviceConfig.startupOldOkButton.toXCUICoordinate(app: app).tap()
if click {
Log.startup("Clearing 3 line prompt")
deviceConfig.startupOldOkButton.toXCUICoordinate(app: app).tap()
}
return true
}

Expand All @@ -346,9 +352,9 @@ extension XCTestCase {
/*
// Planned detection for partially completed reloads, but doesn't seem worth it now :shrug:
func failedTutorialMethod1(screenshot: XCUIScreenshot?=nil) -> Bool {

let screenshotComp = screenshot ?? getScreenshot()

if screenshotComp.rgbAtLocation(
pos: deviceConfig.compareTutorialL,
min: (red: 0.3, green: 0.5, blue: 0.6),
Expand All @@ -361,11 +367,11 @@ extension XCTestCase {
} else {
return false
}

}

func failedTutorialMethod2(screenshot: XCUIScreenshot?=nil) -> Bool{

//let screenshotComp = screenshot ?? getScreenshot()
/*
if screenshotComp.rgbAtLocation(
Expand All @@ -376,13 +382,13 @@ extension XCTestCase {
}
*/
return true

}

func failedTutorialMethod3(screenshot: XCUIScreenshot?=nil) -> Bool{

//let screenshotComp = screenshot ?? getScreenshot()

/*if screenshotComp.rgbAtLocation(
pos: deviceConfig.tutorialProfessorCheck,
min: (red: 0.85, green: 0.9, blue: 0.00),
Expand All @@ -391,11 +397,11 @@ extension XCTestCase {
}*/
return true
}

func failedTutorialMethod4(screenshot: XCUIScreenshot?=nil) -> Bool {

//let screenshotComp = screenshot ?? getScreenshot()

/*if screenshotComp.rgbAtLocation(
pos: deviceConfig.tutorialProfessorCheck,
min: (red: 0.85, green: 0.9, blue: 0.00),
Expand Down
149 changes: 59 additions & 90 deletions RealDeviceMap-UIControl/RealDeviceMap_UIControlUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ class RealDeviceMap_UIControlUITests: XCTestCase {

func part1LoginSetup() {

if shouldExit || !config.enableAccountManager {
if shouldExit { //<-- can still check for tos/startup state if no account manager
return
}

Expand All @@ -341,21 +341,59 @@ class RealDeviceMap_UIControlUITests: XCTestCase {
while !loaded {
let screenshotComp = getScreenshot()
if screenshotComp.rgbAtLocation(
pos: self.deviceConfig.startup,
min: (red: 0.0, green: 0.75, blue: 0.55),
max: (red: 1.0, green: 0.90, blue: 0.70)) {
Log.info("Tried to log in but already logged in.")
needsLogout = true
isLoggedIn = true
newLogIn = false
return
} else if screenshotComp.rgbAtLocation(
pos: self.deviceConfig.ageVerification,
min: (0.15, 0.33, 0.17),
max: (0.25, 0.43, 0.27)) {
Log.debug("App is in age verification.")

print("[STATUS] Age verification")
//Open the year select
deviceConfig.ageVerificationYear.toXCUICoordinate(app: app).tap()
sleep(1 * config.delayMultiplier)
//Slide
deviceConfig.ageVerificationDragStart.toXCUICoordinate(app: app).press(
forDuration: 0.1,
thenDragTo: deviceConfig.ageVerificationDragEnd.toXCUICoordinate(app: app)
)
sleep(1 * config.delayMultiplier)
//Tap to select
deviceConfig.ageVerificationDragStart.toXCUICoordinate(app: app).tap()
sleep(1 * config.delayMultiplier)
//Submit
deviceConfig.ageVerification.toXCUICoordinate(app: app).tap()
sleep(1 * config.delayMultiplier)

sleep(1 * config.delayMultiplier)
deviceConfig.loginNewPlayer.toXCUICoordinate(app: app).tap()
sleep(1 * config.delayMultiplier)
deviceConfig.loginPTC.toXCUICoordinate(app: app).tap()
}

if screenshotComp.rgbAtLocation(
pos: self.deviceConfig.startupLoggedOut,
min: (0.95, 0.75, 0.0),
max: (1.00, 0.85, 0.1)) {
Log.debug("App Started in login screen.")
loaded = true
} else if acceptTOS() {
return
}
sleep(2)
if unableAuth() {
Log.debug("Unable to authenticate.")
deviceConfig.unableAuthButton.toXCUICoordinate(app: app).tap()
sleep(2 * config.delayMultiplier)
shouldExit = true
return
} else if failedLogin() {
Log.error("Account \(username!) failed to log in. Getting a new account")
deviceConfig.loginBannedSwitchAccount.toXCUICoordinate(app: app).tap()
sleep(2 * config.delayMultiplier)
username = nil
shouldExit = true
return
}
sleep(5)
if acceptTOS() {
Log.debug("Accepting Terms")
deviceConfig.loginTerms.toXCUICoordinate(app: app).tap()
sleep(2 * config.delayMultiplier)
Expand All @@ -371,19 +409,6 @@ class RealDeviceMap_UIControlUITests: XCTestCase {
Log.debug("Accepting Privacy Update.")
deviceConfig.loginPrivacyUpdate.toXCUICoordinate(app: app).tap()
sleep(2 * config.delayMultiplier)
} else if unableAuth() {
Log.debug("Unable to authenticate.")
deviceConfig.unableAuthButton.toXCUICoordinate(app: app).tap()
sleep(2 * config.delayMultiplier)
shouldExit = true
return
} else if failedLogin() {
Log.error("Account \(username!) failed to log in. Getting a new account")
deviceConfig.loginBannedSwitchAccount.toXCUICoordinate(app: app).tap()
sleep(2 * config.delayMultiplier)
username = nil
shouldExit = true
return
}
count += 1
if count == 60 && !loaded {
Expand All @@ -394,35 +419,6 @@ class RealDeviceMap_UIControlUITests: XCTestCase {
sleep(1 * config.delayMultiplier)
}

let screenshotComp = getScreenshot()
if screenshotComp.rgbAtLocation(
pos: self.deviceConfig.ageVerification,
min: (0.15, 0.33, 0.17),
max: (0.25, 0.43, 0.27)) {
Log.debug("App is in age verification.")

print("[STATUS] Age verification")
//Open the year select
deviceConfig.ageVerificationYear.toXCUICoordinate(app: app).tap()
sleep(1 * config.delayMultiplier)
//Slide
deviceConfig.ageVerificationDragStart.toXCUICoordinate(app: app).press(
forDuration: 0.1,
thenDragTo: deviceConfig.ageVerificationDragEnd.toXCUICoordinate(app: app)
)
sleep(1 * config.delayMultiplier)
//Tap to select
deviceConfig.ageVerificationDragStart.toXCUICoordinate(app: app).tap()
sleep(1 * config.delayMultiplier)
//Submit
deviceConfig.ageVerification.toXCUICoordinate(app: app).tap()
sleep(1 * config.delayMultiplier)
}

sleep(1 * config.delayMultiplier)
deviceConfig.loginNewPlayer.toXCUICoordinate(app: app).tap()
sleep(1 * config.delayMultiplier)
deviceConfig.loginPTC.toXCUICoordinate(app: app).tap()
}
}

Expand Down Expand Up @@ -495,7 +491,7 @@ class RealDeviceMap_UIControlUITests: XCTestCase {
blocking: true) { (_) in }
app.launch()
sleep(10 * config.delayMultiplier)
} else if acceptTOS() {
} else if acceptTOS() { //<-- terms check if account manager == true
Log.debug("Accepting Terms")
deviceConfig.loginTerms.toXCUICoordinate(app: app).tap()
sleep(2 * config.delayMultiplier)
Expand Down Expand Up @@ -565,7 +561,7 @@ class RealDeviceMap_UIControlUITests: XCTestCase {
blocking: true) { (_) in }
shouldExit = true
return
} else if isStartup() || isTutorial() {
} else if isStartup() || isTutorial() { //<-- dont click, needed to complete startup in part8main
loggedIn = true
isLoggedIn = true
Log.info("Logged in as \(username!)")
Expand Down Expand Up @@ -597,17 +593,14 @@ class RealDeviceMap_UIControlUITests: XCTestCase {
sleep(4 * config.delayMultiplier)

if !isTutorial() {
Log.info("Tutorial already done. Restarting...")
Log.info("Tutorial Completed...")
self.postRequest(
url: self.backendControlerURL,
data: ["uuid": self.config.uuid, "username": self.username as Any,
"type": "tutorial_done"],
blocking: true) { (_) in }
newCreated = true
newLogIn = false
app.launch()
sleep(1 * config.delayMultiplier)

return
}

Expand Down Expand Up @@ -1020,11 +1013,11 @@ class RealDeviceMap_UIControlUITests: XCTestCase {
return
}

isStarted = false
isStarted = false //<-- set to false at start of runloop

// State vars
var startupCount = 0
var isStartupCompleted = false
var isStartupCompleted = false //<-- set to false

var currentQuests = self.config.questFullCount
var currentItems = self.config.itemFullCount
Expand Down Expand Up @@ -1059,17 +1052,14 @@ class RealDeviceMap_UIControlUITests: XCTestCase {
app.coordinate(withNormalizedOffset: CGVector(dx: 0, dy: 0)).tap()
}

if isStarted {
if isStarted { //<-- automatic kick to else at line 1833
if !isStartupCompleted {
Log.debug("Performing Startup sequence")
currentLocation = config.startupLocation
isStartup()
sleep(2 * config.delayMultiplier)

deviceConfig.closeNews.toXCUICoordinate(app: app).tap()
sleep(1 * config.delayMultiplier)
hasWarning = self.checkHasWarning()
if hasWarning {
if hasWarning { //<-- rw happens before news on startup
if self.firstWarningDate == nil && config.enableAccountManager {
firstWarningDate = Date()
postRequest(url: backendControlerURL,
Expand All @@ -1081,28 +1071,7 @@ class RealDeviceMap_UIControlUITests: XCTestCase {
deviceConfig.closeWarning.toXCUICoordinate(app: app).tap()
sleep(1 * config.delayMultiplier)
}

if self.acceptTOS() {
Log.debug("Accepting Terms")
deviceConfig.loginTerms.toXCUICoordinate(app: app).tap()
sleep(2 * config.delayMultiplier)
}
if self.acceptTOSUpdate() {
Log.debug("Accepting Updated Terms.")
deviceConfig.loginTerms2.toXCUICoordinate(app: app).tap()
sleep(2 * config.delayMultiplier)
}
if self.acceptPrivacy() {
Log.debug("Accepting Privacy.")
deviceConfig.loginPrivacy.toXCUICoordinate(app: app).tap()
sleep(2 * config.delayMultiplier)
}
if self.acceptPrivacyUpdate() {
Log.debug("Accepting Privacy Update.")
deviceConfig.loginPrivacyUpdate.toXCUICoordinate(app: app).tap()
sleep(2 * config.delayMultiplier)
}

deviceConfig.closeNews.toXCUICoordinate(app: app).tap() //<-- was closing rw
self.freeScreen()
deviceConfig.closeNews.toXCUICoordinate(app: app).tap()
sleep(1 * config.delayMultiplier)
Expand Down Expand Up @@ -1882,9 +1851,9 @@ class RealDeviceMap_UIControlUITests: XCTestCase {
sleep(2 * config.delayMultiplier)
shouldExit = true
return
} else if isStartup() {
} else if isStartup(click: true) { //<-- caution sign must be present here to complete startup
Log.info("App Started")
isStarted = true
isStarted = true // <-- only place isStarted set to true
sleep(1 * config.delayMultiplier)
} else {
Log.debug("App still in Startup")
Expand Down