Fix test referencesfeature/issue_948_refactor_lower_layers

4 files changed, 11 insertions, 8 deletions

diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m
index a2a9c8e06..acdcb833c 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m
@@ -19,7 +19,6 @@
 #import "SDLOnHMIStatus.h"
 #import "SDLPermissionManager.h"
 #import "SDLProxy.h"
-#import "SDLProxyFactory.h"
 #import "SDLProtocol.h"
 #import "SDLRegisterAppInterface.h"
 #import "SDLRegisterAppInterfaceResponse.h"
@@ -64,7 +63,6 @@ describe(@"a lifecycle manager", ^{
     __block SDLConfiguration *testConfig = nil;
     
     __block id protocolMock = OCMClassMock([SDLProtocol class]);
-    __block id proxyBuilderClassMock = OCMStrictClassMock([SDLProxyFactory class]);
     __block id proxyMock = OCMClassMock([SDLProxy class]);
     __block id lockScreenManagerMock = OCMClassMock([SDLLockScreenManager class]);
     __block id fileManagerMock = OCMClassMock([SDLFileManager class]);
@@ -73,7 +71,7 @@ describe(@"a lifecycle manager", ^{
     __block id systemCapabilityMock = OCMClassMock([SDLSystemCapabilityManager class]);
     
     beforeEach(^{
-        OCMStub([proxyBuilderClassMock buildSDLProxyWithListener:[OCMArg any]]).andReturn(proxyMock);
+        OCMStub([proxyMock iapProxyWithListener:[OCMArg any]]).andReturn(proxyMock);
         OCMStub([(SDLProxy*)proxyMock protocol]).andReturn(protocolMock);
         
         SDLLifecycleConfiguration *testLifecycleConfig = [SDLLifecycleConfiguration defaultConfigurationWithAppName:@"Test App" appId:@"Test Id"];
diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLMenuManagerSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLMenuManagerSpec.m
index 68678e230..abf411bde 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLMenuManagerSpec.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLMenuManagerSpec.m
@@ -309,6 +309,10 @@ describe(@"menu manager", ^{
             });
         });
     });
+
+    afterEach(^{
+        testManager = nil;
+    });
 });
 
 QuickSpecEnd
diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLResponseDispatcherSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLResponseDispatcherSpec.m
index 8adb0a6ad..410d24386 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLResponseDispatcherSpec.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLResponseDispatcherSpec.m
@@ -273,6 +273,7 @@ describe(@"a response dispatcher", ^{
                     beforeEach(^{
                         testOnCommand = [[SDLOnCommand alloc] init];
                         testOnCommand.cmdID = @(testCommandId);
+                        testOnCommand.triggerSource = SDLTriggerSourceMenu;
                         
                         SDLRPCNotificationNotification *commandNotification = [[SDLRPCNotificationNotification alloc] initWithName:SDLDidReceiveCommandNotification object:nil rpcNotification:testOnCommand];
                         
diff --git a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m
index 19c6ab857..4131fed51 100644
--- a/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m
+++ b/SmartDeviceLinkTests/ProtocolSpecs/MessageSpecs/SDLProtocolSpec.m
@@ -38,7 +38,7 @@ describe(@"Send StartService Tests", ^ {
             SDLProtocol* testProtocol = [[SDLProtocol alloc] init];
             
             __block BOOL verified = NO;
-            id transportMock = OCMClassMock([SDLAbstractTransport class]);
+            id transportMock = OCMProtocolMock(@protocol(SDLTransportType));
             [[[transportMock stub] andDo:^(NSInvocation* invocation) {
                 verified = YES;
                 
@@ -77,7 +77,7 @@ describe(@"Send EndSession Tests", ^ {
             [testProtocol handleProtocolStartServiceACKMessage:[SDLProtocolMessage messageWithHeader:testHeader andPayload:nil]];
             
             __block BOOL verified = NO;
-            id transportMock = OCMClassMock([SDLAbstractTransport class]);
+            id transportMock = OCMProtocolMock(@protocol(SDLTransportType));
             [[[transportMock stub] andDo:^(NSInvocation* invocation) {
                 verified = YES;
                 
@@ -106,7 +106,7 @@ describe(@"Send EndSession Tests", ^ {
             [testProtocol handleProtocolStartServiceACKMessage:[SDLProtocolMessage messageWithHeader:testHeader andPayload:nil]];
             
             __block BOOL verified = NO;
-            id transportMock = OCMClassMock([SDLAbstractTransport class]);
+            id transportMock = OCMProtocolMock(@protocol(SDLTransportType));
             [[[transportMock stub] andDo:^(NSInvocation* invocation) {
                 verified = YES;
                 
@@ -144,7 +144,7 @@ describe(@"SendRPCRequest Tests", ^ {
             [testProtocol handleProtocolStartServiceACKMessage:[SDLProtocolMessage messageWithHeader:testHeader andPayload:nil]];
             
             __block BOOL verified = NO;
-            id transportMock = OCMClassMock([SDLAbstractTransport class]);
+            id transportMock = OCMProtocolMock(@protocol(SDLTransportType));
             [[[transportMock stub] andDo:^(NSInvocation* invocation) {
                 verified = YES;
                 
@@ -184,7 +184,7 @@ describe(@"SendRPCRequest Tests", ^ {
             [testProtocol handleProtocolStartServiceACKMessage:[SDLProtocolMessage messageWithHeader:testHeader andPayload:nil]];
             
             __block BOOL verified = NO;
-            id transportMock = OCMClassMock([SDLAbstractTransport class]);
+            id transportMock = OCMProtocolMock(@protocol(SDLTransportType));
             [[[transportMock stub] andDo:^(NSInvocation* invocation) {
                 verified = YES;