8000 Fix focus behavior by ikesyo · Pull Request #980 · Quick/Quick · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix focus behavior #980

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

Merged
merged 1 commit into from
May 31, 2020
Merged

Fix focus behavior #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions Quick.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@
CD1F6506226398F600EBE9D8 /* XCTestObservationCenter+QCKSuspendObservation.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1F6502226398F600EBE9D8 /* XCTestObservationCenter+QCKSuspendObservation.swift */; };
CD1F6507226398F600EBE9D8 /* XCTestObservationCenter+QCKSuspendObservation.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1F6502226398F600EBE9D8 /* XCTestObservationCenter+QCKSuspendObservation.swift */; };
CD1F6508226398F600EBE9D8 /* XCTestObservationCenter+QCKSuspendObservation.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD1F6502226398F600EBE9D8 /* XCTestObservationCenter+QCKSuspendObservation.swift */; };
CD21A026247C1385002C4762 /* QuickTestObservation.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD21A025247C1385002C4762 /* QuickTestObservation.swift */; };
CD21A027247C1385002C4762 /* QuickTestObservation.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD21A025247C1385002C4762 /* QuickTestObservation.swift */; };
CD21A028247C1385002C4762 /* QuickTestObservation.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD21A025247C1385002C4762 /* QuickTestObservation.swift */; };
CD264DBD1DDA147A0038B0EB /* AfterSuiteTests+ObjC.m in Sources */ = {isa = PBXBuildFile; fileRef = 64076D241D6D80B500E2B499 /* AfterSuiteTests+ObjC.m */; };
CD582D6F2264B371008F7CE6 /* QuickSpec+MethodList.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD582D6E2264B371008F7CE6 /* QuickSpec+MethodList.swift */; };
CD582D702264B371008F7CE6 /* QuickSpec+MethodList.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD582D6E2264B371008F7CE6 /* QuickSpec+MethodList.swift */; };
Expand Down Expand Up @@ -367,6 +370,7 @@
8D010A561C11726F00633E2B /* DescribeTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DescribeTests.swift; sourceTree = "<group>"; };
AED9C8621CC8A7BD00432F62 /* CrossReferencingSpecs.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CrossReferencingSpecs.swift; sourceTree = "<group>"; };
CD1F6502226398F600EBE9D8 /* XCTestObservationCenter+QCKSuspendObservation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCTestObservationCenter+QCKSuspendObservation.swift"; sourceTree = "<group>"; };
CD21A025247C1385002C4762 /* QuickTestObservation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickTestObservation.swift; sourceTree = "<group>"; };
CD261AC81DEC8B0000A8863C /* QuickConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuickConfiguration.swift; sourceTree = "<group>"; };
CD3451461E4703D4000C8633 /* QuickMain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuickMain.swift; sourceTree = "<group>"; };
CD3451471E4703D4000C8633 /* QuickSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QuickSpec.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -776,6 +780,7 @@
DA408BDE19FF5599005DF92A /* Hooks */,
CD3451461E4703D4000C8633 /* QuickMain.swift */,
CD3451471E4703D4000C8633 /* QuickSpec.swift */,
CD21A025247C1385002C4762 /* QuickTestObservation.swift */,
34F375A619515CA700CE1B99 /* World.swift */,
34F3759E19515CA700CE1B99 /* Example.swift */,
DA02C91819A8073100093156 /* ExampleMetadata.swift */,
Expand Down Expand Up @@ -1339,6 +1344,7 @@
CE175D501E8D6B4900EB5E84 /* Behavior.swift in Sources */,
CE590E1F1C431FE400253D19 /* QuickTestSuite.swift in Sources */,
1F118D091BDCA536005013A2 /* QuickSpec.m in Sources */,
CD21A028247C1385002C4762 /* QuickTestObservation.swift in Sources */,
CDE5BDFF2268CE97006E2F66 /* QuickConfiguration.swift in Sources */,
1F118D011BDCA536005013A2 /* ExampleHooks.swift in Sources */,
);
Expand Down Expand Up @@ -1426,6 +1432,7 @@
CE175D4F1E8D6B4900EB5E84 /* Behavior.swift in Sources */,
CE590E1A1C431FE300253D19 /* QuickTestSuite.swift in Sources */,
DA3124E719FCAEE8002858A7 /* DSL.swift in Sources */,
CD21A027247C1385002C4762 /* QuickTestObservation.swift in Sources */,
CDE5BDFE2268CE96006E2F66 /* QuickConfiguration.swift in Sources */,
DA6B30191A4DB0D500FFB148 /* Filter.swift in Sources */,
);
Expand Down Expand Up @@ -1561,6 +1568,7 @@
CE175D4E1E8D6B4900EB5E84 /* Behavior.swift in Sources */,
34F375AB19515CA700CE1B99 /* Example.swift in Sources */,
DA3124E619FCAEE8002858A7 /* DSL.swift in Sources */,
CD21A026247C1385002C4762 /* QuickTestObservation.swift in Sources */,
CDE5BDFD2268CE95006E2F66 /* QuickConfiguration.swift in Sources */,
DA6B30181A4DB0D500FFB148 /* Filter.swift in Sources */,
);
Expand Down
69 changes: 69 additions & 0 deletions Sources/Quick/QuickTestObservation.swift
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
#if !SWIFT_PACKAGE

import Foundation
import XCTest

/// A dummy protocol for calling the internal `+[QuickSpec buildExamplesIfNeeded]` method
/// which is defined in Objective-C from Swift.
@objc internal protocol _QuickSpecInternal {
static func buildExamplesIfNeeded()
}

@objc internal final class QuickTestObservation: NSObject, XCTestObservation {
@objc(sharedInstance)
static let shared = QuickTestObservation()

// Quick hooks into this event to compile example groups for each QuickSpec subclasses.
//
// If an exception occurs when compiling examples, report it to the user. Chances are they
// included an expectation outside of a "it", "describe", or "context" block.
func testBundleWillStart(_ testBundle: Bundle) {
QuickSpec.enumerateSubclasses { specClass in
// This relies on `_QuickSpecInternal`.
(specClass as AnyClass).buildExamplesIfNeeded()
}
}
}

// swiftlint:disable:next todo
// TODO: Unify this with QuickConfiguration's equivalent
extension QuickSpec {
internal static func enumerateSubclasses(
subclasses: [QuickSpec.Type]? = nil,
_ block: (QuickSpec.Type) -> Void
) {
let subjects: [QuickSpec.Type]
if let subclasses = subclasses {
subjects = subclasses
} else {
let classesCount = objc_getClassList(nil, 0)

guard classesCount > 0 else {
return
}

let classes = UnsafeMutablePointer<AnyClass?>.allocate(capacity: Int(classesCount))
defer { free(classes) }

objc_getClassList(AutoreleasingUnsafeMutablePointer(classes), classesCount)

var specSubclasses: [QuickSpec.Type] = []
for index in 0..<classesCount {
guard
let subclass = classes[Int(index)],
let superclass = class_getSuperclass(subclass),
superclass is QuickSpec.Type
else { continue }

// swiftlint:disable:next force_cast
specSubclasses.append(subclass as! QuickSpec.Type)
}

subjects = specSubclasses
}

subjects.forEach(block)
}
}

#endif
29 changes: 7 additions & 22 deletions Sources/QuickObjectiveC/QuickSpec.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,13 @@ @implementation QuickSpec

#pragma mark - XCTestCase Overrides

/**
QuickSpec hooks into this event to compile the example groups for this spec subclass.

If an exception occurs when compiling the examples, report it to the user. Chances are they
included an expectation outside of a "it", "describe", or "context" block.
*/
+ (XCTestSuite *)defaultTestSuite {
[self buildExamplesIfNeeded];

// Add instance methods for this class' examples.
NSArray *examples = [[World sharedWorld] examplesForSpecClass:[self class]];
NSMutableSet<NSString*> *selectorNames = [NSMutableSet set];

for (Example *example in examples) {
[self addInstanceMethodForExample:example classSelectorNames:selectorNames];
}

return [super defaultTestSuite];
}

/**
Invocations for each test method in the test case. QuickSpec overrides this method to define a
new method for each example defined in +[QuickSpec spec].

@return An array of invocations that execute the newly defined example methods.
*/
+ (NSArray *)testInvocations {
[self buildExamplesIfNeeded];

NSArray *examples = [[World sharedWorld] examplesForSpecClass:[self class]];
NSMutableArray *invocations = [NSMutableArray arrayWithCapacity:[examples count]];

Expand Down Expand Up @@ -172,3 +150,10 @@ - (void)recordFailureWithDescription:(NSString *)description
}

@end

#pragma mark - Test Observation

__attribute__((constructor))
static void registerQuickTestObservation(void) {
[[XCTestObservationCenter sharedTestObservationCenter] addTestObserver:[QuickTestObservation sharedInstance]];
}
7 changes: 7 additions & 0 deletions Tests/QuickTests/QuickFocusedTests/FocusedTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,17 @@ final class FocusedTests: XCTestCase, XCTestCaseProvider {
}

func testOnlyFocusedExamplesAreExecuted() {
#if SWIFT_PACKAGE
let result = qck_runSpecs([
_FunctionalTests_FocusedSpec_Focused.self,
_FunctionalTests_FocusedSpec_Unfocused.self,
])
#else
let result = qck_runSpecs([
_FunctionalTests_FocusedSpec_Unfocused.self,
_FunctionalTests_FocusedSpec_Focused.self,
])
#endif
XCTAssertEqual(result?.executionCount, 8)
}
}
8 changes: 8 additions & 0 deletions Tests/QuickTests/QuickTests/Helpers/QuickSpecRunner.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,14 @@ func qck_runSpecs(_ specClasses: [QuickSpec.Type]) -> XCTestRun? {
world.isRunningAdditionalSuites = true
defer { world.isRunningAdditionalSuites = false }

#if !SWIFT_PACKAGE
// Gather examples first
QuickSpec.enumerateSubclasses(subclasses: specClasses) { specClass in
// This relies on `_QuickSpecInternal`.
(specClass as AnyClass).buildExamplesIfNeeded()
}
#endif

let suite = XCTestSuite(name: "MySpecs")
for specClass in specClasses {
#if canImport(Darwin)
Expand Down
0