Skip to content

Commit

Permalink
SUCCESS should be WD_SUCCESS
Browse files Browse the repository at this point in the history
Signed-off-by: Luke Inman-Semerau <luke.semerau@gmail.com>
  • Loading branch information
Jason Carr authored and lukeis committed Jan 17, 2013
1 parent de1010e commit 9b8cc4f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion iphone/src/objc/HTTPVirtualDirectory+ExecuteScript.mm
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
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

0 comments on commit 9b8cc4f

Please sign in to comment.