Merge remote-tracking branch 'origin/develop' into feature/issue_85_siphon_serverfeature/issue_85_siphon_server

* origin/develop:
  reverting function renaming in SDLRPCMessage.

1 files changed, 4 insertions, 4 deletions

diff --git a/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m b/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m
index f23921158..57dbd3513 100644
--- a/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/SuperclassSpecs/SDLRPCMessageSpec.m
@@ -62,7 +62,7 @@ describe(@"FunctionName Tests", ^ {
         
         [testMessage setFunctionName:@"Functioning"];
         
-        expect([testMessage functionNameForId]).to(equal(@"Functioning"));
+        expect([testMessage getFunctionName]).to(equal(@"Functioning"));
     });
     
     it(@"Should get correctly when initialized", ^ {
@@ -71,18 +71,18 @@ describe(@"FunctionName Tests", ^ {
                                                                                             @{@"age":@25},
                                                                                         SDLNameOperationName:@"DoNothing"}} mutableCopy]];
         
-        expect([testMessage functionNameForId]).to(equal(@"DoNothing"));
+        expect([testMessage getFunctionName]).to(equal(@"DoNothing"));
         
         testMessage = [[SDLRPCMessage alloc] initWithName:@"DoSomething"];
         
-        expect([testMessage functionNameForId]).to(equal(@"DoSomething"));
+        expect([testMessage getFunctionName]).to(equal(@"DoSomething"));
     });
     
     it(@"Should be nil if not set", ^ {
         SDLRPCMessage* testMessage = [[SDLRPCMessage alloc] initWithDictionary:[@{SDLNameNotification:
                                                                                       @{SDLNameParameters:
                                                                                             @{}}} mutableCopy]];
-        expect([testMessage functionNameForId]).to(beNil());
+        expect([testMessage getFunctionName]).to(beNil());
     });
 });