Skip to content

Add tests for canvas#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VitPerov88 wants to merge 9 commits into
base:develop
Choose a base branch
from
Open

Add tests for canvas #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b69cbfa
Add tests for canvas
VitPerov88 Jun 12, 2024
1fedf97
Rename to CanvasTests
akaDuality Jun 12, 2024
ab10919
Rewrite testCreateTwoElementContainer()
akaDuality Jun 12, 2024
b54d45c
Add Status Bar Object
VitPerov88 Jun 12, 2024
815a96b
Edit testDragUndoRedo added asserts
VitPerov88 Jun 12, 2024
eed1aa4
Edit testDragUndoRedo added asserts
VitPerov88 Jun 12, 2024
a51282f
All functions in PageObject
VitPerov88 Jun 29, 2024
2af24ac
Refactoring tests
VitPerov88 Jun 29, 2024
2499bcf
Refactoring
VitPerov88 Jun 29, 2024
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
24 changes: 18 additions & 6 deletions VoiceOver Designer.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,14 @@
1ECE12DF2969B91700A3E917 /* WindowRestorationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */; };
1EEE25C32944ADC900B84F01 /* Navigator in Frameworks */ = {isa = PBXBuildFile; productRef = 1EEE25C22944ADC900B84F01 /* Navigator */; };
236A3C182AC756B200156F00 /* Presentation in Frameworks */ = {isa = PBXBuildFile; productRef = 236A3C172AC756B200156F00 /* Presentation */; };
589562AC2C19AA770086BC3F /* CanvasTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 589562AB2C19AA770086BC3F /* CanvasTests.swift */; };
742D242A2ADD939200EC224A /* RecentWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742D24292ADD939200EC224A /* RecentWindowController.swift */; };
742D242C2AE0BF9800EC224A /* ProjectStateController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742D242B2AE0BF9800EC224A /* ProjectStateController.swift */; };
7439CD4429C664A800A557FC /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7439CD4329C664A800A557FC /* StoreKit.framework */; };
74866ADE2AE6DFBA00D42AFA /* PresentationToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74866ADD2AE6DFBA00D42AFA /* PresentationToolbar.swift */; };
74866AE12AE6E1CF00D42AFA /* ToolbarItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74866AE02AE6E1CF00D42AFA /* ToolbarItems.swift */; };
74E0D62F2C19BD9A008E1E77 /* StatusBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */; };
74E0D6312C19C32A008E1E77 /* Navigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E0D6302C19C32A008E1E77 /* Navigator.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand DownExpand Up@@ -116,13 +119,16 @@
1EC992DA28B119730020041B /* ProjectStateController+Toolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProjectStateController+Toolbar.swift"; sourceTree = "<group>"; };
1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowRestorationTests.swift; sourceTree = "<group>"; };
1EF217D4281EBBE00036B09B /* VoiceOver-Designer-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "VoiceOver-Designer-Info.plist"; sourceTree = SOURCE_ROOT; };
589562AB2C19AA770086BC3F /* CanvasTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CanvasTests.swift; sourceTree = "<group>"; };
6B4705F729048D9800AC4C23 /* VoiceOver DesignerRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "VoiceOver DesignerRelease.entitlements"; sourceTree = "<group>"; };
6B628795288D3A8D006F622A /* Features */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Features; path = "VoiceOver Designer/Features"; sourceTree = "<group>"; };
742D24292ADD939200EC224A /* RecentWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentWindowController.swift; sourceTree = "<group>"; };
742D242B2AE0BF9800EC224A /* ProjectStateController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectStateController.swift; sourceTree = "<group>"; };
7439CD4329C664A800A557FC /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
74866ADD2AE6DFBA00D42AFA /* PresentationToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationToolbar.swift; sourceTree = "<group>"; };
74866AE02AE6E1CF00D42AFA /* ToolbarItems.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolbarItems.swift; sourceTree = "<group>"; };
74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBar.swift; sourceTree = "<group>"; };
74E0D6302C19C32A008E1E77 /* Navigator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Navigator.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand DownExpand Up@@ -226,7 +232,9 @@
isa = PBXGroup;
children = (
1E7B569E28B37BE0008D1871 /* Settings.swift */,
74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */,
1E7B56A928B38042008D1871 /* Canvas.swift */,
74E0D6302C19C32A008E1E77 /* Navigator.swift */,
1E7B56A028B37BEF008D1871 /* TextSummary.swift */,
);
path = Panels;
Expand DownExpand Up@@ -301,6 +309,7 @@
1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */,
1E183AE528B50600008B0F07 /* DocumentFromFileTests.swift */,
1E7B56AE28B38F5D008D1871 /* AdjustableTest.swift */,
589562AB2C19AA770086BC3F /* CanvasTests.swift */,
);
path = Tests;
sourceTree = "<group>";
Expand DownExpand Up@@ -474,8 +483,10 @@
buildActionMask = 2147483647;
files = (
1EB554B228B274B6000DC4FB /* Robot.swift in Sources */,
74E0D6312C19C32A008E1E77 /* Navigator.swift in Sources */,
1E7B56A728B37C51008D1871 /* RecentWindow.swift in Sources */,
1E183AE628B50600008B0F07 /* DocumentFromFileTests.swift in Sources */,
74E0D62F2C19BD9A008E1E77 /* StatusBar.swift in Sources */,
1E7B569C28B37B7C008D1871 /* DesignerTests.swift in Sources */,
1ECE12DF2969B91700A3E917 /* WindowRestorationTests.swift in Sources */,
1E7B569F28B37BE0008D1871 /* Settings.swift in Sources */,
Expand All@@ -485,6 +496,7 @@
1E7B56AA28B38042008D1871 /* Canvas.swift in Sources */,
1E7B56A128B37BEF008D1871 /* TextSummary.swift in Sources */,
1E7B56A328B37C07008D1871 /* ProjectPanel.swift in Sources */,
589562AC2C19AA770086BC3F /* CanvasTests.swift in Sources */,
1EA7411928B2683000D6CAA4 /* SettingsTests.swift in Sources */,
1E80528728B4DF6300743023 /* WindowTests.swift in Sources */,
);
Expand DownExpand Up@@ -630,7 +642,7 @@
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 28;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = P67Q4Q7HA9;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand DownExpand Up@@ -661,7 +673,7 @@
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 28;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = P67Q4Q7HA9;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand All@@ -687,7 +699,7 @@
CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = P67Q4Q7HA9;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand All@@ -714,7 +726,7 @@
CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = P67Q4Q7HA9;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand DownExpand Up@@ -804,7 +816,7 @@
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 28;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = P67Q4Q7HA9;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand All@@ -830,7 +842,7 @@
CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = P67Q4Q7HA9;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand Down
3 changes: 2 additions & 1 deletion ...eOver Preview/VoiceOver Preview.xcodeproj/xcshareddata/xcschemes/DesignerUITests.xcscheme
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
language = "en">
<Testables>
<TestableReference
skipped = "NO">
Expand Down
11 changes: 11 additions & 0 deletions VoiceOverDesignerUITests/Base/DesignerTests.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ class DesignerTests: XCTestCase {

var app: XCUIApplication!
override func setUpWithError() throws {
try super.setUpWithError()
continueAfterFailure = false

app = XCUIApplication()
Expand DownExpand Up@@ -60,6 +61,16 @@ class DesignerTests: XCTestCase {
project.settingsPanel
}

var statusBar: StatusBar {
StatusBar(window: project.projectWindow,
app: app)
}

var navigator: Navigator {
Navigator(window: project.projectWindow,
app: app)
}

func closeWindow() {
app.windows.firstMatch.buttons[XCUIIdentifierCloseWindow].click()
}
Expand Down
55 changes: 55 additions & 0 deletions VoiceOverDesignerUITests/PageObjects/Panels/Canvas.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,4 +38,59 @@ class Canvas: ProjectPanel {
tap(location)
return self
}

@discardableResult
func click(dx: Double, dy: Double) -> Self {
let window = app.windows.firstMatch
let assertClick = CGVector(dx: dx, dy: dy)
let tapTest = window.coordinate(withNormalizedOffset: assertClick)
tapTest.press(forDuration: 0.01)

return self
}

@discardableResult
func deselect(dx: Double, dy: Double) -> Self {
click(dx: dx, dy: dy)
XCTAssertTrue(app.staticTexts["Select or draw a control\nto adjust settings"].exists)

return self
}

@discardableResult
func select(dx: Double, dy: Double) -> Self {
click(dx: dx, dy: dy)
XCTAssertFalse(app.staticTexts["Select or draw a control\nto adjust settings"].exists)

return self
}

@discardableResult
func drag(from: Double, to: Double) -> Self {
let from = CGVector(dx: from, dy: from)
let to = CGVector(dx: to, dy: to)

let window = app.windows.firstMatch
let start = window.coordinate(withNormalizedOffset: from)
let finish = window.coordinate(withNormalizedOffset: to)

start.press(forDuration: 0.01, thenDragTo: finish)

return self
}

@discardableResult
func assertNoElements() -> Self {
let assertNoElementsCanvas: () = XCTAssertTrue(app.staticTexts["Add your screenshot"].exists)

return self
}

@discardableResult
func assertHaveElements() -> Self {
let assertHaveElementsCanvas: () = XCTAssertFalse(app.staticTexts["Add your screenshot"].exists)

return self
}

}
37 changes: 37 additions & 0 deletions VoiceOverDesignerUITests/PageObjects/Panels/Navigator.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
import XCTest

class Navigator: ProjectPanel {

var navigator: XCUIElement { window.outlines.firstMatch }

@discardableResult
func groupInContainer() -> Self {
app.buttons["Group in Container"].click()

return self
}

@discardableResult
func assertFirstCell(
text: String,
file: StaticString = #file,
line: UInt = #line
) -> Self {
let actualText = navigator.cells.staticTexts.firstMatch.value as? String

XCTAssertEqual(actualText, text, file: file, line: line)
return self
}

@discardableResult
func assertElementsCount(
count: Int,
file: StaticString = #file,
line: UInt = #line
) -> Self {
let cellsCount = navigator.cells.count

XCTAssertEqual(cellsCount, count, file: file, line: line)
return self
}
}
10 changes: 9 additions & 1 deletion VoiceOverDesignerUITests/PageObjects/Panels/Settings.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -165,6 +165,11 @@ class Settings: ProjectPanel {
func customDescriptionValue() -> String? {
return customDescriptionValueField.value as? String
}

func clickButtonTrait() {
window.checkBoxes["Button"].click()
}

}

extension XCUIElement {
Expand All@@ -178,6 +183,9 @@ extension XCUIElement {
}

func inputEnter() {
typeText("\r")
typeKey(XCUIKeyboardKey.enter, modifierFlags: [])
}
func inputDelete() {
typeKey(XCUIKeyboardKey.delete, modifierFlags: [])
}
}
81 changes: 81 additions & 0 deletions VoiceOverDesignerUITests/PageObjects/Panels/StatusBar.swift
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
//
// StatusBar.swift
// VoiceOverDesignerUITests
//
// Created by Mikhail Rubanov on 12.06.2024.
//

import XCTest

class StatusBar: ProjectPanel {

var statusBar: XCUIElement { app.menuBars.firstMatch }

var fileMenu: XCUIElement {statusBar.menuBarItems["File"].firstMatch}

var editMenu: XCUIElement { statusBar.menuBarItems["Edit"].firstMatch }

var fileNewMenu: XCUIElement {statusBar.menuItems["New"].firstMatch}

var selectAllMenu: XCUIElement { statusBar.menuItems["Select All"].firstMatch }

var undoMenu: XCUIElement {statusBar.menuItems["Undo"].firstMatch}

var redoMenu: XCUIElement {statusBar.menuItems["Redo"].firstMatch}

@discardableResult
func clickFile() -> Self {
fileMenu.click()

return self
}

@discardableResult
func clickFileNew() -> Self {
fileNewMenu.click()

return self
}

@discardableResult
func clickEdit() -> Self {
editMenu.click()

return self
}

@discardableResult
func clickSelectAll() -> Self {
selectAllMenu.click()

return self
}

@discardableResult
func clickUndoMenu() -> Self {
undoMenu.click()

return self
}

@discardableResult
func clickRedoMenu() -> Self {
redoMenu.click()

return self
}

@discardableResult
func openInFullScreen() -> Self {
app.buttons[XCUIIdentifierFullScreenWindow].click()

return self
}

@discardableResult
func closeWindow() -> Self {
app.buttons[XCUIIdentifierCloseWindow].click()

return self
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add tests for canvas by VitPerov88 · Pull Request #342 · AccessibilityTools/VoiceOverDesigner · GitHub
Skip to content
Add tests for canvas#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

VitPerov88
wants to merge
9
commits into

base:develop
Choose a base branch

from

 Open


Add tests for canvas
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b69cbfa

Add tests for canvas


VitPerov88 Jun 12, 2024
1fedf97

Rename to CanvasTests


akaDuality Jun 12, 2024
ab10919

Rewrite testCreateTwoElementContainer()


akaDuality Jun 12, 2024
b54d45c

Add Status Bar Object


VitPerov88 Jun 12, 2024
815a96b

Edit testDragUndoRedo added asserts


VitPerov88 Jun 12, 2024
eed1aa4

Edit testDragUndoRedo added asserts


VitPerov88 Jun 12, 2024
a51282f

All functions in PageObject


VitPerov88 Jun 29, 2024
2af24ac

Refactoring tests


VitPerov88 Jun 29, 2024
2499bcf

Refactoring


VitPerov88 Jun 29, 2024

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


24 changes: 18 additions & 6 deletions
VoiceOver Designer.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,14 @@
 1ECE12DF2969B91700A3E917 /* WindowRestorationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */; };
 1EEE25C32944ADC900B84F01 /* Navigator in Frameworks */ = {isa = PBXBuildFile; productRef = 1EEE25C22944ADC900B84F01 /* Navigator */; };
 236A3C182AC756B200156F00 /* Presentation in Frameworks */ = {isa = PBXBuildFile; productRef = 236A3C172AC756B200156F00 /* Presentation */; };
 589562AC2C19AA770086BC3F /* CanvasTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 589562AB2C19AA770086BC3F /* CanvasTests.swift */; };
 742D242A2ADD939200EC224A /* RecentWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742D24292ADD939200EC224A /* RecentWindowController.swift */; };
 742D242C2AE0BF9800EC224A /* ProjectStateController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742D242B2AE0BF9800EC224A /* ProjectStateController.swift */; };
 7439CD4429C664A800A557FC /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7439CD4329C664A800A557FC /* StoreKit.framework */; };
 74866ADE2AE6DFBA00D42AFA /* PresentationToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74866ADD2AE6DFBA00D42AFA /* PresentationToolbar.swift */; };
 74866AE12AE6E1CF00D42AFA /* ToolbarItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74866AE02AE6E1CF00D42AFA /* ToolbarItems.swift */; };
 74E0D62F2C19BD9A008E1E77 /* StatusBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */; };
 74E0D6312C19C32A008E1E77 /* Navigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E0D6302C19C32A008E1E77 /* Navigator.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand DownExpand Up@@ -116,13 +119,16 @@
 1EC992DA28B119730020041B /* ProjectStateController+Toolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProjectStateController+Toolbar.swift"; sourceTree = "<group>"; };
 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowRestorationTests.swift; sourceTree = "<group>"; };
 1EF217D4281EBBE00036B09B /* VoiceOver-Designer-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "VoiceOver-Designer-Info.plist"; sourceTree = SOURCE_ROOT; };
 589562AB2C19AA770086BC3F /* CanvasTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CanvasTests.swift; sourceTree = "<group>"; };
 6B4705F729048D9800AC4C23 /* VoiceOver DesignerRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "VoiceOver DesignerRelease.entitlements"; sourceTree = "<group>"; };
 6B628795288D3A8D006F622A /* Features */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Features; path = "VoiceOver Designer/Features"; sourceTree = "<group>"; };
 742D24292ADD939200EC224A /* RecentWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentWindowController.swift; sourceTree = "<group>"; };
 742D242B2AE0BF9800EC224A /* ProjectStateController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectStateController.swift; sourceTree = "<group>"; };
 7439CD4329C664A800A557FC /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
 74866ADD2AE6DFBA00D42AFA /* PresentationToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationToolbar.swift; sourceTree = "<group>"; };
 74866AE02AE6E1CF00D42AFA /* ToolbarItems.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolbarItems.swift; sourceTree = "<group>"; };
 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBar.swift; sourceTree = "<group>"; };
 74E0D6302C19C32A008E1E77 /* Navigator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Navigator.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand DownExpand Up@@ -226,7 +232,9 @@
 isa = PBXGroup;
 children = (
 1E7B569E28B37BE0008D1871 /* Settings.swift */,
 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */,
 1E7B56A928B38042008D1871 /* Canvas.swift */,
 74E0D6302C19C32A008E1E77 /* Navigator.swift */,
 1E7B56A028B37BEF008D1871 /* TextSummary.swift */,
 );
 path = Panels;
Expand DownExpand Up@@ -301,6 +309,7 @@
 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */,
 1E183AE528B50600008B0F07 /* DocumentFromFileTests.swift */,
 1E7B56AE28B38F5D008D1871 /* AdjustableTest.swift */,
 589562AB2C19AA770086BC3F /* CanvasTests.swift */,
 );
 path = Tests;
 sourceTree = "<group>";
Expand DownExpand Up@@ -474,8 +483,10 @@
 buildActionMask = 2147483647;
 files = (
 1EB554B228B274B6000DC4FB /* Robot.swift in Sources */,
 74E0D6312C19C32A008E1E77 /* Navigator.swift in Sources */,
 1E7B56A728B37C51008D1871 /* RecentWindow.swift in Sources */,
 1E183AE628B50600008B0F07 /* DocumentFromFileTests.swift in Sources */,
 74E0D62F2C19BD9A008E1E77 /* StatusBar.swift in Sources */,
 1E7B569C28B37B7C008D1871 /* DesignerTests.swift in Sources */,
 1ECE12DF2969B91700A3E917 /* WindowRestorationTests.swift in Sources */,
 1E7B569F28B37BE0008D1871 /* Settings.swift in Sources */,
Expand All@@ -485,6 +496,7 @@
 1E7B56AA28B38042008D1871 /* Canvas.swift in Sources */,
 1E7B56A128B37BEF008D1871 /* TextSummary.swift in Sources */,
 1E7B56A328B37C07008D1871 /* ProjectPanel.swift in Sources */,
 589562AC2C19AA770086BC3F /* CanvasTests.swift in Sources */,
 1EA7411928B2683000D6CAA4 /* SettingsTests.swift in Sources */,
 1E80528728B4DF6300743023 /* WindowTests.swift in Sources */,
 );
Expand DownExpand Up@@ -630,7 +642,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand DownExpand Up@@ -661,7 +673,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand All@@ -687,7 +699,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand All@@ -714,7 +726,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand DownExpand Up@@ -804,7 +816,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand All@@ -830,7 +842,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand Down

3 changes: 2 additions & 1 deletion
...eOver Preview/VoiceOver Preview.xcodeproj/xcshareddata/xcschemes/DesignerUITests.xcscheme

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@
 buildConfiguration = "Debug"
 selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
 shouldUseLaunchSchemeArgsEnv = "YES">
 shouldUseLaunchSchemeArgsEnv = "YES"
 language = "en">
 <Testables>
 <TestableReference
 skipped = "NO">
Expand Down

11 changes: 11 additions & 0 deletions
VoiceOverDesignerUITests/Base/DesignerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ class DesignerTests: XCTestCase {

 var app: XCUIApplication!
 override func setUpWithError() throws {
 try super.setUpWithError()
 continueAfterFailure = false

 app = XCUIApplication()
Expand DownExpand Up@@ -60,6 +61,16 @@ class DesignerTests: XCTestCase {
 project.settingsPanel
 }

 var statusBar: StatusBar {
 StatusBar(window: project.projectWindow,
 app: app)
 }

 var navigator: Navigator {
 Navigator(window: project.projectWindow,
 app: app)
 }

 func closeWindow() {
 app.windows.firstMatch.buttons[XCUIIdentifierCloseWindow].click()
 }
Expand Down

55 changes: 55 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/Canvas.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,4 +38,59 @@ class Canvas: ProjectPanel {
 tap(location)
 return self
 }

 @discardableResult
 func click(dx: Double, dy: Double) -> Self {
 let window = app.windows.firstMatch
 let assertClick = CGVector(dx: dx, dy: dy)
 let tapTest = window.coordinate(withNormalizedOffset: assertClick)
 tapTest.press(forDuration: 0.01)

 return self
 }

 @discardableResult
 func deselect(dx: Double, dy: Double) -> Self {
 click(dx: dx, dy: dy)
 XCTAssertTrue(app.staticTexts["Select or draw a control\nto adjust settings"].exists)

 return self
 }

 @discardableResult
 func select(dx: Double, dy: Double) -> Self {
 click(dx: dx, dy: dy)
 XCTAssertFalse(app.staticTexts["Select or draw a control\nto adjust settings"].exists)

 return self
 }

 @discardableResult
 func drag(from: Double, to: Double) -> Self {
 let from = CGVector(dx: from, dy: from)
 let to = CGVector(dx: to, dy: to)

 let window = app.windows.firstMatch
 let start = window.coordinate(withNormalizedOffset: from)
 let finish = window.coordinate(withNormalizedOffset: to)

 start.press(forDuration: 0.01, thenDragTo: finish)

 return self
 }

 @discardableResult
 func assertNoElements() -> Self {
 let assertNoElementsCanvas: () = XCTAssertTrue(app.staticTexts["Add your screenshot"].exists)

 return self
 }

 @discardableResult
 func assertHaveElements() -> Self {
 let assertHaveElementsCanvas: () = XCTAssertFalse(app.staticTexts["Add your screenshot"].exists)

 return self
 }

}

37 changes: 37 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/Navigator.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
import XCTest

class Navigator: ProjectPanel {

 var navigator: XCUIElement { window.outlines.firstMatch }

 @discardableResult
 func groupInContainer() -> Self {
 app.buttons["Group in Container"].click()

 return self
 }

 @discardableResult
 func assertFirstCell(
 text: String,
 file: StaticString = #file,
 line: UInt = #line
 ) -> Self {
 let actualText = navigator.cells.staticTexts.firstMatch.value as? String

 XCTAssertEqual(actualText, text, file: file, line: line)
 return self
 }

 @discardableResult
 func assertElementsCount(
 count: Int,
 file: StaticString = #file,
 line: UInt = #line
 ) -> Self {
 let cellsCount = navigator.cells.count

 XCTAssertEqual(cellsCount, count, file: file, line: line)
 return self
 }
}

10 changes: 9 additions & 1 deletion
VoiceOverDesignerUITests/PageObjects/Panels/Settings.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,6 +165,11 @@ class Settings: ProjectPanel {
 func customDescriptionValue() -> String? {
 return customDescriptionValueField.value as? String
 }

 func clickButtonTrait() {
 window.checkBoxes["Button"].click()
 }

}

extension XCUIElement {
Expand All@@ -178,6 +183,9 @@ extension XCUIElement {
 }

 func inputEnter() {
 typeText("\r")
 typeKey(XCUIKeyboardKey.enter, modifierFlags: [])
 }
 func inputDelete() {
 typeKey(XCUIKeyboardKey.delete, modifierFlags: [])
 }
}

81 changes: 81 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/StatusBar.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
//
// StatusBar.swift
// VoiceOverDesignerUITests
//
// Created by Mikhail Rubanov on 12.06.2024.
//

import XCTest

class StatusBar: ProjectPanel {

 var statusBar: XCUIElement { app.menuBars.firstMatch }

 var fileMenu: XCUIElement {statusBar.menuBarItems["File"].firstMatch}

 var editMenu: XCUIElement { statusBar.menuBarItems["Edit"].firstMatch }

 var fileNewMenu: XCUIElement {statusBar.menuItems["New"].firstMatch}

 var selectAllMenu: XCUIElement { statusBar.menuItems["Select All"].firstMatch }

 var undoMenu: XCUIElement {statusBar.menuItems["Undo"].firstMatch}

 var redoMenu: XCUIElement {statusBar.menuItems["Redo"].firstMatch}

 @discardableResult
 func clickFile() -> Self {
 fileMenu.click()

 return self
 }

 @discardableResult
 func clickFileNew() -> Self {
 fileNewMenu.click()

 return self
 }

 @discardableResult
 func clickEdit() -> Self {
 editMenu.click()

 return self
 }

 @discardableResult
 func clickSelectAll() -> Self {
 selectAllMenu.click()

 return self
 }

 @discardableResult
 func clickUndoMenu() -> Self {
 undoMenu.click()

 return self
 }

 @discardableResult
 func clickRedoMenu() -> Self {
 redoMenu.click()

 return self
 }

 @discardableResult
 func openInFullScreen() -> Self {
 app.buttons[XCUIIdentifierFullScreenWindow].click()

 return self
 }

 @discardableResult
 func closeWindow() -> Self {
 app.buttons[XCUIIdentifierCloseWindow].click()

 return self
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add tests for canvas by VitPerov88 · Pull Request #342 · AccessibilityTools/VoiceOverDesigner · GitHub
Skip to content
Add tests for canvas#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

VitPerov88
wants to merge
9
commits into

base:develop
Choose a base branch

from

 Open


Add tests for canvas
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b69cbfa

Add tests for canvas


VitPerov88 Jun 12, 2024
1fedf97

Rename to CanvasTests


akaDuality Jun 12, 2024
ab10919

Rewrite testCreateTwoElementContainer()


akaDuality Jun 12, 2024
b54d45c

Add Status Bar Object


VitPerov88 Jun 12, 2024
815a96b

Edit testDragUndoRedo added asserts


VitPerov88 Jun 12, 2024
eed1aa4

Edit testDragUndoRedo added asserts


VitPerov88 Jun 12, 2024
a51282f

All functions in PageObject


VitPerov88 Jun 29, 2024
2af24ac

Refactoring tests


VitPerov88 Jun 29, 2024
2499bcf

Refactoring


VitPerov88 Jun 29, 2024

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


24 changes: 18 additions & 6 deletions
VoiceOver Designer.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,14 @@
 1ECE12DF2969B91700A3E917 /* WindowRestorationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */; };
 1EEE25C32944ADC900B84F01 /* Navigator in Frameworks */ = {isa = PBXBuildFile; productRef = 1EEE25C22944ADC900B84F01 /* Navigator */; };
 236A3C182AC756B200156F00 /* Presentation in Frameworks */ = {isa = PBXBuildFile; productRef = 236A3C172AC756B200156F00 /* Presentation */; };
 589562AC2C19AA770086BC3F /* CanvasTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 589562AB2C19AA770086BC3F /* CanvasTests.swift */; };
 742D242A2ADD939200EC224A /* RecentWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742D24292ADD939200EC224A /* RecentWindowController.swift */; };
 742D242C2AE0BF9800EC224A /* ProjectStateController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742D242B2AE0BF9800EC224A /* ProjectStateController.swift */; };
 7439CD4429C664A800A557FC /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7439CD4329C664A800A557FC /* StoreKit.framework */; };
 74866ADE2AE6DFBA00D42AFA /* PresentationToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74866ADD2AE6DFBA00D42AFA /* PresentationToolbar.swift */; };
 74866AE12AE6E1CF00D42AFA /* ToolbarItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74866AE02AE6E1CF00D42AFA /* ToolbarItems.swift */; };
 74E0D62F2C19BD9A008E1E77 /* StatusBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */; };
 74E0D6312C19C32A008E1E77 /* Navigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E0D6302C19C32A008E1E77 /* Navigator.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand DownExpand Up@@ -116,13 +119,16 @@
 1EC992DA28B119730020041B /* ProjectStateController+Toolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProjectStateController+Toolbar.swift"; sourceTree = "<group>"; };
 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowRestorationTests.swift; sourceTree = "<group>"; };
 1EF217D4281EBBE00036B09B /* VoiceOver-Designer-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "VoiceOver-Designer-Info.plist"; sourceTree = SOURCE_ROOT; };
 589562AB2C19AA770086BC3F /* CanvasTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CanvasTests.swift; sourceTree = "<group>"; };
 6B4705F729048D9800AC4C23 /* VoiceOver DesignerRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "VoiceOver DesignerRelease.entitlements"; sourceTree = "<group>"; };
 6B628795288D3A8D006F622A /* Features */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Features; path = "VoiceOver Designer/Features"; sourceTree = "<group>"; };
 742D24292ADD939200EC224A /* RecentWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentWindowController.swift; sourceTree = "<group>"; };
 742D242B2AE0BF9800EC224A /* ProjectStateController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectStateController.swift; sourceTree = "<group>"; };
 7439CD4329C664A800A557FC /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
 74866ADD2AE6DFBA00D42AFA /* PresentationToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationToolbar.swift; sourceTree = "<group>"; };
 74866AE02AE6E1CF00D42AFA /* ToolbarItems.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolbarItems.swift; sourceTree = "<group>"; };
 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBar.swift; sourceTree = "<group>"; };
 74E0D6302C19C32A008E1E77 /* Navigator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Navigator.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand DownExpand Up@@ -226,7 +232,9 @@
 isa = PBXGroup;
 children = (
 1E7B569E28B37BE0008D1871 /* Settings.swift */,
 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */,
 1E7B56A928B38042008D1871 /* Canvas.swift */,
 74E0D6302C19C32A008E1E77 /* Navigator.swift */,
 1E7B56A028B37BEF008D1871 /* TextSummary.swift */,
 );
 path = Panels;
Expand DownExpand Up@@ -301,6 +309,7 @@
 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */,
 1E183AE528B50600008B0F07 /* DocumentFromFileTests.swift */,
 1E7B56AE28B38F5D008D1871 /* AdjustableTest.swift */,
 589562AB2C19AA770086BC3F /* CanvasTests.swift */,
 );
 path = Tests;
 sourceTree = "<group>";
Expand DownExpand Up@@ -474,8 +483,10 @@
 buildActionMask = 2147483647;
 files = (
 1EB554B228B274B6000DC4FB /* Robot.swift in Sources */,
 74E0D6312C19C32A008E1E77 /* Navigator.swift in Sources */,
 1E7B56A728B37C51008D1871 /* RecentWindow.swift in Sources */,
 1E183AE628B50600008B0F07 /* DocumentFromFileTests.swift in Sources */,
 74E0D62F2C19BD9A008E1E77 /* StatusBar.swift in Sources */,
 1E7B569C28B37B7C008D1871 /* DesignerTests.swift in Sources */,
 1ECE12DF2969B91700A3E917 /* WindowRestorationTests.swift in Sources */,
 1E7B569F28B37BE0008D1871 /* Settings.swift in Sources */,
Expand All@@ -485,6 +496,7 @@
 1E7B56AA28B38042008D1871 /* Canvas.swift in Sources */,
 1E7B56A128B37BEF008D1871 /* TextSummary.swift in Sources */,
 1E7B56A328B37C07008D1871 /* ProjectPanel.swift in Sources */,
 589562AC2C19AA770086BC3F /* CanvasTests.swift in Sources */,
 1EA7411928B2683000D6CAA4 /* SettingsTests.swift in Sources */,
 1E80528728B4DF6300743023 /* WindowTests.swift in Sources */,
 );
Expand DownExpand Up@@ -630,7 +642,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand DownExpand Up@@ -661,7 +673,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand All@@ -687,7 +699,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand All@@ -714,7 +726,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand DownExpand Up@@ -804,7 +816,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand All@@ -830,7 +842,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand Down

3 changes: 2 additions & 1 deletion
...eOver Preview/VoiceOver Preview.xcodeproj/xcshareddata/xcschemes/DesignerUITests.xcscheme

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@
 buildConfiguration = "Debug"
 selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
 shouldUseLaunchSchemeArgsEnv = "YES">
 shouldUseLaunchSchemeArgsEnv = "YES"
 language = "en">
 <Testables>
 <TestableReference
 skipped = "NO">
Expand Down

11 changes: 11 additions & 0 deletions
VoiceOverDesignerUITests/Base/DesignerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ class DesignerTests: XCTestCase {

 var app: XCUIApplication!
 override func setUpWithError() throws {
 try super.setUpWithError()
 continueAfterFailure = false

 app = XCUIApplication()
Expand DownExpand Up@@ -60,6 +61,16 @@ class DesignerTests: XCTestCase {
 project.settingsPanel
 }

 var statusBar: StatusBar {
 StatusBar(window: project.projectWindow,
 app: app)
 }

 var navigator: Navigator {
 Navigator(window: project.projectWindow,
 app: app)
 }

 func closeWindow() {
 app.windows.firstMatch.buttons[XCUIIdentifierCloseWindow].click()
 }
Expand Down

55 changes: 55 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/Canvas.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,4 +38,59 @@ class Canvas: ProjectPanel {
 tap(location)
 return self
 }

 @discardableResult
 func click(dx: Double, dy: Double) -> Self {
 let window = app.windows.firstMatch
 let assertClick = CGVector(dx: dx, dy: dy)
 let tapTest = window.coordinate(withNormalizedOffset: assertClick)
 tapTest.press(forDuration: 0.01)

 return self
 }

 @discardableResult
 func deselect(dx: Double, dy: Double) -> Self {
 click(dx: dx, dy: dy)
 XCTAssertTrue(app.staticTexts["Select or draw a control\nto adjust settings"].exists)

 return self
 }

 @discardableResult
 func select(dx: Double, dy: Double) -> Self {
 click(dx: dx, dy: dy)
 XCTAssertFalse(app.staticTexts["Select or draw a control\nto adjust settings"].exists)

 return self
 }

 @discardableResult
 func drag(from: Double, to: Double) -> Self {
 let from = CGVector(dx: from, dy: from)
 let to = CGVector(dx: to, dy: to)

 let window = app.windows.firstMatch
 let start = window.coordinate(withNormalizedOffset: from)
 let finish = window.coordinate(withNormalizedOffset: to)

 start.press(forDuration: 0.01, thenDragTo: finish)

 return self
 }

 @discardableResult
 func assertNoElements() -> Self {
 let assertNoElementsCanvas: () = XCTAssertTrue(app.staticTexts["Add your screenshot"].exists)

 return self
 }

 @discardableResult
 func assertHaveElements() -> Self {
 let assertHaveElementsCanvas: () = XCTAssertFalse(app.staticTexts["Add your screenshot"].exists)

 return self
 }

}

37 changes: 37 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/Navigator.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
import XCTest

class Navigator: ProjectPanel {

 var navigator: XCUIElement { window.outlines.firstMatch }

 @discardableResult
 func groupInContainer() -> Self {
 app.buttons["Group in Container"].click()

 return self
 }

 @discardableResult
 func assertFirstCell(
 text: String,
 file: StaticString = #file,
 line: UInt = #line
 ) -> Self {
 let actualText = navigator.cells.staticTexts.firstMatch.value as? String

 XCTAssertEqual(actualText, text, file: file, line: line)
 return self
 }

 @discardableResult
 func assertElementsCount(
 count: Int,
 file: StaticString = #file,
 line: UInt = #line
 ) -> Self {
 let cellsCount = navigator.cells.count

 XCTAssertEqual(cellsCount, count, file: file, line: line)
 return self
 }
}

10 changes: 9 additions & 1 deletion
VoiceOverDesignerUITests/PageObjects/Panels/Settings.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,6 +165,11 @@ class Settings: ProjectPanel {
 func customDescriptionValue() -> String? {
 return customDescriptionValueField.value as? String
 }

 func clickButtonTrait() {
 window.checkBoxes["Button"].click()
 }

}

extension XCUIElement {
Expand All@@ -178,6 +183,9 @@ extension XCUIElement {
 }

 func inputEnter() {
 typeText("\r")
 typeKey(XCUIKeyboardKey.enter, modifierFlags: [])
 }
 func inputDelete() {
 typeKey(XCUIKeyboardKey.delete, modifierFlags: [])
 }
}

81 changes: 81 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/StatusBar.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
//
// StatusBar.swift
// VoiceOverDesignerUITests
//
// Created by Mikhail Rubanov on 12.06.2024.
//

import XCTest

class StatusBar: ProjectPanel {

 var statusBar: XCUIElement { app.menuBars.firstMatch }

 var fileMenu: XCUIElement {statusBar.menuBarItems["File"].firstMatch}

 var editMenu: XCUIElement { statusBar.menuBarItems["Edit"].firstMatch }

 var fileNewMenu: XCUIElement {statusBar.menuItems["New"].firstMatch}

 var selectAllMenu: XCUIElement { statusBar.menuItems["Select All"].firstMatch }

 var undoMenu: XCUIElement {statusBar.menuItems["Undo"].firstMatch}

 var redoMenu: XCUIElement {statusBar.menuItems["Redo"].firstMatch}

 @discardableResult
 func clickFile() -> Self {
 fileMenu.click()

 return self
 }

 @discardableResult
 func clickFileNew() -> Self {
 fileNewMenu.click()

 return self
 }

 @discardableResult
 func clickEdit() -> Self {
 editMenu.click()

 return self
 }

 @discardableResult
 func clickSelectAll() -> Self {
 selectAllMenu.click()

 return self
 }

 @discardableResult
 func clickUndoMenu() -> Self {
 undoMenu.click()

 return self
 }

 @discardableResult
 func clickRedoMenu() -> Self {
 redoMenu.click()

 return self
 }

 @discardableResult
 func openInFullScreen() -> Self {
 app.buttons[XCUIIdentifierFullScreenWindow].click()

 return self
 }

 @discardableResult
 func closeWindow() -> Self {
 app.buttons[XCUIIdentifierCloseWindow].click()

 return self
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add tests for canvas by VitPerov88 · Pull Request #342 · AccessibilityTools/VoiceOverDesigner · GitHub
Skip to content
Add tests for canvas#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

VitPerov88
wants to merge
9
commits into

base:develop
Choose a base branch

from

 Open


Add tests for canvas
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b69cbfa

Add tests for canvas


VitPerov88 Jun 12, 2024
1fedf97

Rename to CanvasTests


akaDuality Jun 12, 2024
ab10919

Rewrite testCreateTwoElementContainer()


akaDuality Jun 12, 2024
b54d45c

Add Status Bar Object


VitPerov88 Jun 12, 2024
815a96b

Edit testDragUndoRedo added asserts


VitPerov88 Jun 12, 2024
eed1aa4

Edit testDragUndoRedo added asserts


VitPerov88 Jun 12, 2024
a51282f

All functions in PageObject


VitPerov88 Jun 29, 2024
2af24ac

Refactoring tests


VitPerov88 Jun 29, 2024
2499bcf

Refactoring


VitPerov88 Jun 29, 2024

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


24 changes: 18 additions & 6 deletions
VoiceOver Designer.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,14 @@
 1ECE12DF2969B91700A3E917 /* WindowRestorationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */; };
 1EEE25C32944ADC900B84F01 /* Navigator in Frameworks */ = {isa = PBXBuildFile; productRef = 1EEE25C22944ADC900B84F01 /* Navigator */; };
 236A3C182AC756B200156F00 /* Presentation in Frameworks */ = {isa = PBXBuildFile; productRef = 236A3C172AC756B200156F00 /* Presentation */; };
 589562AC2C19AA770086BC3F /* CanvasTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 589562AB2C19AA770086BC3F /* CanvasTests.swift */; };
 742D242A2ADD939200EC224A /* RecentWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742D24292ADD939200EC224A /* RecentWindowController.swift */; };
 742D242C2AE0BF9800EC224A /* ProjectStateController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742D242B2AE0BF9800EC224A /* ProjectStateController.swift */; };
 7439CD4429C664A800A557FC /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7439CD4329C664A800A557FC /* StoreKit.framework */; };
 74866ADE2AE6DFBA00D42AFA /* PresentationToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74866ADD2AE6DFBA00D42AFA /* PresentationToolbar.swift */; };
 74866AE12AE6E1CF00D42AFA /* ToolbarItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74866AE02AE6E1CF00D42AFA /* ToolbarItems.swift */; };
 74E0D62F2C19BD9A008E1E77 /* StatusBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */; };
 74E0D6312C19C32A008E1E77 /* Navigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E0D6302C19C32A008E1E77 /* Navigator.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand DownExpand Up@@ -116,13 +119,16 @@
 1EC992DA28B119730020041B /* ProjectStateController+Toolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProjectStateController+Toolbar.swift"; sourceTree = "<group>"; };
 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowRestorationTests.swift; sourceTree = "<group>"; };
 1EF217D4281EBBE00036B09B /* VoiceOver-Designer-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "VoiceOver-Designer-Info.plist"; sourceTree = SOURCE_ROOT; };
 589562AB2C19AA770086BC3F /* CanvasTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CanvasTests.swift; sourceTree = "<group>"; };
 6B4705F729048D9800AC4C23 /* VoiceOver DesignerRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "VoiceOver DesignerRelease.entitlements"; sourceTree = "<group>"; };
 6B628795288D3A8D006F622A /* Features */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Features; path = "VoiceOver Designer/Features"; sourceTree = "<group>"; };
 742D24292ADD939200EC224A /* RecentWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentWindowController.swift; sourceTree = "<group>"; };
 742D242B2AE0BF9800EC224A /* ProjectStateController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectStateController.swift; sourceTree = "<group>"; };
 7439CD4329C664A800A557FC /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
 74866ADD2AE6DFBA00D42AFA /* PresentationToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationToolbar.swift; sourceTree = "<group>"; };
 74866AE02AE6E1CF00D42AFA /* ToolbarItems.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolbarItems.swift; sourceTree = "<group>"; };
 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBar.swift; sourceTree = "<group>"; };
 74E0D6302C19C32A008E1E77 /* Navigator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Navigator.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand DownExpand Up@@ -226,7 +232,9 @@
 isa = PBXGroup;
 children = (
 1E7B569E28B37BE0008D1871 /* Settings.swift */,
 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */,
 1E7B56A928B38042008D1871 /* Canvas.swift */,
 74E0D6302C19C32A008E1E77 /* Navigator.swift */,
 1E7B56A028B37BEF008D1871 /* TextSummary.swift */,
 );
 path = Panels;
Expand DownExpand Up@@ -301,6 +309,7 @@
 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */,
 1E183AE528B50600008B0F07 /* DocumentFromFileTests.swift */,
 1E7B56AE28B38F5D008D1871 /* AdjustableTest.swift */,
 589562AB2C19AA770086BC3F /* CanvasTests.swift */,
 );
 path = Tests;
 sourceTree = "<group>";
Expand DownExpand Up@@ -474,8 +483,10 @@
 buildActionMask = 2147483647;
 files = (
 1EB554B228B274B6000DC4FB /* Robot.swift in Sources */,
 74E0D6312C19C32A008E1E77 /* Navigator.swift in Sources */,
 1E7B56A728B37C51008D1871 /* RecentWindow.swift in Sources */,
 1E183AE628B50600008B0F07 /* DocumentFromFileTests.swift in Sources */,
 74E0D62F2C19BD9A008E1E77 /* StatusBar.swift in Sources */,
 1E7B569C28B37B7C008D1871 /* DesignerTests.swift in Sources */,
 1ECE12DF2969B91700A3E917 /* WindowRestorationTests.swift in Sources */,
 1E7B569F28B37BE0008D1871 /* Settings.swift in Sources */,
Expand All@@ -485,6 +496,7 @@
 1E7B56AA28B38042008D1871 /* Canvas.swift in Sources */,
 1E7B56A128B37BEF008D1871 /* TextSummary.swift in Sources */,
 1E7B56A328B37C07008D1871 /* ProjectPanel.swift in Sources */,
 589562AC2C19AA770086BC3F /* CanvasTests.swift in Sources */,
 1EA7411928B2683000D6CAA4 /* SettingsTests.swift in Sources */,
 1E80528728B4DF6300743023 /* WindowTests.swift in Sources */,
 );
Expand DownExpand Up@@ -630,7 +642,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand DownExpand Up@@ -661,7 +673,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand All@@ -687,7 +699,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand All@@ -714,7 +726,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand DownExpand Up@@ -804,7 +816,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand All@@ -830,7 +842,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand Down

3 changes: 2 additions & 1 deletion
...eOver Preview/VoiceOver Preview.xcodeproj/xcshareddata/xcschemes/DesignerUITests.xcscheme

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@
 buildConfiguration = "Debug"
 selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
 shouldUseLaunchSchemeArgsEnv = "YES">
 shouldUseLaunchSchemeArgsEnv = "YES"
 language = "en">
 <Testables>
 <TestableReference
 skipped = "NO">
Expand Down

11 changes: 11 additions & 0 deletions
VoiceOverDesignerUITests/Base/DesignerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ class DesignerTests: XCTestCase {

 var app: XCUIApplication!
 override func setUpWithError() throws {
 try super.setUpWithError()
 continueAfterFailure = false

 app = XCUIApplication()
Expand DownExpand Up@@ -60,6 +61,16 @@ class DesignerTests: XCTestCase {
 project.settingsPanel
 }

 var statusBar: StatusBar {
 StatusBar(window: project.projectWindow,
 app: app)
 }

 var navigator: Navigator {
 Navigator(window: project.projectWindow,
 app: app)
 }

 func closeWindow() {
 app.windows.firstMatch.buttons[XCUIIdentifierCloseWindow].click()
 }
Expand Down

55 changes: 55 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/Canvas.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,4 +38,59 @@ class Canvas: ProjectPanel {
 tap(location)
 return self
 }

 @discardableResult
 func click(dx: Double, dy: Double) -> Self {
 let window = app.windows.firstMatch
 let assertClick = CGVector(dx: dx, dy: dy)
 let tapTest = window.coordinate(withNormalizedOffset: assertClick)
 tapTest.press(forDuration: 0.01)

 return self
 }

 @discardableResult
 func deselect(dx: Double, dy: Double) -> Self {
 click(dx: dx, dy: dy)
 XCTAssertTrue(app.staticTexts["Select or draw a control\nto adjust settings"].exists)

 return self
 }

 @discardableResult
 func select(dx: Double, dy: Double) -> Self {
 click(dx: dx, dy: dy)
 XCTAssertFalse(app.staticTexts["Select or draw a control\nto adjust settings"].exists)

 return self
 }

 @discardableResult
 func drag(from: Double, to: Double) -> Self {
 let from = CGVector(dx: from, dy: from)
 let to = CGVector(dx: to, dy: to)

 let window = app.windows.firstMatch
 let start = window.coordinate(withNormalizedOffset: from)
 let finish = window.coordinate(withNormalizedOffset: to)

 start.press(forDuration: 0.01, thenDragTo: finish)

 return self
 }

 @discardableResult
 func assertNoElements() -> Self {
 let assertNoElementsCanvas: () = XCTAssertTrue(app.staticTexts["Add your screenshot"].exists)

 return self
 }

 @discardableResult
 func assertHaveElements() -> Self {
 let assertHaveElementsCanvas: () = XCTAssertFalse(app.staticTexts["Add your screenshot"].exists)

 return self
 }

}

37 changes: 37 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/Navigator.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
import XCTest

class Navigator: ProjectPanel {

 var navigator: XCUIElement { window.outlines.firstMatch }

 @discardableResult
 func groupInContainer() -> Self {
 app.buttons["Group in Container"].click()

 return self
 }

 @discardableResult
 func assertFirstCell(
 text: String,
 file: StaticString = #file,
 line: UInt = #line
 ) -> Self {
 let actualText = navigator.cells.staticTexts.firstMatch.value as? String

 XCTAssertEqual(actualText, text, file: file, line: line)
 return self
 }

 @discardableResult
 func assertElementsCount(
 count: Int,
 file: StaticString = #file,
 line: UInt = #line
 ) -> Self {
 let cellsCount = navigator.cells.count

 XCTAssertEqual(cellsCount, count, file: file, line: line)
 return self
 }
}

10 changes: 9 additions & 1 deletion
VoiceOverDesignerUITests/PageObjects/Panels/Settings.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,6 +165,11 @@ class Settings: ProjectPanel {
 func customDescriptionValue() -> String? {
 return customDescriptionValueField.value as? String
 }

 func clickButtonTrait() {
 window.checkBoxes["Button"].click()
 }

}

extension XCUIElement {
Expand All@@ -178,6 +183,9 @@ extension XCUIElement {
 }

 func inputEnter() {
 typeText("\r")
 typeKey(XCUIKeyboardKey.enter, modifierFlags: [])
 }
 func inputDelete() {
 typeKey(XCUIKeyboardKey.delete, modifierFlags: [])
 }
}

81 changes: 81 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/StatusBar.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
//
// StatusBar.swift
// VoiceOverDesignerUITests
//
// Created by Mikhail Rubanov on 12.06.2024.
//

import XCTest

class StatusBar: ProjectPanel {

 var statusBar: XCUIElement { app.menuBars.firstMatch }

 var fileMenu: XCUIElement {statusBar.menuBarItems["File"].firstMatch}

 var editMenu: XCUIElement { statusBar.menuBarItems["Edit"].firstMatch }

 var fileNewMenu: XCUIElement {statusBar.menuItems["New"].firstMatch}

 var selectAllMenu: XCUIElement { statusBar.menuItems["Select All"].firstMatch }

 var undoMenu: XCUIElement {statusBar.menuItems["Undo"].firstMatch}

 var redoMenu: XCUIElement {statusBar.menuItems["Redo"].firstMatch}

 @discardableResult
 func clickFile() -> Self {
 fileMenu.click()

 return self
 }

 @discardableResult
 func clickFileNew() -> Self {
 fileNewMenu.click()

 return self
 }

 @discardableResult
 func clickEdit() -> Self {
 editMenu.click()

 return self
 }

 @discardableResult
 func clickSelectAll() -> Self {
 selectAllMenu.click()

 return self
 }

 @discardableResult
 func clickUndoMenu() -> Self {
 undoMenu.click()

 return self
 }

 @discardableResult
 func clickRedoMenu() -> Self {
 redoMenu.click()

 return self
 }

 @discardableResult
 func openInFullScreen() -> Self {
 app.buttons[XCUIIdentifierFullScreenWindow].click()

 return self
 }

 @discardableResult
 func closeWindow() -> Self {
 app.buttons[XCUIIdentifierCloseWindow].click()

 return self
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Add tests for canvas by VitPerov88 · Pull Request #342 · AccessibilityTools/VoiceOverDesigner · GitHub
Skip to content
Add tests for canvas#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

VitPerov88
wants to merge
9
commits into

base:develop
Choose a base branch

from

 Open


Add tests for canvas
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b69cbfa

Add tests for canvas


VitPerov88 Jun 12, 2024
1fedf97

Rename to CanvasTests


akaDuality Jun 12, 2024
ab10919

Rewrite testCreateTwoElementContainer()


akaDuality Jun 12, 2024
b54d45c

Add Status Bar Object


VitPerov88 Jun 12, 2024
815a96b

Edit testDragUndoRedo added asserts


VitPerov88 Jun 12, 2024
eed1aa4

Edit testDragUndoRedo added asserts


VitPerov88 Jun 12, 2024
a51282f

All functions in PageObject


VitPerov88 Jun 29, 2024
2af24ac

Refactoring tests


VitPerov88 Jun 29, 2024
2499bcf

Refactoring


VitPerov88 Jun 29, 2024

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


24 changes: 18 additions & 6 deletions
VoiceOver Designer.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,14 @@
 1ECE12DF2969B91700A3E917 /* WindowRestorationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */; };
 1EEE25C32944ADC900B84F01 /* Navigator in Frameworks */ = {isa = PBXBuildFile; productRef = 1EEE25C22944ADC900B84F01 /* Navigator */; };
 236A3C182AC756B200156F00 /* Presentation in Frameworks */ = {isa = PBXBuildFile; productRef = 236A3C172AC756B200156F00 /* Presentation */; };
 589562AC2C19AA770086BC3F /* CanvasTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 589562AB2C19AA770086BC3F /* CanvasTests.swift */; };
 742D242A2ADD939200EC224A /* RecentWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742D24292ADD939200EC224A /* RecentWindowController.swift */; };
 742D242C2AE0BF9800EC224A /* ProjectStateController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742D242B2AE0BF9800EC224A /* ProjectStateController.swift */; };
 7439CD4429C664A800A557FC /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7439CD4329C664A800A557FC /* StoreKit.framework */; };
 74866ADE2AE6DFBA00D42AFA /* PresentationToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74866ADD2AE6DFBA00D42AFA /* PresentationToolbar.swift */; };
 74866AE12AE6E1CF00D42AFA /* ToolbarItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74866AE02AE6E1CF00D42AFA /* ToolbarItems.swift */; };
 74E0D62F2C19BD9A008E1E77 /* StatusBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */; };
 74E0D6312C19C32A008E1E77 /* Navigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E0D6302C19C32A008E1E77 /* Navigator.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand DownExpand Up@@ -116,13 +119,16 @@
 1EC992DA28B119730020041B /* ProjectStateController+Toolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProjectStateController+Toolbar.swift"; sourceTree = "<group>"; };
 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowRestorationTests.swift; sourceTree = "<group>"; };
 1EF217D4281EBBE00036B09B /* VoiceOver-Designer-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "VoiceOver-Designer-Info.plist"; sourceTree = SOURCE_ROOT; };
 589562AB2C19AA770086BC3F /* CanvasTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CanvasTests.swift; sourceTree = "<group>"; };
 6B4705F729048D9800AC4C23 /* VoiceOver DesignerRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "VoiceOver DesignerRelease.entitlements"; sourceTree = "<group>"; };
 6B628795288D3A8D006F622A /* Features */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Features; path = "VoiceOver Designer/Features"; sourceTree = "<group>"; };
 742D24292ADD939200EC224A /* RecentWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentWindowController.swift; sourceTree = "<group>"; };
 742D242B2AE0BF9800EC224A /* ProjectStateController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectStateController.swift; sourceTree = "<group>"; };
 7439CD4329C664A800A557FC /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
 74866ADD2AE6DFBA00D42AFA /* PresentationToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationToolbar.swift; sourceTree = "<group>"; };
 74866AE02AE6E1CF00D42AFA /* ToolbarItems.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolbarItems.swift; sourceTree = "<group>"; };
 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBar.swift; sourceTree = "<group>"; };
 74E0D6302C19C32A008E1E77 /* Navigator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Navigator.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand DownExpand Up@@ -226,7 +232,9 @@
 isa = PBXGroup;
 children = (
 1E7B569E28B37BE0008D1871 /* Settings.swift */,
 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */,
 1E7B56A928B38042008D1871 /* Canvas.swift */,
 74E0D6302C19C32A008E1E77 /* Navigator.swift */,
 1E7B56A028B37BEF008D1871 /* TextSummary.swift */,
 );
 path = Panels;
Expand DownExpand Up@@ -301,6 +309,7 @@
 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */,
 1E183AE528B50600008B0F07 /* DocumentFromFileTests.swift */,
 1E7B56AE28B38F5D008D1871 /* AdjustableTest.swift */,
 589562AB2C19AA770086BC3F /* CanvasTests.swift */,
 );
 path = Tests;
 sourceTree = "<group>";
Expand DownExpand Up@@ -474,8 +483,10 @@
 buildActionMask = 2147483647;
 files = (
 1EB554B228B274B6000DC4FB /* Robot.swift in Sources */,
 74E0D6312C19C32A008E1E77 /* Navigator.swift in Sources */,
 1E7B56A728B37C51008D1871 /* RecentWindow.swift in Sources */,
 1E183AE628B50600008B0F07 /* DocumentFromFileTests.swift in Sources */,
 74E0D62F2C19BD9A008E1E77 /* StatusBar.swift in Sources */,
 1E7B569C28B37B7C008D1871 /* DesignerTests.swift in Sources */,
 1ECE12DF2969B91700A3E917 /* WindowRestorationTests.swift in Sources */,
 1E7B569F28B37BE0008D1871 /* Settings.swift in Sources */,
Expand All@@ -485,6 +496,7 @@
 1E7B56AA28B38042008D1871 /* Canvas.swift in Sources */,
 1E7B56A128B37BEF008D1871 /* TextSummary.swift in Sources */,
 1E7B56A328B37C07008D1871 /* ProjectPanel.swift in Sources */,
 589562AC2C19AA770086BC3F /* CanvasTests.swift in Sources */,
 1EA7411928B2683000D6CAA4 /* SettingsTests.swift in Sources */,
 1E80528728B4DF6300743023 /* WindowTests.swift in Sources */,
 );
Expand DownExpand Up@@ -630,7 +642,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand DownExpand Up@@ -661,7 +673,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand All@@ -687,7 +699,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand All@@ -714,7 +726,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand DownExpand Up@@ -804,7 +816,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand All@@ -830,7 +842,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand Down

3 changes: 2 additions & 1 deletion
...eOver Preview/VoiceOver Preview.xcodeproj/xcshareddata/xcschemes/DesignerUITests.xcscheme

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@
 buildConfiguration = "Debug"
 selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
 shouldUseLaunchSchemeArgsEnv = "YES">
 shouldUseLaunchSchemeArgsEnv = "YES"
 language = "en">
 <Testables>
 <TestableReference
 skipped = "NO">
Expand Down

11 changes: 11 additions & 0 deletions
VoiceOverDesignerUITests/Base/DesignerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ class DesignerTests: XCTestCase {

 var app: XCUIApplication!
 override func setUpWithError() throws {
 try super.setUpWithError()
 continueAfterFailure = false

 app = XCUIApplication()
Expand DownExpand Up@@ -60,6 +61,16 @@ class DesignerTests: XCTestCase {
 project.settingsPanel
 }

 var statusBar: StatusBar {
 StatusBar(window: project.projectWindow,
 app: app)
 }

 var navigator: Navigator {
 Navigator(window: project.projectWindow,
 app: app)
 }

 func closeWindow() {
 app.windows.firstMatch.buttons[XCUIIdentifierCloseWindow].click()
 }
Expand Down

55 changes: 55 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/Canvas.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,4 +38,59 @@ class Canvas: ProjectPanel {
 tap(location)
 return self
 }

 @discardableResult
 func click(dx: Double, dy: Double) -> Self {
 let window = app.windows.firstMatch
 let assertClick = CGVector(dx: dx, dy: dy)
 let tapTest = window.coordinate(withNormalizedOffset: assertClick)
 tapTest.press(forDuration: 0.01)

 return self
 }

 @discardableResult
 func deselect(dx: Double, dy: Double) -> Self {
 click(dx: dx, dy: dy)
 XCTAssertTrue(app.staticTexts["Select or draw a control\nto adjust settings"].exists)

 return self
 }

 @discardableResult
 func select(dx: Double, dy: Double) -> Self {
 click(dx: dx, dy: dy)
 XCTAssertFalse(app.staticTexts["Select or draw a control\nto adjust settings"].exists)

 return self
 }

 @discardableResult
 func drag(from: Double, to: Double) -> Self {
 let from = CGVector(dx: from, dy: from)
 let to = CGVector(dx: to, dy: to)

 let window = app.windows.firstMatch
 let start = window.coordinate(withNormalizedOffset: from)
 let finish = window.coordinate(withNormalizedOffset: to)

 start.press(forDuration: 0.01, thenDragTo: finish)

 return self
 }

 @discardableResult
 func assertNoElements() -> Self {
 let assertNoElementsCanvas: () = XCTAssertTrue(app.staticTexts["Add your screenshot"].exists)

 return self
 }

 @discardableResult
 func assertHaveElements() -> Self {
 let assertHaveElementsCanvas: () = XCTAssertFalse(app.staticTexts["Add your screenshot"].exists)

 return self
 }

}

37 changes: 37 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/Navigator.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
import XCTest

class Navigator: ProjectPanel {

 var navigator: XCUIElement { window.outlines.firstMatch }

 @discardableResult
 func groupInContainer() -> Self {
 app.buttons["Group in Container"].click()

 return self
 }

 @discardableResult
 func assertFirstCell(
 text: String,
 file: StaticString = #file,
 line: UInt = #line
 ) -> Self {
 let actualText = navigator.cells.staticTexts.firstMatch.value as? String

 XCTAssertEqual(actualText, text, file: file, line: line)
 return self
 }

 @discardableResult
 func assertElementsCount(
 count: Int,
 file: StaticString = #file,
 line: UInt = #line
 ) -> Self {
 let cellsCount = navigator.cells.count

 XCTAssertEqual(cellsCount, count, file: file, line: line)
 return self
 }
}

10 changes: 9 additions & 1 deletion
VoiceOverDesignerUITests/PageObjects/Panels/Settings.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,6 +165,11 @@ class Settings: ProjectPanel {
 func customDescriptionValue() -> String? {
 return customDescriptionValueField.value as? String
 }

 func clickButtonTrait() {
 window.checkBoxes["Button"].click()
 }

}

extension XCUIElement {
Expand All@@ -178,6 +183,9 @@ extension XCUIElement {
 }

 func inputEnter() {
 typeText("\r")
 typeKey(XCUIKeyboardKey.enter, modifierFlags: [])
 }
 func inputDelete() {
 typeKey(XCUIKeyboardKey.delete, modifierFlags: [])
 }
}

81 changes: 81 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/StatusBar.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
//
// StatusBar.swift
// VoiceOverDesignerUITests
//
// Created by Mikhail Rubanov on 12.06.2024.
//

import XCTest

class StatusBar: ProjectPanel {

 var statusBar: XCUIElement { app.menuBars.firstMatch }

 var fileMenu: XCUIElement {statusBar.menuBarItems["File"].firstMatch}

 var editMenu: XCUIElement { statusBar.menuBarItems["Edit"].firstMatch }

 var fileNewMenu: XCUIElement {statusBar.menuItems["New"].firstMatch}

 var selectAllMenu: XCUIElement { statusBar.menuItems["Select All"].firstMatch }

 var undoMenu: XCUIElement {statusBar.menuItems["Undo"].firstMatch}

 var redoMenu: XCUIElement {statusBar.menuItems["Redo"].firstMatch}

 @discardableResult
 func clickFile() -> Self {
 fileMenu.click()

 return self
 }

 @discardableResult
 func clickFileNew() -> Self {
 fileNewMenu.click()

 return self
 }

 @discardableResult
 func clickEdit() -> Self {
 editMenu.click()

 return self
 }

 @discardableResult
 func clickSelectAll() -> Self {
 selectAllMenu.click()

 return self
 }

 @discardableResult
 func clickUndoMenu() -> Self {
 undoMenu.click()

 return self
 }

 @discardableResult
 func clickRedoMenu() -> Self {
 redoMenu.click()

 return self
 }

 @discardableResult
 func openInFullScreen() -> Self {
 app.buttons[XCUIIdentifierFullScreenWindow].click()

 return self
 }

 @discardableResult
 func closeWindow() -> Self {
 app.buttons[XCUIIdentifierCloseWindow].click()

 return self
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add tests for canvas by VitPerov88 · Pull Request #342 · AccessibilityTools/VoiceOverDesigner · GitHub
Skip to content
Add tests for canvas#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

VitPerov88
wants to merge
9
commits into

base:develop
Choose a base branch

from

 Open


Add tests for canvas
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b69cbfa

Add tests for canvas


VitPerov88 Jun 12, 2024
1fedf97

Rename to CanvasTests


akaDuality Jun 12, 2024
ab10919

Rewrite testCreateTwoElementContainer()


akaDuality Jun 12, 2024
b54d45c

Add Status Bar Object


VitPerov88 Jun 12, 2024
815a96b

Edit testDragUndoRedo added asserts


VitPerov88 Jun 12, 2024
eed1aa4

Edit testDragUndoRedo added asserts


VitPerov88 Jun 12, 2024
a51282f

All functions in PageObject


VitPerov88 Jun 29, 2024
2af24ac

Refactoring tests


VitPerov88 Jun 29, 2024
2499bcf

Refactoring


VitPerov88 Jun 29, 2024

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


24 changes: 18 additions & 6 deletions
VoiceOver Designer.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,14 @@
 1ECE12DF2969B91700A3E917 /* WindowRestorationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */; };
 1EEE25C32944ADC900B84F01 /* Navigator in Frameworks */ = {isa = PBXBuildFile; productRef = 1EEE25C22944ADC900B84F01 /* Navigator */; };
 236A3C182AC756B200156F00 /* Presentation in Frameworks */ = {isa = PBXBuildFile; productRef = 236A3C172AC756B200156F00 /* Presentation */; };
 589562AC2C19AA770086BC3F /* CanvasTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 589562AB2C19AA770086BC3F /* CanvasTests.swift */; };
 742D242A2ADD939200EC224A /* RecentWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742D24292ADD939200EC224A /* RecentWindowController.swift */; };
 742D242C2AE0BF9800EC224A /* ProjectStateController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742D242B2AE0BF9800EC224A /* ProjectStateController.swift */; };
 7439CD4429C664A800A557FC /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7439CD4329C664A800A557FC /* StoreKit.framework */; };
 74866ADE2AE6DFBA00D42AFA /* PresentationToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74866ADD2AE6DFBA00D42AFA /* PresentationToolbar.swift */; };
 74866AE12AE6E1CF00D42AFA /* ToolbarItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74866AE02AE6E1CF00D42AFA /* ToolbarItems.swift */; };
 74E0D62F2C19BD9A008E1E77 /* StatusBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */; };
 74E0D6312C19C32A008E1E77 /* Navigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E0D6302C19C32A008E1E77 /* Navigator.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand DownExpand Up@@ -116,13 +119,16 @@
 1EC992DA28B119730020041B /* ProjectStateController+Toolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProjectStateController+Toolbar.swift"; sourceTree = "<group>"; };
 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowRestorationTests.swift; sourceTree = "<group>"; };
 1EF217D4281EBBE00036B09B /* VoiceOver-Designer-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "VoiceOver-Designer-Info.plist"; sourceTree = SOURCE_ROOT; };
 589562AB2C19AA770086BC3F /* CanvasTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CanvasTests.swift; sourceTree = "<group>"; };
 6B4705F729048D9800AC4C23 /* VoiceOver DesignerRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "VoiceOver DesignerRelease.entitlements"; sourceTree = "<group>"; };
 6B628795288D3A8D006F622A /* Features */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Features; path = "VoiceOver Designer/Features"; sourceTree = "<group>"; };
 742D24292ADD939200EC224A /* RecentWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentWindowController.swift; sourceTree = "<group>"; };
 742D242B2AE0BF9800EC224A /* ProjectStateController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectStateController.swift; sourceTree = "<group>"; };
 7439CD4329C664A800A557FC /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
 74866ADD2AE6DFBA00D42AFA /* PresentationToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationToolbar.swift; sourceTree = "<group>"; };
 74866AE02AE6E1CF00D42AFA /* ToolbarItems.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolbarItems.swift; sourceTree = "<group>"; };
 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBar.swift; sourceTree = "<group>"; };
 74E0D6302C19C32A008E1E77 /* Navigator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Navigator.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand DownExpand Up@@ -226,7 +232,9 @@
 isa = PBXGroup;
 children = (
 1E7B569E28B37BE0008D1871 /* Settings.swift */,
 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */,
 1E7B56A928B38042008D1871 /* Canvas.swift */,
 74E0D6302C19C32A008E1E77 /* Navigator.swift */,
 1E7B56A028B37BEF008D1871 /* TextSummary.swift */,
 );
 path = Panels;
Expand DownExpand Up@@ -301,6 +309,7 @@
 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */,
 1E183AE528B50600008B0F07 /* DocumentFromFileTests.swift */,
 1E7B56AE28B38F5D008D1871 /* AdjustableTest.swift */,
 589562AB2C19AA770086BC3F /* CanvasTests.swift */,
 );
 path = Tests;
 sourceTree = "<group>";
Expand DownExpand Up@@ -474,8 +483,10 @@
 buildActionMask = 2147483647;
 files = (
 1EB554B228B274B6000DC4FB /* Robot.swift in Sources */,
 74E0D6312C19C32A008E1E77 /* Navigator.swift in Sources */,
 1E7B56A728B37C51008D1871 /* RecentWindow.swift in Sources */,
 1E183AE628B50600008B0F07 /* DocumentFromFileTests.swift in Sources */,
 74E0D62F2C19BD9A008E1E77 /* StatusBar.swift in Sources */,
 1E7B569C28B37B7C008D1871 /* DesignerTests.swift in Sources */,
 1ECE12DF2969B91700A3E917 /* WindowRestorationTests.swift in Sources */,
 1E7B569F28B37BE0008D1871 /* Settings.swift in Sources */,
Expand All@@ -485,6 +496,7 @@
 1E7B56AA28B38042008D1871 /* Canvas.swift in Sources */,
 1E7B56A128B37BEF008D1871 /* TextSummary.swift in Sources */,
 1E7B56A328B37C07008D1871 /* ProjectPanel.swift in Sources */,
 589562AC2C19AA770086BC3F /* CanvasTests.swift in Sources */,
 1EA7411928B2683000D6CAA4 /* SettingsTests.swift in Sources */,
 1E80528728B4DF6300743023 /* WindowTests.swift in Sources */,
 );
Expand DownExpand Up@@ -630,7 +642,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand DownExpand Up@@ -661,7 +673,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand All@@ -687,7 +699,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand All@@ -714,7 +726,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand DownExpand Up@@ -804,7 +816,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand All@@ -830,7 +842,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand Down

3 changes: 2 additions & 1 deletion
...eOver Preview/VoiceOver Preview.xcodeproj/xcshareddata/xcschemes/DesignerUITests.xcscheme

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@
 buildConfiguration = "Debug"
 selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
 shouldUseLaunchSchemeArgsEnv = "YES">
 shouldUseLaunchSchemeArgsEnv = "YES"
 language = "en">
 <Testables>
 <TestableReference
 skipped = "NO">
Expand Down

11 changes: 11 additions & 0 deletions
VoiceOverDesignerUITests/Base/DesignerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ class DesignerTests: XCTestCase {

 var app: XCUIApplication!
 override func setUpWithError() throws {
 try super.setUpWithError()
 continueAfterFailure = false

 app = XCUIApplication()
Expand DownExpand Up@@ -60,6 +61,16 @@ class DesignerTests: XCTestCase {
 project.settingsPanel
 }

 var statusBar: StatusBar {
 StatusBar(window: project.projectWindow,
 app: app)
 }

 var navigator: Navigator {
 Navigator(window: project.projectWindow,
 app: app)
 }

 func closeWindow() {
 app.windows.firstMatch.buttons[XCUIIdentifierCloseWindow].click()
 }
Expand Down

55 changes: 55 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/Canvas.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,4 +38,59 @@ class Canvas: ProjectPanel {
 tap(location)
 return self
 }

 @discardableResult
 func click(dx: Double, dy: Double) -> Self {
 let window = app.windows.firstMatch
 let assertClick = CGVector(dx: dx, dy: dy)
 let tapTest = window.coordinate(withNormalizedOffset: assertClick)
 tapTest.press(forDuration: 0.01)

 return self
 }

 @discardableResult
 func deselect(dx: Double, dy: Double) -> Self {
 click(dx: dx, dy: dy)
 XCTAssertTrue(app.staticTexts["Select or draw a control\nto adjust settings"].exists)

 return self
 }

 @discardableResult
 func select(dx: Double, dy: Double) -> Self {
 click(dx: dx, dy: dy)
 XCTAssertFalse(app.staticTexts["Select or draw a control\nto adjust settings"].exists)

 return self
 }

 @discardableResult
 func drag(from: Double, to: Double) -> Self {
 let from = CGVector(dx: from, dy: from)
 let to = CGVector(dx: to, dy: to)

 let window = app.windows.firstMatch
 let start = window.coordinate(withNormalizedOffset: from)
 let finish = window.coordinate(withNormalizedOffset: to)

 start.press(forDuration: 0.01, thenDragTo: finish)

 return self
 }

 @discardableResult
 func assertNoElements() -> Self {
 let assertNoElementsCanvas: () = XCTAssertTrue(app.staticTexts["Add your screenshot"].exists)

 return self
 }

 @discardableResult
 func assertHaveElements() -> Self {
 let assertHaveElementsCanvas: () = XCTAssertFalse(app.staticTexts["Add your screenshot"].exists)

 return self
 }

}

37 changes: 37 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/Navigator.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
import XCTest

class Navigator: ProjectPanel {

 var navigator: XCUIElement { window.outlines.firstMatch }

 @discardableResult
 func groupInContainer() -> Self {
 app.buttons["Group in Container"].click()

 return self
 }

 @discardableResult
 func assertFirstCell(
 text: String,
 file: StaticString = #file,
 line: UInt = #line
 ) -> Self {
 let actualText = navigator.cells.staticTexts.firstMatch.value as? String

 XCTAssertEqual(actualText, text, file: file, line: line)
 return self
 }

 @discardableResult
 func assertElementsCount(
 count: Int,
 file: StaticString = #file,
 line: UInt = #line
 ) -> Self {
 let cellsCount = navigator.cells.count

 XCTAssertEqual(cellsCount, count, file: file, line: line)
 return self
 }
}

10 changes: 9 additions & 1 deletion
VoiceOverDesignerUITests/PageObjects/Panels/Settings.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,6 +165,11 @@ class Settings: ProjectPanel {
 func customDescriptionValue() -> String? {
 return customDescriptionValueField.value as? String
 }

 func clickButtonTrait() {
 window.checkBoxes["Button"].click()
 }

}

extension XCUIElement {
Expand All@@ -178,6 +183,9 @@ extension XCUIElement {
 }

 func inputEnter() {
 typeText("\r")
 typeKey(XCUIKeyboardKey.enter, modifierFlags: [])
 }
 func inputDelete() {
 typeKey(XCUIKeyboardKey.delete, modifierFlags: [])
 }
}

81 changes: 81 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/StatusBar.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
//
// StatusBar.swift
// VoiceOverDesignerUITests
//
// Created by Mikhail Rubanov on 12.06.2024.
//

import XCTest

class StatusBar: ProjectPanel {

 var statusBar: XCUIElement { app.menuBars.firstMatch }

 var fileMenu: XCUIElement {statusBar.menuBarItems["File"].firstMatch}

 var editMenu: XCUIElement { statusBar.menuBarItems["Edit"].firstMatch }

 var fileNewMenu: XCUIElement {statusBar.menuItems["New"].firstMatch}

 var selectAllMenu: XCUIElement { statusBar.menuItems["Select All"].firstMatch }

 var undoMenu: XCUIElement {statusBar.menuItems["Undo"].firstMatch}

 var redoMenu: XCUIElement {statusBar.menuItems["Redo"].firstMatch}

 @discardableResult
 func clickFile() -> Self {
 fileMenu.click()

 return self
 }

 @discardableResult
 func clickFileNew() -> Self {
 fileNewMenu.click()

 return self
 }

 @discardableResult
 func clickEdit() -> Self {
 editMenu.click()

 return self
 }

 @discardableResult
 func clickSelectAll() -> Self {
 selectAllMenu.click()

 return self
 }

 @discardableResult
 func clickUndoMenu() -> Self {
 undoMenu.click()

 return self
 }

 @discardableResult
 func clickRedoMenu() -> Self {
 redoMenu.click()

 return self
 }

 @discardableResult
 func openInFullScreen() -> Self {
 app.buttons[XCUIIdentifierFullScreenWindow].click()

 return self
 }

 @discardableResult
 func closeWindow() -> Self {
 app.buttons[XCUIIdentifierCloseWindow].click()

 return self
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add tests for canvas by VitPerov88 · Pull Request #342 · AccessibilityTools/VoiceOverDesigner · GitHub
Skip to content
Add tests for canvas#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

VitPerov88
wants to merge
9
commits into

base:develop
Choose a base branch

from

 Open


Add tests for canvas
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b69cbfa

Add tests for canvas


VitPerov88 Jun 12, 2024
1fedf97

Rename to CanvasTests


akaDuality Jun 12, 2024
ab10919

Rewrite testCreateTwoElementContainer()


akaDuality Jun 12, 2024
b54d45c

Add Status Bar Object


VitPerov88 Jun 12, 2024
815a96b

Edit testDragUndoRedo added asserts


VitPerov88 Jun 12, 2024
eed1aa4

Edit testDragUndoRedo added asserts


VitPerov88 Jun 12, 2024
a51282f

All functions in PageObject


VitPerov88 Jun 29, 2024
2af24ac

Refactoring tests


VitPerov88 Jun 29, 2024
2499bcf

Refactoring


VitPerov88 Jun 29, 2024

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


24 changes: 18 additions & 6 deletions
VoiceOver Designer.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,14 @@
 1ECE12DF2969B91700A3E917 /* WindowRestorationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */; };
 1EEE25C32944ADC900B84F01 /* Navigator in Frameworks */ = {isa = PBXBuildFile; productRef = 1EEE25C22944ADC900B84F01 /* Navigator */; };
 236A3C182AC756B200156F00 /* Presentation in Frameworks */ = {isa = PBXBuildFile; productRef = 236A3C172AC756B200156F00 /* Presentation */; };
 589562AC2C19AA770086BC3F /* CanvasTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 589562AB2C19AA770086BC3F /* CanvasTests.swift */; };
 742D242A2ADD939200EC224A /* RecentWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742D24292ADD939200EC224A /* RecentWindowController.swift */; };
 742D242C2AE0BF9800EC224A /* ProjectStateController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742D242B2AE0BF9800EC224A /* ProjectStateController.swift */; };
 7439CD4429C664A800A557FC /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7439CD4329C664A800A557FC /* StoreKit.framework */; };
 74866ADE2AE6DFBA00D42AFA /* PresentationToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74866ADD2AE6DFBA00D42AFA /* PresentationToolbar.swift */; };
 74866AE12AE6E1CF00D42AFA /* ToolbarItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74866AE02AE6E1CF00D42AFA /* ToolbarItems.swift */; };
 74E0D62F2C19BD9A008E1E77 /* StatusBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */; };
 74E0D6312C19C32A008E1E77 /* Navigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E0D6302C19C32A008E1E77 /* Navigator.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand DownExpand Up@@ -116,13 +119,16 @@
 1EC992DA28B119730020041B /* ProjectStateController+Toolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProjectStateController+Toolbar.swift"; sourceTree = "<group>"; };
 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowRestorationTests.swift; sourceTree = "<group>"; };
 1EF217D4281EBBE00036B09B /* VoiceOver-Designer-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "VoiceOver-Designer-Info.plist"; sourceTree = SOURCE_ROOT; };
 589562AB2C19AA770086BC3F /* CanvasTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CanvasTests.swift; sourceTree = "<group>"; };
 6B4705F729048D9800AC4C23 /* VoiceOver DesignerRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "VoiceOver DesignerRelease.entitlements"; sourceTree = "<group>"; };
 6B628795288D3A8D006F622A /* Features */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Features; path = "VoiceOver Designer/Features"; sourceTree = "<group>"; };
 742D24292ADD939200EC224A /* RecentWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentWindowController.swift; sourceTree = "<group>"; };
 742D242B2AE0BF9800EC224A /* ProjectStateController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectStateController.swift; sourceTree = "<group>"; };
 7439CD4329C664A800A557FC /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
 74866ADD2AE6DFBA00D42AFA /* PresentationToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationToolbar.swift; sourceTree = "<group>"; };
 74866AE02AE6E1CF00D42AFA /* ToolbarItems.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolbarItems.swift; sourceTree = "<group>"; };
 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBar.swift; sourceTree = "<group>"; };
 74E0D6302C19C32A008E1E77 /* Navigator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Navigator.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand DownExpand Up@@ -226,7 +232,9 @@
 isa = PBXGroup;
 children = (
 1E7B569E28B37BE0008D1871 /* Settings.swift */,
 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */,
 1E7B56A928B38042008D1871 /* Canvas.swift */,
 74E0D6302C19C32A008E1E77 /* Navigator.swift */,
 1E7B56A028B37BEF008D1871 /* TextSummary.swift */,
 );
 path = Panels;
Expand DownExpand Up@@ -301,6 +309,7 @@
 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */,
 1E183AE528B50600008B0F07 /* DocumentFromFileTests.swift */,
 1E7B56AE28B38F5D008D1871 /* AdjustableTest.swift */,
 589562AB2C19AA770086BC3F /* CanvasTests.swift */,
 );
 path = Tests;
 sourceTree = "<group>";
Expand DownExpand Up@@ -474,8 +483,10 @@
 buildActionMask = 2147483647;
 files = (
 1EB554B228B274B6000DC4FB /* Robot.swift in Sources */,
 74E0D6312C19C32A008E1E77 /* Navigator.swift in Sources */,
 1E7B56A728B37C51008D1871 /* RecentWindow.swift in Sources */,
 1E183AE628B50600008B0F07 /* DocumentFromFileTests.swift in Sources */,
 74E0D62F2C19BD9A008E1E77 /* StatusBar.swift in Sources */,
 1E7B569C28B37B7C008D1871 /* DesignerTests.swift in Sources */,
 1ECE12DF2969B91700A3E917 /* WindowRestorationTests.swift in Sources */,
 1E7B569F28B37BE0008D1871 /* Settings.swift in Sources */,
Expand All@@ -485,6 +496,7 @@
 1E7B56AA28B38042008D1871 /* Canvas.swift in Sources */,
 1E7B56A128B37BEF008D1871 /* TextSummary.swift in Sources */,
 1E7B56A328B37C07008D1871 /* ProjectPanel.swift in Sources */,
 589562AC2C19AA770086BC3F /* CanvasTests.swift in Sources */,
 1EA7411928B2683000D6CAA4 /* SettingsTests.swift in Sources */,
 1E80528728B4DF6300743023 /* WindowTests.swift in Sources */,
 );
Expand DownExpand Up@@ -630,7 +642,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand DownExpand Up@@ -661,7 +673,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand All@@ -687,7 +699,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand All@@ -714,7 +726,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand DownExpand Up@@ -804,7 +816,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand All@@ -830,7 +842,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand Down

3 changes: 2 additions & 1 deletion
...eOver Preview/VoiceOver Preview.xcodeproj/xcshareddata/xcschemes/DesignerUITests.xcscheme

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@
 buildConfiguration = "Debug"
 selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
 shouldUseLaunchSchemeArgsEnv = "YES">
 shouldUseLaunchSchemeArgsEnv = "YES"
 language = "en">
 <Testables>
 <TestableReference
 skipped = "NO">
Expand Down

11 changes: 11 additions & 0 deletions
VoiceOverDesignerUITests/Base/DesignerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ class DesignerTests: XCTestCase {

 var app: XCUIApplication!
 override func setUpWithError() throws {
 try super.setUpWithError()
 continueAfterFailure = false

 app = XCUIApplication()
Expand DownExpand Up@@ -60,6 +61,16 @@ class DesignerTests: XCTestCase {
 project.settingsPanel
 }

 var statusBar: StatusBar {
 StatusBar(window: project.projectWindow,
 app: app)
 }

 var navigator: Navigator {
 Navigator(window: project.projectWindow,
 app: app)
 }

 func closeWindow() {
 app.windows.firstMatch.buttons[XCUIIdentifierCloseWindow].click()
 }
Expand Down

55 changes: 55 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/Canvas.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,4 +38,59 @@ class Canvas: ProjectPanel {
 tap(location)
 return self
 }

 @discardableResult
 func click(dx: Double, dy: Double) -> Self {
 let window = app.windows.firstMatch
 let assertClick = CGVector(dx: dx, dy: dy)
 let tapTest = window.coordinate(withNormalizedOffset: assertClick)
 tapTest.press(forDuration: 0.01)

 return self
 }

 @discardableResult
 func deselect(dx: Double, dy: Double) -> Self {
 click(dx: dx, dy: dy)
 XCTAssertTrue(app.staticTexts["Select or draw a control\nto adjust settings"].exists)

 return self
 }

 @discardableResult
 func select(dx: Double, dy: Double) -> Self {
 click(dx: dx, dy: dy)
 XCTAssertFalse(app.staticTexts["Select or draw a control\nto adjust settings"].exists)

 return self
 }

 @discardableResult
 func drag(from: Double, to: Double) -> Self {
 let from = CGVector(dx: from, dy: from)
 let to = CGVector(dx: to, dy: to)

 let window = app.windows.firstMatch
 let start = window.coordinate(withNormalizedOffset: from)
 let finish = window.coordinate(withNormalizedOffset: to)

 start.press(forDuration: 0.01, thenDragTo: finish)

 return self
 }

 @discardableResult
 func assertNoElements() -> Self {
 let assertNoElementsCanvas: () = XCTAssertTrue(app.staticTexts["Add your screenshot"].exists)

 return self
 }

 @discardableResult
 func assertHaveElements() -> Self {
 let assertHaveElementsCanvas: () = XCTAssertFalse(app.staticTexts["Add your screenshot"].exists)

 return self
 }

}

37 changes: 37 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/Navigator.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
import XCTest

class Navigator: ProjectPanel {

 var navigator: XCUIElement { window.outlines.firstMatch }

 @discardableResult
 func groupInContainer() -> Self {
 app.buttons["Group in Container"].click()

 return self
 }

 @discardableResult
 func assertFirstCell(
 text: String,
 file: StaticString = #file,
 line: UInt = #line
 ) -> Self {
 let actualText = navigator.cells.staticTexts.firstMatch.value as? String

 XCTAssertEqual(actualText, text, file: file, line: line)
 return self
 }

 @discardableResult
 func assertElementsCount(
 count: Int,
 file: StaticString = #file,
 line: UInt = #line
 ) -> Self {
 let cellsCount = navigator.cells.count

 XCTAssertEqual(cellsCount, count, file: file, line: line)
 return self
 }
}

10 changes: 9 additions & 1 deletion
VoiceOverDesignerUITests/PageObjects/Panels/Settings.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,6 +165,11 @@ class Settings: ProjectPanel {
 func customDescriptionValue() -> String? {
 return customDescriptionValueField.value as? String
 }

 func clickButtonTrait() {
 window.checkBoxes["Button"].click()
 }

}

extension XCUIElement {
Expand All@@ -178,6 +183,9 @@ extension XCUIElement {
 }

 func inputEnter() {
 typeText("\r")
 typeKey(XCUIKeyboardKey.enter, modifierFlags: [])
 }
 func inputDelete() {
 typeKey(XCUIKeyboardKey.delete, modifierFlags: [])
 }
}

81 changes: 81 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/StatusBar.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
//
// StatusBar.swift
// VoiceOverDesignerUITests
//
// Created by Mikhail Rubanov on 12.06.2024.
//

import XCTest

class StatusBar: ProjectPanel {

 var statusBar: XCUIElement { app.menuBars.firstMatch }

 var fileMenu: XCUIElement {statusBar.menuBarItems["File"].firstMatch}

 var editMenu: XCUIElement { statusBar.menuBarItems["Edit"].firstMatch }

 var fileNewMenu: XCUIElement {statusBar.menuItems["New"].firstMatch}

 var selectAllMenu: XCUIElement { statusBar.menuItems["Select All"].firstMatch }

 var undoMenu: XCUIElement {statusBar.menuItems["Undo"].firstMatch}

 var redoMenu: XCUIElement {statusBar.menuItems["Redo"].firstMatch}

 @discardableResult
 func clickFile() -> Self {
 fileMenu.click()

 return self
 }

 @discardableResult
 func clickFileNew() -> Self {
 fileNewMenu.click()

 return self
 }

 @discardableResult
 func clickEdit() -> Self {
 editMenu.click()

 return self
 }

 @discardableResult
 func clickSelectAll() -> Self {
 selectAllMenu.click()

 return self
 }

 @discardableResult
 func clickUndoMenu() -> Self {
 undoMenu.click()

 return self
 }

 @discardableResult
 func clickRedoMenu() -> Self {
 redoMenu.click()

 return self
 }

 @discardableResult
 func openInFullScreen() -> Self {
 app.buttons[XCUIIdentifierFullScreenWindow].click()

 return self
 }

 @discardableResult
 func closeWindow() -> Self {
 app.buttons[XCUIIdentifierCloseWindow].click()

 return self
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Add tests for canvas by VitPerov88 · Pull Request #342 · AccessibilityTools/VoiceOverDesigner · GitHub
Skip to content
Add tests for canvas#342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Open

VitPerov88
wants to merge
9
commits into

base:develop
Choose a base branch

from

 Open


Add tests for canvas
#342
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


9 commits


Select commit
Hold shift + click to select a range
b69cbfa

Add tests for canvas


VitPerov88 Jun 12, 2024
1fedf97

Rename to CanvasTests


akaDuality Jun 12, 2024
ab10919

Rewrite testCreateTwoElementContainer()


akaDuality Jun 12, 2024
b54d45c

Add Status Bar Object


VitPerov88 Jun 12, 2024
815a96b

Edit testDragUndoRedo added asserts


VitPerov88 Jun 12, 2024
eed1aa4

Edit testDragUndoRedo added asserts


VitPerov88 Jun 12, 2024
a51282f

All functions in PageObject


VitPerov88 Jun 29, 2024
2af24ac

Refactoring tests


VitPerov88 Jun 29, 2024
2499bcf

Refactoring


VitPerov88 Jun 29, 2024

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


24 changes: 18 additions & 6 deletions
VoiceOver Designer.xcodeproj/project.pbxproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,11 +41,14 @@
 1ECE12DF2969B91700A3E917 /* WindowRestorationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */; };
 1EEE25C32944ADC900B84F01 /* Navigator in Frameworks */ = {isa = PBXBuildFile; productRef = 1EEE25C22944ADC900B84F01 /* Navigator */; };
 236A3C182AC756B200156F00 /* Presentation in Frameworks */ = {isa = PBXBuildFile; productRef = 236A3C172AC756B200156F00 /* Presentation */; };
 589562AC2C19AA770086BC3F /* CanvasTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 589562AB2C19AA770086BC3F /* CanvasTests.swift */; };
 742D242A2ADD939200EC224A /* RecentWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742D24292ADD939200EC224A /* RecentWindowController.swift */; };
 742D242C2AE0BF9800EC224A /* ProjectStateController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 742D242B2AE0BF9800EC224A /* ProjectStateController.swift */; };
 7439CD4429C664A800A557FC /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7439CD4329C664A800A557FC /* StoreKit.framework */; };
 74866ADE2AE6DFBA00D42AFA /* PresentationToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74866ADD2AE6DFBA00D42AFA /* PresentationToolbar.swift */; };
 74866AE12AE6E1CF00D42AFA /* ToolbarItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74866AE02AE6E1CF00D42AFA /* ToolbarItems.swift */; };
 74E0D62F2C19BD9A008E1E77 /* StatusBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */; };
 74E0D6312C19C32A008E1E77 /* Navigator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E0D6302C19C32A008E1E77 /* Navigator.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand DownExpand Up@@ -116,13 +119,16 @@
 1EC992DA28B119730020041B /* ProjectStateController+Toolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ProjectStateController+Toolbar.swift"; sourceTree = "<group>"; };
 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowRestorationTests.swift; sourceTree = "<group>"; };
 1EF217D4281EBBE00036B09B /* VoiceOver-Designer-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "VoiceOver-Designer-Info.plist"; sourceTree = SOURCE_ROOT; };
 589562AB2C19AA770086BC3F /* CanvasTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CanvasTests.swift; sourceTree = "<group>"; };
 6B4705F729048D9800AC4C23 /* VoiceOver DesignerRelease.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "VoiceOver DesignerRelease.entitlements"; sourceTree = "<group>"; };
 6B628795288D3A8D006F622A /* Features */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Features; path = "VoiceOver Designer/Features"; sourceTree = "<group>"; };
 742D24292ADD939200EC224A /* RecentWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecentWindowController.swift; sourceTree = "<group>"; };
 742D242B2AE0BF9800EC224A /* ProjectStateController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProjectStateController.swift; sourceTree = "<group>"; };
 7439CD4329C664A800A557FC /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
 74866ADD2AE6DFBA00D42AFA /* PresentationToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresentationToolbar.swift; sourceTree = "<group>"; };
 74866AE02AE6E1CF00D42AFA /* ToolbarItems.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToolbarItems.swift; sourceTree = "<group>"; };
 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StatusBar.swift; sourceTree = "<group>"; };
 74E0D6302C19C32A008E1E77 /* Navigator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Navigator.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand DownExpand Up@@ -226,7 +232,9 @@
 isa = PBXGroup;
 children = (
 1E7B569E28B37BE0008D1871 /* Settings.swift */,
 74E0D62E2C19BD9A008E1E77 /* StatusBar.swift */,
 1E7B56A928B38042008D1871 /* Canvas.swift */,
 74E0D6302C19C32A008E1E77 /* Navigator.swift */,
 1E7B56A028B37BEF008D1871 /* TextSummary.swift */,
 );
 path = Panels;
Expand DownExpand Up@@ -301,6 +309,7 @@
 1ECE12DE2969B91700A3E917 /* WindowRestorationTests.swift */,
 1E183AE528B50600008B0F07 /* DocumentFromFileTests.swift */,
 1E7B56AE28B38F5D008D1871 /* AdjustableTest.swift */,
 589562AB2C19AA770086BC3F /* CanvasTests.swift */,
 );
 path = Tests;
 sourceTree = "<group>";
Expand DownExpand Up@@ -474,8 +483,10 @@
 buildActionMask = 2147483647;
 files = (
 1EB554B228B274B6000DC4FB /* Robot.swift in Sources */,
 74E0D6312C19C32A008E1E77 /* Navigator.swift in Sources */,
 1E7B56A728B37C51008D1871 /* RecentWindow.swift in Sources */,
 1E183AE628B50600008B0F07 /* DocumentFromFileTests.swift in Sources */,
 74E0D62F2C19BD9A008E1E77 /* StatusBar.swift in Sources */,
 1E7B569C28B37B7C008D1871 /* DesignerTests.swift in Sources */,
 1ECE12DF2969B91700A3E917 /* WindowRestorationTests.swift in Sources */,
 1E7B569F28B37BE0008D1871 /* Settings.swift in Sources */,
Expand All@@ -485,6 +496,7 @@
 1E7B56AA28B38042008D1871 /* Canvas.swift in Sources */,
 1E7B56A128B37BEF008D1871 /* TextSummary.swift in Sources */,
 1E7B56A328B37C07008D1871 /* ProjectPanel.swift in Sources */,
 589562AC2C19AA770086BC3F /* CanvasTests.swift in Sources */,
 1EA7411928B2683000D6CAA4 /* SettingsTests.swift in Sources */,
 1E80528728B4DF6300743023 /* WindowTests.swift in Sources */,
 );
Expand DownExpand Up@@ -630,7 +642,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand DownExpand Up@@ -661,7 +673,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand All@@ -687,7 +699,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand All@@ -714,7 +726,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand DownExpand Up@@ -804,7 +816,7 @@
 COMBINE_HIDPI_IMAGES = YES;
 CURRENT_PROJECT_VERSION = 28;
 DEAD_CODE_STRIPPING = YES;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = "VoiceOver-Designer-Info.plist";
Expand All@@ -830,7 +842,7 @@
 CODE_SIGN_ENTITLEMENTS = MacOSPreview/MacOSPreview.entitlements;
 CODE_SIGN_STYLE = Automatic;
 CURRENT_PROJECT_VERSION = 3;
 DEVELOPMENT_TEAM = P67Q4Q7HA9;
 DEVELOPMENT_TEAM = "";
 ENABLE_HARDENED_RUNTIME = YES;
 GENERATE_INFOPLIST_FILE = YES;
 INFOPLIST_FILE = MacOSPreview/Info.plist;
Expand Down

3 changes: 2 additions & 1 deletion
...eOver Preview/VoiceOver Preview.xcodeproj/xcshareddata/xcschemes/DesignerUITests.xcscheme

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,8 @@
 buildConfiguration = "Debug"
 selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
 shouldUseLaunchSchemeArgsEnv = "YES">
 shouldUseLaunchSchemeArgsEnv = "YES"
 language = "en">
 <Testables>
 <TestableReference
 skipped = "NO">
Expand Down

11 changes: 11 additions & 0 deletions
VoiceOverDesignerUITests/Base/DesignerTests.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@ class DesignerTests: XCTestCase {

 var app: XCUIApplication!
 override func setUpWithError() throws {
 try super.setUpWithError()
 continueAfterFailure = false

 app = XCUIApplication()
Expand DownExpand Up@@ -60,6 +61,16 @@ class DesignerTests: XCTestCase {
 project.settingsPanel
 }

 var statusBar: StatusBar {
 StatusBar(window: project.projectWindow,
 app: app)
 }

 var navigator: Navigator {
 Navigator(window: project.projectWindow,
 app: app)
 }

 func closeWindow() {
 app.windows.firstMatch.buttons[XCUIIdentifierCloseWindow].click()
 }
Expand Down

55 changes: 55 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/Canvas.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,4 +38,59 @@ class Canvas: ProjectPanel {
 tap(location)
 return self
 }

 @discardableResult
 func click(dx: Double, dy: Double) -> Self {
 let window = app.windows.firstMatch
 let assertClick = CGVector(dx: dx, dy: dy)
 let tapTest = window.coordinate(withNormalizedOffset: assertClick)
 tapTest.press(forDuration: 0.01)

 return self
 }

 @discardableResult
 func deselect(dx: Double, dy: Double) -> Self {
 click(dx: dx, dy: dy)
 XCTAssertTrue(app.staticTexts["Select or draw a control\nto adjust settings"].exists)

 return self
 }

 @discardableResult
 func select(dx: Double, dy: Double) -> Self {
 click(dx: dx, dy: dy)
 XCTAssertFalse(app.staticTexts["Select or draw a control\nto adjust settings"].exists)

 return self
 }

 @discardableResult
 func drag(from: Double, to: Double) -> Self {
 let from = CGVector(dx: from, dy: from)
 let to = CGVector(dx: to, dy: to)

 let window = app.windows.firstMatch
 let start = window.coordinate(withNormalizedOffset: from)
 let finish = window.coordinate(withNormalizedOffset: to)

 start.press(forDuration: 0.01, thenDragTo: finish)

 return self
 }

 @discardableResult
 func assertNoElements() -> Self {
 let assertNoElementsCanvas: () = XCTAssertTrue(app.staticTexts["Add your screenshot"].exists)

 return self
 }

 @discardableResult
 func assertHaveElements() -> Self {
 let assertHaveElementsCanvas: () = XCTAssertFalse(app.staticTexts["Add your screenshot"].exists)

 return self
 }

}

37 changes: 37 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/Navigator.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
import XCTest

class Navigator: ProjectPanel {

 var navigator: XCUIElement { window.outlines.firstMatch }

 @discardableResult
 func groupInContainer() -> Self {
 app.buttons["Group in Container"].click()

 return self
 }

 @discardableResult
 func assertFirstCell(
 text: String,
 file: StaticString = #file,
 line: UInt = #line
 ) -> Self {
 let actualText = navigator.cells.staticTexts.firstMatch.value as? String

 XCTAssertEqual(actualText, text, file: file, line: line)
 return self
 }

 @discardableResult
 func assertElementsCount(
 count: Int,
 file: StaticString = #file,
 line: UInt = #line
 ) -> Self {
 let cellsCount = navigator.cells.count

 XCTAssertEqual(cellsCount, count, file: file, line: line)
 return self
 }
}

10 changes: 9 additions & 1 deletion
VoiceOverDesignerUITests/PageObjects/Panels/Settings.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -165,6 +165,11 @@ class Settings: ProjectPanel {
 func customDescriptionValue() -> String? {
 return customDescriptionValueField.value as? String
 }

 func clickButtonTrait() {
 window.checkBoxes["Button"].click()
 }

}

extension XCUIElement {
Expand All@@ -178,6 +183,9 @@ extension XCUIElement {
 }

 func inputEnter() {
 typeText("\r")
 typeKey(XCUIKeyboardKey.enter, modifierFlags: [])
 }
 func inputDelete() {
 typeKey(XCUIKeyboardKey.delete, modifierFlags: [])
 }
}

81 changes: 81 additions & 0 deletions
VoiceOverDesignerUITests/PageObjects/Panels/StatusBar.swift

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
//
// StatusBar.swift
// VoiceOverDesignerUITests
//
// Created by Mikhail Rubanov on 12.06.2024.
//

import XCTest

class StatusBar: ProjectPanel {

 var statusBar: XCUIElement { app.menuBars.firstMatch }

 var fileMenu: XCUIElement {statusBar.menuBarItems["File"].firstMatch}

 var editMenu: XCUIElement { statusBar.menuBarItems["Edit"].firstMatch }

 var fileNewMenu: XCUIElement {statusBar.menuItems["New"].firstMatch}

 var selectAllMenu: XCUIElement { statusBar.menuItems["Select All"].firstMatch }

 var undoMenu: XCUIElement {statusBar.menuItems["Undo"].firstMatch}

 var redoMenu: XCUIElement {statusBar.menuItems["Redo"].firstMatch}

 @discardableResult
 func clickFile() -> Self {
 fileMenu.click()

 return self
 }

 @discardableResult
 func clickFileNew() -> Self {
 fileNewMenu.click()

 return self
 }

 @discardableResult
 func clickEdit() -> Self {
 editMenu.click()

 return self
 }

 @discardableResult
 func clickSelectAll() -> Self {
 selectAllMenu.click()

 return self
 }

 @discardableResult
 func clickUndoMenu() -> Self {
 undoMenu.click()

 return self
 }

 @discardableResult
 func clickRedoMenu() -> Self {
 redoMenu.click()

 return self
 }

 @discardableResult
 func openInFullScreen() -> Self {
 app.buttons[XCUIIdentifierFullScreenWindow].click()

 return self
 }

 @discardableResult
 func closeWindow() -> Self {
 app.buttons[XCUIIdentifierCloseWindow].click()

 return self
 }
}
Loading