Skip to content

Commit a4bb549

Browse files
Kyle-YeKyle-Ye
committed
Update GestureFunctions
1 parent e42c209 commit a4bb549

6 files changed

Lines changed: 114 additions & 38 deletions

File tree

‎Sources/COpenGestures/include/OpenGestures/OGFGestureFailureType.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
// OpenGestures
44
//
55
// Audited for 9126.1.5
6-
// Status: Complete
6+
// Status: WIP
77

88
#ifndef OGFGestureFailureType_h
99
#define OGFGestureFailureType_h
1010

1111
#include <OpenGestures/OGFBase.h>
1212

13-
/// Corresponds to Gestures.GestureFailureReason cases.
14-
/// Cases 2 (custom), 3 (disabled), 5 (activationDenied), 6 (aborted) are terminated.
1513
typedef OGF_ENUM(NSInteger, OGFGestureFailureType) {
1614
OGFGestureFailureTypeExcluded = 0,
1715
OGFGestureFailureTypeFailureDependency = 1,

‎Sources/COpenGestures/include/OpenGestures/OGFGestureFunctions.h‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// OpenGestures
44
//
55
// Audited for 9126.1.5
6-
// Status: WIP
6+
// Status: Complete
77

88
#ifndef OGFGestureFunctions_h
99
#define OGFGestureFunctions_h
@@ -13,9 +13,8 @@
1313

1414
#if OGF_OBJC_FOUNDATION
1515
#import <Foundation/Foundation.h>
16-
17-
@protocol OGFGestureNode;
18-
@protocol OGFGestureNodeCoordinator;
16+
@protocol GFGestureNode;
17+
@protocol GFGestureNodeCoordinator;
1918
#endif
2019

2120
OGF_EXTERN_C_BEGIN
@@ -45,7 +44,7 @@ OGF_EXPORT void OGFGestureComponentControllerSetNode(
4544
#endif /* OGF_OBJC_FOUNDATION */
4645

4746
/// Check if a gesture failure type is terminated.
48-
OGF_EXPORT bool OGFGestureFailureTypeIsTerminated(OGFGestureFailureType type) OGF_SWIFT_NAME(getter:OGFGestureFailureType.isTerminated(self:));
47+
OGF_EXPORT bool OGFGestureFailureTypeIsTerminated(OGFGestureFailureType type);
4948

5049
OGF_ASSUME_NONNULL_END
5150

‎Sources/OpenGestures/Extension/OGFGestureFunctions.swift‎

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,49 +7,37 @@
77

88
#if canImport(ObjectiveC)
99

10-
// MARK: - OGFGestureNodeCreateDefault
10+
@_cdecl("OGFGestureNodeDefaultValue")
11+
public func ogfGestureNodeDefaultValue() -> Any {
12+
()
13+
}
1114

1215
@_cdecl("OGFGestureNodeCreateDefault")
13-
package func _OGFGestureNodeCreateDefault(_ key: Int) -> AnyObject {
16+
public func ogfGestureNodeCreateDefault(key: Int) -> any OGFGestureNode {
1417
// TODO: Create AnyGestureNodeShim with key
15-
fatalError("TODO")
18+
preconditionFailure("")
1619
}
1720

18-
// MARK: - OGFGestureNodeCoordinatorCreate
19-
2021
@_cdecl("OGFGestureNodeCoordinatorCreate")
21-
package func _OGFGestureNodeCoordinatorCreate(
22+
public func ogfGestureNodeCoordinatorCreate(
2223
_ willUpdateHandler: (() -> Void)?,
2324
_ didUpdateHandler: (() -> Void)?
24-
) -> AnyObject {
25+
) -> any OGFGestureNodeCoordinator {
2526
// TODO: Create GestureNodeCoordinatorShim
26-
fatalError("TODO")
27+
preconditionFailure("")
2728
}
2829

29-
// MARK: - OGFGestureComponentControllerSetNode
30-
3130
@_cdecl("OGFGestureComponentControllerSetNode")
32-
package func _OGFGestureComponentControllerSetNode(
31+
public func ogfGestureComponentControllerSetNode(
3332
_ controller: AnyObject,
34-
_ node: AnyObject?
33+
_ node: (any OGFGestureNode)?
3534
) {
36-
guard let ctrl = controller as? AnyGestureComponentController else { return }
37-
// TODO: Extract AnyGestureNode from the ObjC shim node and assign
38-
_ = ctrl
39-
_ = node
40-
}
41-
42-
// MARK: - OGFGestureNodeDefaultValue
43-
44-
@_cdecl("OGFGestureNodeDefaultValue")
45-
package func _OGFGestureNodeDefaultValue() -> AnyObject? {
46-
() as AnyObject
35+
guard let _ = controller as? AnyGestureComponentController else { return }
36+
preconditionFailure("")
4737
}
4838

4939
#endif
5040

51-
// MARK: - OGFGestureFailureTypeIsTerminated
52-
5341
@_cdecl("OGFGestureFailureTypeIsTerminated")
5442
public func ogfGestureFailureTypeIsTerminated(
5543
type: OGFGestureFailureType

‎Sources/OpenGesturesShims/OGFShims.swift‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,18 @@ public struct GesturesFrameworkVendor: RawRepresentable, Hashable, CaseIterable,
1717
#if OPENGESTURES_GESTURES
1818
@_exported import Gestures
1919

20-
public let gesturesVendor: GesturesFrameworkVendor = .gestures
21-
2220
public typealias OGFGesturePhase = GFGesturePhase
2321
public typealias OGFGestureRelationType = GFGestureRelationType
2422
public typealias OGFGestureRelationRole = GFGestureRelationRole
2523
public typealias OGFGestureFailureType = GFGestureFailureType
2624

25+
public let OGFGestureNodeCreateDefault = GFGestureNodeCreateDefault
26+
public let OGFGestureNodeDefaultValue = GFGestureNodeDefaultValue
27+
public let OGFGestureNodeCoordinatorCreate = GFGestureNodeCoordinatorCreate
28+
public let OGFGestureComponentControllerSetNode = GFGestureComponentControllerSetNode
29+
public let OGFGestureFailureTypeIsTerminated = GFGestureFailureTypeIsTerminated
30+
31+
public let gesturesVendor: GesturesFrameworkVendor = .gestures
2732
#else
2833
@_exported import OpenGestures
2934
public let gesturesVendor: GesturesFrameworkVendor = .openGestures

‎Tests/OpenGesturesCompatibilityTests/Extension/OGFGestureFunctionsCompatibilityTests.swift‎

Lines changed: 82 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,86 @@
44

55
import Testing
66

7-
struct OGFGestureFunctionsCompatibilityTests {
7+
struct OGFGestureFailureTypeIsTerminatedTests {
8+
@Test
9+
func nodeDefaultValue() {
10+
let value = OGFGestureNodeDefaultValue()
11+
#expect(value is Void)
12+
}
13+
14+
@Suite(.enabled(if: compatibilityTestEnabled))
15+
struct GestureNodeCreateDefaultTests {
16+
@Test(arguments: [1, 2])
17+
func properties(_ key: Int) {
18+
let _ = OGFGestureNodeCreateDefault(key)
19+
// WIP
20+
// #expect(node.identifier == key.description)
21+
}
22+
23+
@Test(.enabled(if: compatibilityTestEnabled))
24+
func description() throws {
25+
let node = OGFGestureNodeCreateDefault(1)
26+
let description = String(describing: node)
27+
let pattern = [
28+
#"GestureNodeShim<\(\)> <0x[0-9a-f]+> \{"#,
29+
#" node: GestureNode<\(\)> <0x[0-9a-f]+ \d+> \{"#,
30+
#" phase: idle"#,
31+
#" pendingPhases: \[\]"#,
32+
#" relations: \{"#,
33+
#" can exclude \(dynamic\): \[any, position: any\]"#,
34+
#" can be excluded by \(dynamic\): \[any, position: any\]"#,
35+
#" can exclude active \(dynamic\): \[any, position: any\]"#,
36+
#" can be excluded when active by \(dynamic\): \[any, position: any\]"#,
37+
#" should require failure of \(dynamic\): \[any, position: any\]"#,
38+
#" should required to fail by \(dynamic\): \[any, position: any\]"#,
39+
#" \}"#,
40+
#" delegate: nil"#,
41+
#" container: nil"#,
42+
#" trackedEvents: \[\]"#,
43+
#" \}"#,
44+
#" flags: none"#,
45+
#"\}"#,
46+
].joined(separator: " *\n")
47+
let regex = try Regex(pattern)
48+
#expect(description.wholeMatch(of: regex) != nil)
49+
}
50+
}
51+
52+
@Suite(.enabled(if: compatibilityTestEnabled))
53+
struct GestureNodeCoordinatorCreateTests {
54+
@Test
55+
func createCoordinatorWithNilHandlers() {
56+
let coordinator = OGFGestureNodeCoordinatorCreate(nil, nil)
57+
#expect(coordinator.nodes.count == 0)
58+
}
59+
60+
@Test
61+
func createCoordinatorWithHandlers() {
62+
var willUpdateCalled = false
63+
var didUpdateCalled = false
64+
let coordinator = OGFGestureNodeCoordinatorCreate(
65+
{ willUpdateCalled = true },
66+
{ didUpdateCalled = true }
67+
)
68+
// FIXME: The init set does not work
69+
coordinator.willUpdateHandler = {
70+
willUpdateCalled = true
71+
}
72+
coordinator.didUpdateHandler = {
73+
didUpdateCalled = true
74+
}
75+
coordinator.willUpdateHandler?()
76+
coordinator.didUpdateHandler?()
77+
#expect(willUpdateCalled)
78+
#expect(didUpdateCalled)
79+
}
80+
}
81+
82+
@Test(.disabled())
83+
func gestureComponentControllerSetNode() throws {
84+
// TODO
85+
}
86+
887
@Test(arguments: [
988
(.excluded, false),
1089
(.failureDependency, false),
@@ -15,7 +94,7 @@ struct OGFGestureFunctionsCompatibilityTests {
1594
(.aborted, true),
1695
(.coordinatorChanged, false),
1796
] as [(OGFGestureFailureType, Bool)])
18-
func failureTypeIsTerminated(_ type: OGFGestureFailureType, _ expected: Bool) {
19-
#expect(type.isTerminated == expected)
97+
func isTerminated(_ type: OGFGestureFailureType, _ expected: Bool) {
98+
#expect(OGFGestureFailureTypeIsTerminated(type) == expected)
2099
}
21100
}

‎Tests/OpenGesturesCompatibilityTests/OGFShims.swift‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,12 @@ public typealias OGFGesturePhase = GFGesturePhase
1111
public typealias OGFGestureRelationType = GFGestureRelationType
1212
public typealias OGFGestureRelationRole = GFGestureRelationRole
1313
public typealias OGFGestureFailureType = GFGestureFailureType
14+
15+
public let OGFGestureNodeCreateDefault = GFGestureNodeCreateDefault
16+
public let OGFGestureNodeDefaultValue = GFGestureNodeDefaultValue
17+
public let OGFGestureNodeCoordinatorCreate = GFGestureNodeCoordinatorCreate
18+
public let OGFGestureComponentControllerSetNode = GFGestureComponentControllerSetNode
19+
public let OGFGestureFailureTypeIsTerminated = GFGestureFailureTypeIsTerminated
20+
1421
public let compatibilityTestEnabled = true
1522
#endif

0 commit comments

Comments
 (0)