Skip to content

Update iphonedriver to use WD_SUCCESS #4

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

Closed
maudineormsby wants to merge 1 commit into from
Closed

Update iphonedriver to use WD_SUCCESS #4

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
2 changes: 1 addition & 1 deletion iphone/src/objc/HTTPVirtualDirectory+ExecuteScript.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ -(id) executeAtom:(const char* const[])atom

-(id) verifyResult:(NSDictionary*)resultDict {
int status = [(NSNumber*) [resultDict objectForKey:@"status"] intValue];
if (status != SUCCESS) {
if (status != WD_SUCCESS) {
NSDictionary* value = (NSDictionary*) [resultDict objectForKey:@"value"];
NSString* message = (NSString*) [value objectForKey:@"message"];
@throw [NSException webDriverExceptionWithMessage:message
Expand Down
8 changes: 4 additions & 4 deletions iphone/src/objc/WebDriverResponse.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ - (id)initWithError:(id)error {
}

// If we didn't set a status above, go ahead and use a generic now.
if (status_ == SUCCESS) {
if (status_ == WD_SUCCESS) {
status_ = EUNHANDLEDERROR;
}

Expand Down Expand Up @@ -155,7 +155,7 @@ - (NSString *)description {
}

- (int)errorStatusCode {
if (status_ == SUCCESS) {
if (status_ == WD_SUCCESS) {
return 200;
} else if (status_ > 399 && status_ < 500) {
return status_;
Expand All @@ -167,11 +167,11 @@ - (int)errorStatusCode {
#pragma mark Properties

- (BOOL)isError {
return status_ != SUCCESS;
return status_ != WD_SUCCESS;
}

- (void)setIsError:(BOOL)newIsError {
[self setStatus:(newIsError ? EUNHANDLEDERROR : SUCCESS)];
[self setStatus:(newIsError ? EUNHANDLEDERROR : WD_SUCCESS)];
}

- (int)status {
Expand Down