This repository has been archived by the owner on Dec 26, 2019. It is now read-only.
Use NSProxy as base class for FBApplicationProcessProxy #979
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,11 +20,18 @@ @implementation FBApplicationProcessProxy | |
| + (instancetype)proxyWithApplicationProcess:(XCUIApplicationProcess *)applicationProcess | ||
| { | ||
| NSParameterAssert(applicationProcess); | ||
| NSParameterAssert([[applicationProcess class] isEqual:XCUIApplicationProcess.class]); | ||
| FBApplicationProcessProxy *proxy = [[self.class alloc] init]; | ||
| proxy.applicationProcess = applicationProcess; | ||
| return proxy; | ||
| } | ||
|
|
||
| - (instancetype)init { | ||
| return self; | ||
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
Sorry, something went wrong. |
||
| } | ||
|
|
||
| #pragma mark - Override XCUIApplicationProcess methods | ||
|
|
||
| - (void)waitForQuiescence | ||
| { | ||
| if (!self.shouldWaitForQuiescence) { | ||
|
|
@@ -45,9 +52,16 @@ - (void)waitForQuiescenceIncludingAnimationsIdle:(BOOL)includeAnimations | |
| [self.applicationProcess waitForQuiescenceIncludingAnimationsIdle:includeAnimations]; | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Why kill There was a problem hiding this comment. I haven't done any benchmarking, and implemented the only two required methods. if this is faster, then let's use it. There was a problem hiding this comment. From https://developer.apple.com/documentation/objectivec/nsobject/1418855-forwardingtargetforselector There was a problem hiding this comment. Thanks. Simple benchmark with 10 million invocations answers the question "How |
||
| #pragma mark - Forward not implemented methods to applicationProcess | ||
|
|
||
| - (void)forwardInvocation:(NSInvocation *)invocation | ||
| { | ||
| [invocation invokeWithTarget:self.applicationProcess]; | ||
| } | ||
|
|
||
| - (nullable NSMethodSignature *)methodSignatureForSelector:(SEL)sel | ||
| { | ||
| return [self.applicationProcess methodSignatureForSelector:sel]; | ||
| } | ||
|
|
||
| @end | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /** | ||
| * Copyright (c) 2015-present, Facebook, Inc. | ||
| * All rights reserved. | ||
| * | ||
| * This source code is licensed under the BSD-style license found in the | ||
| * LICENSE file in the root directory of this source tree. An additional grant | ||
| * of patent rights can be found in the PATENTS file in the same directory. | ||
| */ | ||
|
|
||
| #import <XCTest/XCTest.h> | ||
| #import "FBApplicationProcessProxy.h" | ||
| #import "XCUIApplicationProcess.h" | ||
|
|
||
| @interface FBApplicationProcessProxy (NonProxiedMethod) | ||
| - (void)objectsMethod; | ||
| @end | ||
|
|
||
| @implementation FBApplicationProcessProxy (NonProxiedMethod) | ||
|
|
||
| - (void)objectsMethod | ||
| { | ||
| // intentionally empty | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| @interface FBApplicationProcessProxy (ProxiedMethod) | ||
| - (NSInteger)proxiedMethod; | ||
| @end | ||
|
|
||
| @interface XCUIApplicationProcess (TestableMethods) | ||
| - (void)objectsMethod; | ||
| - (int)proxiedMethod; | ||
| @end | ||
|
|
||
| @implementation XCUIApplicationProcess (TestableMethods) | ||
|
|
||
| - (int)proxiedMethod; | ||
| { | ||
| return 1; | ||
| } | ||
|
|
||
| - (void)objectsMethod | ||
| { | ||
| NSString *errorMessage = [NSString stringWithFormat:@"Method %@ must NOT be proxied", NSStringFromSelector(_cmd)]; | ||
| NSException * exception = [[NSException alloc] initWithName:@"Test failed" reason:errorMessage userInfo:nil]; | ||
| [exception raise]; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| @interface FBApplicationProcessProxyTest : XCTestCase | ||
|
|
||
| @end | ||
|
|
||
| @implementation FBApplicationProcessProxyTest | ||
|
|
||
|
|
||
| - (void)testMethodCallIsProxied { | ||
| XCUIApplicationProcess *applicationProcess = [[XCUIApplicationProcess alloc] init]; | ||
| FBApplicationProcessProxy *proxy = [FBApplicationProcessProxy proxyWithApplicationProcess:applicationProcess]; | ||
| XCTAssertEqual([proxy proxiedMethod], 1); | ||
| } | ||
|
|
||
| - (void)testMethodCallIsNotProxied { | ||
| XCUIApplicationProcess *applicationProcess = [[XCUIApplicationProcess alloc] init]; | ||
| FBApplicationProcessProxy *proxy = [FBApplicationProcessProxy proxyWithApplicationProcess:applicationProcess]; | ||
| XCTAssertNoThrow([proxy objectsMethod]); | ||
| } | ||
|
|
||
| - (void)testProxyIsProxy { | ||
| XCUIApplicationProcess *applicationProcess = [[XCUIApplicationProcess alloc] init]; | ||
| FBApplicationProcessProxy *proxy = [FBApplicationProcessProxy proxyWithApplicationProcess:applicationProcess]; | ||
| XCTAssertTrue([proxy isProxy]); | ||
| } | ||
|
|
||
| - (void)testAssertProxyObjectParameter { | ||
| XCUIApplicationProcess *applicationProcess = [[XCUIApplicationProcess alloc] init]; | ||
| id proxy = (id)[FBApplicationProcessProxy proxyWithApplicationProcess:applicationProcess]; | ||
| XCTAssertThrows([FBApplicationProcessProxy proxyWithApplicationProcess:proxy]); | ||
| } | ||
|
|
||
| @end | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
Sorry, something went wrong.