Fix tests

3 files changed, 16 insertions, 9 deletions

diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLConfigurationSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLConfigurationSpec.m
index b7d314960..38fb36ec9 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLConfigurationSpec.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLConfigurationSpec.m
@@ -20,7 +20,8 @@ describe(@"a configuration", ^{
         __block SDLLogConfiguration *someLogConfig = nil;
         __block SDLStreamingMediaConfiguration *someStreamingConfig = nil;
         __block SDLFileManagerConfiguration *someFileManagerConfig = nil;
-        
+        __block SDLEncryptionConfiguration *someEncryptionConfig = nil;
+
         __block NSString *someAppName = nil;
         __block NSString *someAppId = nil;
         __block UIColor *someBackgroundColor = nil;
@@ -37,6 +38,7 @@ describe(@"a configuration", ^{
             someLogConfig = [SDLLogConfiguration defaultConfiguration];
             someStreamingConfig  = [SDLStreamingMediaConfiguration insecureConfiguration];
             someFileManagerConfig = [SDLFileManagerConfiguration defaultConfiguration];
+            someEncryptionConfig = [SDLEncryptionConfiguration defaultConfiguration];
         });
 
         it(@"initWithLifecycle:lockScreen:logging:", ^{
@@ -53,13 +55,14 @@ describe(@"a configuration", ^{
         });
 
         it(@"initWithLifecycle:lockScreen:logging:fileManager:", ^{
-            testConfig = [[SDLConfiguration alloc] initWithLifecycle:someLifecycleConfig lockScreen:someLockscreenConfig logging:someLogConfig fileManager:someFileManagerConfig encryption: nil];
+            testConfig = [[SDLConfiguration alloc] initWithLifecycle:someLifecycleConfig lockScreen:someLockscreenConfig logging:someLogConfig fileManager:someFileManagerConfig encryption: someEncryptionConfig];
 
             expect(testConfig.lifecycleConfig).to(equal(someLifecycleConfig));
             expect(testConfig.lockScreenConfig).to(equal(someLockscreenConfig));
             expect(testConfig.loggingConfig).to(equal(someLogConfig));
             expect(testConfig.streamingMediaConfig).to(beNil());
             expect(testConfig.fileManagerConfig).to(equal(someFileManagerConfig));
+            expect(testConfig.encryptionConfig).to(equal(someEncryptionConfig));
         });
 
         it(@"configurationWithLifecycle:lockScreen:logging:", ^{
diff --git a/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m b/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m
index 8e0d85c5b..4328d3af3 100644
--- a/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m
+++ b/SmartDeviceLinkTests/DevAPISpecs/SDLLifecycleManagerSpec.m
@@ -102,7 +102,7 @@ describe(@"a lifecycle manager", ^{
     };
 
     beforeEach(^{
-        OCMStub([proxyMock iapProxyWithListener:[OCMArg any] secondaryTransportManager:[OCMArg any]]).andReturn(proxyMock);
+        OCMStub([proxyMock iapProxyWithListener:[OCMArg any] secondaryTransportManager:[OCMArg any] encryptionLifecycleManager:[OCMArg any]]).andReturn(proxyMock);
         OCMStub([(SDLProxy*)proxyMock protocol]).andReturn(protocolMock);
         
         SDLLifecycleConfiguration *testLifecycleConfig = [SDLLifecycleConfiguration defaultConfigurationWithAppName:@"Test App" appId:@"Test Id"];
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m
index 7128f6760..7b316929c 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnPermissionsChangeSpec.m
@@ -15,30 +15,34 @@
 
 QuickSpecBegin(SDLOnPermissionsChangeSpec)
 
-SDLPermissionItem *item = [[SDLPermissionItem alloc] init];
-
 describe(@"Getter/Setter Tests", ^ {
+    __block SDLPermissionItem *testPermissionItem = nil;
+    
+    beforeEach(^{
+        testPermissionItem = [[SDLPermissionItem alloc] init];
+    });
+
     it(@"Should set and get correctly", ^ {
         SDLOnPermissionsChange *testNotification = [[SDLOnPermissionsChange alloc] init];
         
-        testNotification.permissionItem = [@[item] mutableCopy];
+        testNotification.permissionItem = [@[testPermissionItem] mutableCopy];
         testNotification.requireEncryption = @YES;
 
-        expect(testNotification.permissionItem).to(equal([@[item] mutableCopy]));
+        expect(testNotification.permissionItem).to(equal([@[testPermissionItem] mutableCopy]));
         expect(testNotification.requireEncryption.boolValue).to(beTrue());
     });
     
     it(@"Should get correctly when initialized", ^ {
         NSMutableDictionary<NSString *, id> *dict = [@{SDLRPCParameterNameNotification:
                                                            @{SDLRPCParameterNameParameters:
-                                                                 @{SDLRPCParameterNamePermissionItem:@[item],
+                                                                 @{SDLRPCParameterNamePermissionItem:@[testPermissionItem],
                                                                    SDLRPCParameterNameRequireEncryption:@YES}, SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnPermissionsChange}} mutableCopy];
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
         SDLOnPermissionsChange* testNotification = [[SDLOnPermissionsChange alloc] initWithDictionary:dict];
 #pragma clang diagnostic pop
         
-        expect(testNotification.permissionItem).to(equal([@[item] mutableCopy]));
+        expect(testNotification.permissionItem).to(equal([@[testPermissionItem] mutableCopy]));
         expect(testNotification.requireEncryption.boolValue).to(beTrue());
     });