Fix test warnings about meta methods

8 files changed, 79 insertions, 70 deletions

diff --git a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
index c96c92035..3437ce31a 100644
--- a/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
+++ b/SmartDeviceLink-iOS.xcodeproj/project.pbxproj
@@ -291,6 +291,7 @@
 		4A40254224FFDA660080E159 /* SDLTextAndGraphicUpdateOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A40253E24FFDA660080E159 /* SDLTextAndGraphicUpdateOperation.h */; };
 		4A40254324FFDA660080E159 /* SDLTextAndGraphicUpdateOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A40253F24FFDA660080E159 /* SDLTextAndGraphicUpdateOperation.m */; };
 		4A40254424FFDA660080E159 /* SDLTextAndGraphicState.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A40254024FFDA660080E159 /* SDLTextAndGraphicState.h */; };
+		4A40254B24FFE6A50080E159 /* EAAccessory+MockObjects.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A40254A24FFE6A50080E159 /* EAAccessory+MockObjects.m */; };
 		4A457DC324A2933E00386CBA /* SDLLifecycleRPCAdapterSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A457DC224A2933E00386CBA /* SDLLifecycleRPCAdapterSpec.m */; };
 		4A457DD324A3886700386CBA /* SDLLifecycleSyncPDataHandlerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A457DD224A3886700386CBA /* SDLLifecycleSyncPDataHandlerSpec.m */; };
 		4A457DD524A3C16E00386CBA /* SDLLifecycleMobileHMIStateHandlerSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A457DD424A3C16E00386CBA /* SDLLifecycleMobileHMIStateHandlerSpec.m */; };
@@ -1637,7 +1638,6 @@
 		88D0E5D824786770009469AB /* SDLSubscribeButtonObserverSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D0E5D724786770009469AB /* SDLSubscribeButtonObserverSpec.m */; };
 		88D2AAE41F682BB20078D5B2 /* SDLLogConstantsSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D2AAE31F682BB20078D5B2 /* SDLLogConstantsSpec.m */; };
 		88DDD0F9229ECA57002F9623 /* SDLIAPConstantsSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88DDD0F8229ECA57002F9623 /* SDLIAPConstantsSpec.m */; };
-		88DF998D22035CC600477AC1 /* EAAccessory+OCMock.m in Sources */ = {isa = PBXBuildFile; fileRef = 88DF998C22035CC600477AC1 /* EAAccessory+OCMock.m */; };
 		88DF998F22035D1700477AC1 /* SDLIAPSessionSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88DF998E22035D1700477AC1 /* SDLIAPSessionSpec.m */; };
 		88DF999122035D5A00477AC1 /* SDLIAPTransportSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88DF999022035D5A00477AC1 /* SDLIAPTransportSpec.m */; };
 		88E6F1AA220E1720006156F9 /* SDLMediaTypeSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88E6F1A9220E1720006156F9 /* SDLMediaTypeSpec.m */; };
@@ -2070,6 +2070,8 @@
 		4A40253E24FFDA660080E159 /* SDLTextAndGraphicUpdateOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDLTextAndGraphicUpdateOperation.h; path = private/SDLTextAndGraphicUpdateOperation.h; sourceTree = "<group>"; };
 		4A40253F24FFDA660080E159 /* SDLTextAndGraphicUpdateOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDLTextAndGraphicUpdateOperation.m; path = private/SDLTextAndGraphicUpdateOperation.m; sourceTree = "<group>"; };
 		4A40254024FFDA660080E159 /* SDLTextAndGraphicState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDLTextAndGraphicState.h; path = private/SDLTextAndGraphicState.h; sourceTree = "<group>"; };
+		4A40254924FFE6A50080E159 /* EAAccessory+MockObjects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "EAAccessory+MockObjects.h"; sourceTree = "<group>"; };
+		4A40254A24FFE6A50080E159 /* EAAccessory+MockObjects.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "EAAccessory+MockObjects.m"; sourceTree = "<group>"; };
 		4A457DC224A2933E00386CBA /* SDLLifecycleRPCAdapterSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SDLLifecycleRPCAdapterSpec.m; path = DevAPISpecs/SDLLifecycleRPCAdapterSpec.m; sourceTree = "<group>"; };
 		4A457DD224A3886700386CBA /* SDLLifecycleSyncPDataHandlerSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SDLLifecycleSyncPDataHandlerSpec.m; path = DevAPISpecs/SDLLifecycleSyncPDataHandlerSpec.m; sourceTree = "<group>"; };
 		4A457DD424A3C16E00386CBA /* SDLLifecycleMobileHMIStateHandlerSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SDLLifecycleMobileHMIStateHandlerSpec.m; path = DevAPISpecs/SDLLifecycleMobileHMIStateHandlerSpec.m; sourceTree = "<group>"; };
@@ -3461,7 +3463,6 @@
 		88D0E5D724786770009469AB /* SDLSubscribeButtonObserverSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLSubscribeButtonObserverSpec.m; sourceTree = "<group>"; };
 		88D2AAE31F682BB20078D5B2 /* SDLLogConstantsSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLLogConstantsSpec.m; sourceTree = "<group>"; };
 		88DDD0F8229ECA57002F9623 /* SDLIAPConstantsSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLIAPConstantsSpec.m; sourceTree = "<group>"; };
-		88DF998C22035CC600477AC1 /* EAAccessory+OCMock.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "EAAccessory+OCMock.m"; sourceTree = "<group>"; };
 		88DF998E22035D1700477AC1 /* SDLIAPSessionSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLIAPSessionSpec.m; sourceTree = "<group>"; };
 		88DF999022035D5A00477AC1 /* SDLIAPTransportSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLIAPTransportSpec.m; sourceTree = "<group>"; };
 		88E6F1A9220E1720006156F9 /* SDLMediaTypeSpec.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SDLMediaTypeSpec.m; sourceTree = "<group>"; };
@@ -4191,6 +4192,15 @@
 			name = "Update Operation";
 			sourceTree = "<group>";
 		};
+		4A40254524FFE6720080E159 /* Utilities */ = {
+			isa = PBXGroup;
+			children = (
+				4A40254924FFE6A50080E159 /* EAAccessory+MockObjects.h */,
+				4A40254A24FFE6A50080E159 /* EAAccessory+MockObjects.m */,
+			);
+			path = Utilities;
+			sourceTree = "<group>";
+		};
 		4A4AD8A12489422F008FC414 /* Utilities */ = {
 			isa = PBXGroup;
 			children = (
@@ -6685,7 +6695,7 @@
 		88DF998B22035CB100477AC1 /* iAP */ = {
 			isa = PBXGroup;
 			children = (
-				88DF998C22035CC600477AC1 /* EAAccessory+OCMock.m */,
+				4A40254524FFE6720080E159 /* Utilities */,
 				88DF998E22035D1700477AC1 /* SDLIAPSessionSpec.m */,
 				88DF999022035D5A00477AC1 /* SDLIAPTransportSpec.m */,
 				88BCEA942266592D00BB7E70 /* SDLIAPControlSessionSpec.m */,
@@ -8239,7 +8249,6 @@
 				88EF8EBA22D8F48300CB06C2 /* SDLCancelInteractionSpec.m in Sources */,
 				162E83041A9BDE8B00906325 /* SDLUpdateModeSpec.m in Sources */,
 				8855F9E0220C93B700A5C897 /* SDLWeatherDataSpec.m in Sources */,
-				88DF998D22035CC600477AC1 /* EAAccessory+OCMock.m in Sources */,
 				162E83801A9BDE8B00906325 /* SDLHMIPermissionsSpec.m in Sources */,
 				1EAA476C2036A52F000FE74B /* SDLLightCapabilitiesSpec.m in Sources */,
 				5D1654561D3E754F00554D93 /* SDLLifecycleManagerSpec.m in Sources */,
@@ -8680,6 +8689,7 @@
 				162E83401A9BDE8B00906325 /* SDLSpeakSpec.m in Sources */,
 				88A5E7F4220B57F900495E8A /* SDLOnSystemCapabilityUpdatedSpec.m in Sources */,
 				5DCF76FC1ACDDB4200BB647B /* SDLSendLocationSpec.m in Sources */,
+				4A40254B24FFE6A50080E159 /* EAAccessory+MockObjects.m in Sources */,
 				5DB1BCD81D243AA6002FFC37 /* SDLPermissionFilterSpec.m in Sources */,
 				88EEC5B8220A2144005AA2F9 /* SDLPublishAppServiceSpec.m in Sources */,
 				162E83561A9BDE8B00906325 /* SDLGenericResponseSpec.m in Sources */,
diff --git a/SmartDeviceLinkTests/TransportSpecs/iAP/EAAccessory+OCMock.m b/SmartDeviceLinkTests/TransportSpecs/iAP/EAAccessory+OCMock.m
deleted file mode 100644
index 1c32c4b73..000000000
--- a/SmartDeviceLinkTests/TransportSpecs/iAP/EAAccessory+OCMock.m
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-//  EAAccessory+OCMock.m
-//  SmartDeviceLinkTests
-//
-//  Created by Nicole on 1/24/19.
-//  Copyright © 2019 smartdevicelink. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-#import <OCMock/OCMock.h>
-#import <ExternalAccessory/ExternalAccessory.h>
-
-// Based off of the Pebble Accessory OCKMock by Heiko Behrens https://github.com/HBehrens/PebbleKit-ios-sdk-test/blob/master/PebbleVendor/EAAccessoryFramework%2BOCMock.m
-
-@implementation EAAccessory (OCMock)
-static id coreMockDelegate = nil;
-+ (EAAccessory *)sdlCoreMock {
-    id mockEAAccessory = OCMClassMock([EAAccessory class]);
-    OCMStub([mockEAAccessory protocolStrings]).andReturn(@[@"com.smartdevicelink.multisession"]);
-    [[[mockEAAccessory stub] andReturnValue:OCMOCK_VALUE((NSString *)@"SDLTestHeadUnit")] name];
-    OCMStub([mockEAAccessory modelNumber]).andReturn(@"0.0.0");
-    OCMStub([mockEAAccessory serialNumber]).andReturn(@"123456");
-    OCMStub([mockEAAccessory firmwareRevision]).andReturn(@"1.2.3");
-    OCMStub([mockEAAccessory hardwareRevision]).andReturn(@"3.2.1");
-    OCMStub([mockEAAccessory isConnected]).andReturn(OCMOCK_VALUE(YES));
-    OCMStub([mockEAAccessory setDelegate:[OCMArg checkWithBlock:^BOOL(id obj) {
-        coreMockDelegate = obj;
-        return YES;
-    }]]);
-    OCMStub([mockEAAccessory delegate]).andCall(self, @selector(coreDelegate));
-    [[[mockEAAccessory stub] andReturnValue:OCMOCK_VALUE((NSUInteger){5})] connectionID];
-
-    return mockEAAccessory;
-}
-- (id)coreDelegate {
-    return coreMockDelegate;
-}
-@end
-
-@implementation EAAccessoryManager (OCMock)
-+ (EAAccessoryManager *)mockManager {
-    id mockEAAccessoryManager = OCMClassMock([EAAccessoryManager class]);
-    id mockEAAccessory = [EAAccessory sdlCoreMock];
-    OCMStub([mockEAAccessoryManager connectedAccessories]).andReturn(@[mockEAAccessory]);
-    OCMStub([mockEAAccessory registerForLocalNotifications]);
-    OCMStub([mockEAAccessory unregisterForLocalNotifications]);
-    return mockEAAccessoryManager;
-}
-@end
-
-@implementation EASession (OCMock)
-+ (EASession *)mockSessionWithAccessory:(EAAccessory*)mockAccessory protocolString:(NSString*)mockProtocolString inputStream:(NSInputStream*)mockInputStream outputStream:(NSOutputStream*)mockOutputStream {
-    id session = OCMClassMock([EASession class]);
-    OCMStub([session accessory]).andReturn(mockAccessory);
-    OCMStub([session protocolString]).andReturn(mockProtocolString);
-    OCMStub([session inputStream]).andReturn(mockInputStream);
-    OCMStub([session outputStream]).andReturn(mockOutputStream);
-    return session;
-}
-@end
-
diff --git a/SmartDeviceLinkTests/TransportSpecs/iAP/SDLIAPControlSessionSpec.m b/SmartDeviceLinkTests/TransportSpecs/iAP/SDLIAPControlSessionSpec.m
index dbce3da78..038759920 100644
--- a/SmartDeviceLinkTests/TransportSpecs/iAP/SDLIAPControlSessionSpec.m
+++ b/SmartDeviceLinkTests/TransportSpecs/iAP/SDLIAPControlSessionSpec.m
@@ -12,7 +12,7 @@
 
 #import "SDLIAPControlSession.h"
 
-#import "EAAccessory+OCMock.m"
+#import "EAAccessory+MockObjects.h"
 #import "SDLIAPConstants.h"
 #import "SDLIAPControlSessionDelegate.h"
 #import "SDLIAPSession.h"
diff --git a/SmartDeviceLinkTests/TransportSpecs/iAP/SDLIAPDataSessionSpec.m b/SmartDeviceLinkTests/TransportSpecs/iAP/SDLIAPDataSessionSpec.m
index 5c6112373..9b888d003 100644
--- a/SmartDeviceLinkTests/TransportSpecs/iAP/SDLIAPDataSessionSpec.m
+++ b/SmartDeviceLinkTests/TransportSpecs/iAP/SDLIAPDataSessionSpec.m
@@ -12,7 +12,7 @@
 
 #import "SDLIAPDataSession.h"
 
-#import "EAAccessory+OCMock.m"
+#import "EAAccessory+MockObjects.h"
 #import "SDLIAPConstants.h"
 #import "SDLIAPSession.h"
 #import "SDLIAPDataSessionDelegate.h"
diff --git a/SmartDeviceLinkTests/TransportSpecs/iAP/SDLIAPSessionSpec.m b/SmartDeviceLinkTests/TransportSpecs/iAP/SDLIAPSessionSpec.m
index f253a1d44..7a0bef948 100644
--- a/SmartDeviceLinkTests/TransportSpecs/iAP/SDLIAPSessionSpec.m
+++ b/SmartDeviceLinkTests/TransportSpecs/iAP/SDLIAPSessionSpec.m
@@ -10,7 +10,7 @@
 #import <Nimble/Nimble.h>
 #import <OCMock/OCMock.h>
 
-#import "EAAccessory+OCMock.m"
+#import "EAAccessory+MockObjects.h"
 #import "SDLIAPSession.h"
 #import "SDLIAPConstants.h"
 
diff --git a/SmartDeviceLinkTests/TransportSpecs/iAP/SDLIAPTransportSpec.m b/SmartDeviceLinkTests/TransportSpecs/iAP/SDLIAPTransportSpec.m
index 808ba33bf..0a244b97d 100644
--- a/SmartDeviceLinkTests/TransportSpecs/iAP/SDLIAPTransportSpec.m
+++ b/SmartDeviceLinkTests/TransportSpecs/iAP/SDLIAPTransportSpec.m
@@ -10,7 +10,7 @@
 #import <Nimble/Nimble.h>
 #import <OCMock/OCMock.h>
 
-#import "EAAccessory+OCMock.m"
+#import "EAAccessory+MockObjects.h"
 #import "SDLIAPConstants.h"
 #import "SDLIAPTransport.h"
 #import "SDLIAPSession.h"
diff --git a/SmartDeviceLinkTests/TransportSpecs/iAP/Utilities/EAAccessory+MockObjects.h b/SmartDeviceLinkTests/TransportSpecs/iAP/Utilities/EAAccessory+MockObjects.h
new file mode 100644
index 000000000..705b94084
--- /dev/null
+++ b/SmartDeviceLinkTests/TransportSpecs/iAP/Utilities/EAAccessory+MockObjects.h
@@ -0,0 +1,19 @@
+//
+//  EAAccessory+MockObjects.h
+//  SmartDeviceLinkTests
+//
+//  Created by Joel Fischer on 9/2/20.
+//  Copyright © 2020 smartdevicelink. All rights reserved.
+//
+
+#import <ExternalAccessory/ExternalAccessory.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface EAAccessory (MockObjects)
+
++ (EAAccessory *)sdlCoreMock;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLinkTests/TransportSpecs/iAP/Utilities/EAAccessory+MockObjects.m b/SmartDeviceLinkTests/TransportSpecs/iAP/Utilities/EAAccessory+MockObjects.m
new file mode 100644
index 000000000..9bad7831e
--- /dev/null
+++ b/SmartDeviceLinkTests/TransportSpecs/iAP/Utilities/EAAccessory+MockObjects.m
@@ -0,0 +1,42 @@
+//
+//  EAAccessory+MockObjects.m
+//  SmartDeviceLinkTests
+//
+//  Created by Joel Fischer on 9/2/20.
+//  Copyright © 2020 smartdevicelink. All rights reserved.
+//
+
+#import "EAAccessory+MockObjects.h"
+
+#import <OCMock/OCMock.h>
+
+// Based off of the Pebble Accessory OCKMock by Heiko Behrens https://github.com/HBehrens/PebbleKit-ios-sdk-test/blob/master/PebbleVendor/EAAccessoryFramework%2BOCMock.m
+
+@implementation EAAccessory (MockObjects)
+
+static id coreMockDelegate = nil;
+
++ (EAAccessory *)sdlCoreMock {
+    id mockEAAccessory = OCMClassMock([EAAccessory class]);
+    OCMStub([mockEAAccessory protocolStrings]).andReturn(@[@"com.smartdevicelink.multisession"]);
+    [[[mockEAAccessory stub] andReturnValue:OCMOCK_VALUE((NSString *)@"SDLTestHeadUnit")] name];
+    OCMStub([mockEAAccessory modelNumber]).andReturn(@"0.0.0");
+    OCMStub([mockEAAccessory serialNumber]).andReturn(@"123456");
+    OCMStub([mockEAAccessory firmwareRevision]).andReturn(@"1.2.3");
+    OCMStub([mockEAAccessory hardwareRevision]).andReturn(@"3.2.1");
+    OCMStub([mockEAAccessory isConnected]).andReturn(OCMOCK_VALUE(YES));
+    OCMStub([mockEAAccessory setDelegate:[OCMArg checkWithBlock:^BOOL(id obj) {
+        coreMockDelegate = obj;
+        return YES;
+    }]]);
+    OCMStub([mockEAAccessory delegate]).andCall(self, @selector(coreDelegate));
+    [[[mockEAAccessory stub] andReturnValue:OCMOCK_VALUE((NSUInteger){5})] connectionID];
+
+    return mockEAAccessory;
+}
+
++ (id)coreDelegate {
+    return coreMockDelegate;
+}
+
+@end