diff options
author | Joel Fischer <joel@livio.io> | 2015-04-20 13:37:56 -0400 |
---|---|---|
committer | Joel Fischer <joel@livio.io> | 2015-04-20 13:37:56 -0400 |
commit | d95a8cec393af6bea0251dbe08f0bd2aadfa599b (patch) | |
tree | cc07fd916162ea496f350b85ab8377c3b8c6b406 | |
parent | 80ccacf4851f1a614fe41ccb8d89dafff5f78595 (diff) | |
download | sdl_ios-d95a8cec393af6bea0251dbe08f0bd2aadfa599b.tar.gz |
Add CHAR_LIMIT_EXCEEDED to SDLResult enum
Add Spec for CHAR_LIMIT_EXCEEDED
Fixes #182
3 files changed, 48 insertions, 36 deletions
diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLResult.h b/SmartDeviceLink-iOS/SmartDeviceLink/SDLResult.h index 83010c559..209ad1e71 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLResult.h +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLResult.h @@ -46,6 +46,8 @@ */ +(SDLResult*) INVALID_DATA; ++(SDLResult*) CHAR_LIMIT_EXCEEDED; + /** * @abstract The request is not supported by SDL */ diff --git a/SmartDeviceLink-iOS/SmartDeviceLink/SDLResult.m b/SmartDeviceLink-iOS/SmartDeviceLink/SDLResult.m index 225ae9503..eea574212 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLink/SDLResult.m +++ b/SmartDeviceLink-iOS/SmartDeviceLink/SDLResult.m @@ -6,6 +6,7 @@ SDLResult* SDLResult_SUCCESS = nil; SDLResult* SDLResult_INVALID_DATA = nil; +SDLResult* SDLResult_CHAR_LIMIT_EXCEEDED = nil; SDLResult* SDLResult_UNSUPPORTED_REQUEST = nil; SDLResult* SDLResult_OUT_OF_MEMORY = nil; SDLResult* SDLResult_TOO_MANY_PENDING_REQUESTS = nil; @@ -53,39 +54,40 @@ NSMutableArray* SDLResult_values = nil; +(NSMutableArray*) values { if (SDLResult_values == nil) { SDLResult_values = [[NSMutableArray alloc] initWithObjects: - SDLResult.SUCCESS, - SDLResult.INVALID_DATA, - SDLResult.UNSUPPORTED_REQUEST, - SDLResult.OUT_OF_MEMORY, - SDLResult.TOO_MANY_PENDING_REQUESTS, - SDLResult.INVALID_ID, - SDLResult.DUPLICATE_NAME, - SDLResult.TOO_MANY_APPLICATIONS, - SDLResult.APPLICATION_REGISTERED_ALREADY, - SDLResult.UNSUPPORTED_VERSION, - SDLResult.WRONG_LANGUAGE, - SDLResult.APPLICATION_NOT_REGISTERED, - SDLResult.IN_USE, - SDLResult.VEHICLE_DATA_NOT_ALLOWED, - SDLResult.VEHICLE_DATA_NOT_AVAILABLE, - SDLResult.REJECTED, - SDLResult.ABORTED, - SDLResult.IGNORED, - SDLResult.UNSUPPORTED_RESOURCE, - SDLResult.FILE_NOT_FOUND, - SDLResult.GENERIC_ERROR, - SDLResult.DISALLOWED, - SDLResult.USER_DISALLOWED, - SDLResult.TIMED_OUT, - SDLResult.CANCEL_ROUTE, - SDLResult.TRUNCATED_DATA, - SDLResult.RETRY, - SDLResult.WARNINGS, - SDLResult.SAVED, - SDLResult.INVALID_CERT, - SDLResult.EXPIRED_CERT, - SDLResult.RESUME_FAILED, - nil]; + [SDLResult SUCCESS], + [SDLResult INVALID_DATA], + [SDLResult CHAR_LIMIT_EXCEEDED], + [SDLResult UNSUPPORTED_REQUEST], + [SDLResult OUT_OF_MEMORY], + [SDLResult TOO_MANY_PENDING_REQUESTS], + [SDLResult INVALID_ID], + [SDLResult DUPLICATE_NAME], + [SDLResult TOO_MANY_APPLICATIONS], + [SDLResult APPLICATION_REGISTERED_ALREADY], + [SDLResult UNSUPPORTED_VERSION], + [SDLResult WRONG_LANGUAGE], + [SDLResult APPLICATION_NOT_REGISTERED], + [SDLResult IN_USE], + [SDLResult VEHICLE_DATA_NOT_ALLOWED], + [SDLResult VEHICLE_DATA_NOT_AVAILABLE], + [SDLResult REJECTED], + [SDLResult ABORTED], + [SDLResult IGNORED], + [SDLResult UNSUPPORTED_RESOURCE], + [SDLResult FILE_NOT_FOUND], + [SDLResult GENERIC_ERROR], + [SDLResult DISALLOWED], + [SDLResult USER_DISALLOWED], + [SDLResult TIMED_OUT], + [SDLResult CANCEL_ROUTE], + [SDLResult TRUNCATED_DATA], + [SDLResult RETRY], + [SDLResult WARNINGS], + [SDLResult SAVED], + [SDLResult INVALID_CERT], + [SDLResult EXPIRED_CERT], + [SDLResult RESUME_FAILED], + nil]; } return SDLResult_values; } @@ -104,6 +106,14 @@ NSMutableArray* SDLResult_values = nil; return SDLResult_INVALID_DATA; } ++(SDLResult*) CHAR_LIMIT_EXCEEDED { + if (SDLResult_CHAR_LIMIT_EXCEEDED == nil) { + SDLResult_CHAR_LIMIT_EXCEEDED = [[SDLResult alloc] initWithValue:@"CHAR_LIMIT_EXCEEDED"]; + } + + return SDLResult_CHAR_LIMIT_EXCEEDED; +} + +(SDLResult*) UNSUPPORTED_REQUEST { if (SDLResult_UNSUPPORTED_REQUEST == nil) { SDLResult_UNSUPPORTED_REQUEST = [[SDLResult alloc] initWithValue:@"UNSUPPORTED_REQUEST"]; diff --git a/SmartDeviceLink-iOS/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m b/SmartDeviceLink-iOS/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m index a2a514cdb..159c8f612 100644 --- a/SmartDeviceLink-iOS/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m +++ b/SmartDeviceLink-iOS/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLResultSpec.m @@ -26,7 +26,7 @@ describe(@"Individual Enum Value Tests", ^ { expect([SDLResult VEHICLE_DATA_NOT_AVAILABLE].value).to(equal(@"VEHICLE_DATA_NOT_AVAILABLE")); expect([SDLResult TIMED_OUT].value).to(equal(@"TIMED_OUT")); expect([SDLResult INVALID_DATA].value).to(equal(@"INVALID_DATA")); - //expect([SDLResult CHAR_LIMIT_EXCEEDED].value).to(equal(@"CHAR_LIMIT_EXCEEDED")); + expect([SDLResult CHAR_LIMIT_EXCEEDED].value).to(equal(@"CHAR_LIMIT_EXCEEDED")); expect([SDLResult INVALID_ID].value).to(equal(@"INVALID_ID")); expect([SDLResult DUPLICATE_NAME].value).to(equal(@"DUPLICATE_NAME")); expect([SDLResult APPLICATION_NOT_REGISTERED].value).to(equal(@"APPLICATION_NOT_REGISTERED")); @@ -62,7 +62,7 @@ describe(@"ValueOf Tests", ^ { expect([SDLResult valueOf:@"VEHICLE_DATA_NOT_AVAILABLE"]).to(equal([SDLResult VEHICLE_DATA_NOT_AVAILABLE])); expect([SDLResult valueOf:@"TIMED_OUT"]).to(equal([SDLResult TIMED_OUT])); expect([SDLResult valueOf:@"INVALID_DATA"]).to(equal([SDLResult INVALID_DATA])); - //expect([SDLResult valueOf:@"CHAR_LIMIT_EXCEEDED"]).to(equal([SDLResult CHAR_LIMIT_EXCEEDED])); + expect([SDLResult valueOf:@"CHAR_LIMIT_EXCEEDED"]).to(equal([SDLResult CHAR_LIMIT_EXCEEDED])); expect([SDLResult valueOf:@"INVALID_ID"]).to(equal([SDLResult INVALID_ID])); expect([SDLResult valueOf:@"DUPLICATE_NAME"]).to(equal([SDLResult DUPLICATE_NAME])); expect([SDLResult valueOf:@"APPLICATION_NOT_REGISTERED"]).to(equal([SDLResult APPLICATION_NOT_REGISTERED])); @@ -106,7 +106,7 @@ describe(@"Value List Tests", ^ { [SDLResult VEHICLE_DATA_NOT_AVAILABLE], [SDLResult TIMED_OUT], [SDLResult INVALID_DATA], - //[SDLResult CHAR_LIMIT_EXCEEDED], + [SDLResult CHAR_LIMIT_EXCEEDED], [SDLResult INVALID_ID], [SDLResult DUPLICATE_NAME], [SDLResult APPLICATION_NOT_REGISTERED], |