diff --git a/Classes/BITLocation.h b/Classes/BITLocation.h deleted file mode 100644 index bdc43792ba..0000000000 --- a/Classes/BITLocation.h +++ /dev/null @@ -1,7 +0,0 @@ -#import "BITTelemetryObject.h" - -@interface BITLocation : BITTelemetryObject - -@property (nonatomic, copy) NSString *ip; - -@end diff --git a/Classes/BITLocation.m b/Classes/BITLocation.m deleted file mode 100644 index f6ee37c77c..0000000000 --- a/Classes/BITLocation.m +++ /dev/null @@ -1,35 +0,0 @@ -#import "BITLocation.h" -#import "BITOrderedDictionary.h" - -/// Data contract class for type Location. -@implementation BITLocation - -/// -/// Adds all members of this class to a dictionary -/// @param dictionary to which the members of this class will be added. -/// -- (BITOrderedDictionary *)serializeToDictionary { - BITOrderedDictionary *dict = [super serializeToDictionary]; - if (self.ip != nil) { - [dict setObject:self.ip forKey:@"ai.location.ip"]; - } - return dict; -} - -#pragma mark - NSCoding - -- (instancetype)initWithCoder:(NSCoder *)coder { - self = [super init]; - if(self) { - _ip = [coder decodeObjectForKey:@"self.ip"]; - } - - return self; -} - -- (void)encodeWithCoder:(NSCoder *)coder { - [coder encodeObject:self.ip forKey:@"self.ip"]; -} - - -@end diff --git a/Classes/BITOperation.h b/Classes/BITOperation.h deleted file mode 100755 index 5dc2255e85..0000000000 --- a/Classes/BITOperation.h +++ /dev/null @@ -1,12 +0,0 @@ -#import "BITTelemetryObject.h" - -@interface BITOperation : BITTelemetryObject - -@property (nonatomic, copy) NSString *operationId; -@property (nonatomic, copy) NSString *name; -@property (nonatomic, copy) NSString *parentId; -@property (nonatomic, copy) NSString *rootId; -@property (nonatomic, copy) NSString *syntheticSource; -@property (nonatomic, copy) NSString *isSynthetic; - -@end diff --git a/Classes/BITOperation.m b/Classes/BITOperation.m deleted file mode 100755 index 27eb2b8537..0000000000 --- a/Classes/BITOperation.m +++ /dev/null @@ -1,60 +0,0 @@ -#import "BITOperation.h" -#import "BITOrderedDictionary.h" - -/// Data contract class for type Operation. -@implementation BITOperation - -/// -/// Adds all members of this class to a dictionary -/// @param dictionary to which the members of this class will be added. -/// -- (BITOrderedDictionary *)serializeToDictionary { - BITOrderedDictionary *dict = [super serializeToDictionary]; - if (self.operationId != nil) { - [dict setObject:self.operationId forKey:@"ai.operation.id"]; - } - if (self.name != nil) { - [dict setObject:self.name forKey:@"ai.operation.name"]; - } - if (self.parentId != nil) { - [dict setObject:self.parentId forKey:@"ai.operation.parentId"]; - } - if (self.rootId != nil) { - [dict setObject:self.rootId forKey:@"ai.operation.rootId"]; - } - if (self.syntheticSource != nil) { - [dict setObject:self.syntheticSource forKey:@"ai.operation.syntheticSource"]; - } - if(self.isSynthetic != nil) { - [dict setObject:self.isSynthetic forKey:@"ai.operation.isSynthetic"]; - } - return dict; -} - -#pragma mark - NSCoding - -- (instancetype)initWithCoder:(NSCoder *)coder { - self = [super initWithCoder:coder]; - if(self) { - _operationId = [coder decodeObjectForKey:@"self.operationId"]; - _name = [coder decodeObjectForKey:@"self.name"]; - _parentId = [coder decodeObjectForKey:@"self.parentId"]; - _rootId = [coder decodeObjectForKey:@"self.rootId"]; - _syntheticSource = [coder decodeObjectForKey:@"self.syntheticSource"]; - _isSynthetic = [coder decodeObjectForKey:@"self.isSynthetic"]; - } - - return self; -} - -- (void)encodeWithCoder:(NSCoder *)coder { - [super encodeWithCoder:coder]; - [coder encodeObject:self.operationId forKey:@"self.operationId"]; - [coder encodeObject:self.name forKey:@"self.name"]; - [coder encodeObject:self.parentId forKey:@"self.parentId"]; - [coder encodeObject:self.rootId forKey:@"self.rootId"]; - [coder encodeObject:self.syntheticSource forKey:@"self.syntheticSource"]; - [coder encodeObject:self.isSynthetic forKey:@"self.isSynthetic"]; -} - -@end diff --git a/Classes/BITTelemetryContext.h b/Classes/BITTelemetryContext.h index 26785e02c1..9a113452ae 100644 --- a/Classes/BITTelemetryContext.h +++ b/Classes/BITTelemetryContext.h @@ -6,11 +6,9 @@ #import "HockeySDKPrivate.h" #import "BITApplication.h" #import "BITDevice.h" -#import "BITOperation.h" #import "BITInternal.h" #import "BITUser.h" #import "BITSession.h" -#import "BITLocation.h" @class BITPersistence; @@ -52,11 +50,6 @@ FOUNDATION_EXPORT NSString *const kBITApplicationWasLaunched; */ @property (nonatomic, strong, readonly)BITDevice *device; -/** - * The location context. - */ -@property (nonatomic, strong, readonly)BITLocation *location; - /** * The session context. */ @@ -72,11 +65,6 @@ FOUNDATION_EXPORT NSString *const kBITApplicationWasLaunched; */ @property (nonatomic, strong, readonly)BITInternal *internal; -/** - * The operation context. - */ -@property (nonatomic, strong, readonly)BITOperation *operation; - /** * Initializes a telemetry context. * diff --git a/Classes/BITTelemetryContext.m b/Classes/BITTelemetryContext.m index 39955e47c8..21ffd008ad 100644 --- a/Classes/BITTelemetryContext.m +++ b/Classes/BITTelemetryContext.m @@ -51,23 +51,18 @@ static char *const BITContextOperationsQueue = "net.hockeyapp.telemetryContextQu BITApplication *applicationContext = [BITApplication new]; applicationContext.version = bit_appVersion(); - BITOperation *operationContext = [BITOperation new]; - BITUser *userContext = [self loadUser]; if (!userContext) { userContext = [self newUser]; [self saveUser:userContext]; } - - BITLocation *locationContext = [BITLocation new]; + BITSession *sessionContext = [BITSession new]; _application = applicationContext; _device = deviceContext; - _location = locationContext; _user = userContext; _internal = internalContext; - _operation = operationContext; _session = sessionContext; _tags = [self tags]; @@ -448,9 +443,7 @@ static char *const BITContextOperationsQueue = "net.hockeyapp.telemetryContextQu if(!_tags){ _tags = [self.application serializeToDictionary]; [_tags addEntriesFromDictionary:[self.application serializeToDictionary]]; - [_tags addEntriesFromDictionary:[self.location serializeToDictionary]]; [_tags addEntriesFromDictionary:[self.internal serializeToDictionary]]; - [_tags addEntriesFromDictionary:[self.operation serializeToDictionary]]; } return _tags; } diff --git a/Support/HockeySDK.xcodeproj/project.pbxproj b/Support/HockeySDK.xcodeproj/project.pbxproj index 8e42703b00..24994ea5d7 100644 --- a/Support/HockeySDK.xcodeproj/project.pbxproj +++ b/Support/HockeySDK.xcodeproj/project.pbxproj @@ -53,10 +53,6 @@ 1B330A7A1B98E64A007844AB /* BITApplication.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B330A771B98E64A007844AB /* BITApplication.h */; }; 1B330A7B1B98E64A007844AB /* BITApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B330A781B98E64A007844AB /* BITApplication.m */; }; 1B330A7C1B98E64A007844AB /* BITApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B330A781B98E64A007844AB /* BITApplication.m */; }; - 1B330A7F1B98E6A2007844AB /* BITOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B330A7D1B98E6A2007844AB /* BITOperation.h */; }; - 1B330A801B98E6A2007844AB /* BITOperation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B330A7D1B98E6A2007844AB /* BITOperation.h */; }; - 1B330A811B98E6A2007844AB /* BITOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B330A7E1B98E6A2007844AB /* BITOperation.m */; }; - 1B330A821B98E6A2007844AB /* BITOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B330A7E1B98E6A2007844AB /* BITOperation.m */; }; 1B330A851B98E6F7007844AB /* BITInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B330A831B98E6F7007844AB /* BITInternal.h */; }; 1B330A861B98E6F7007844AB /* BITInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B330A831B98E6F7007844AB /* BITInternal.h */; }; 1B330A871B98E6F7007844AB /* BITInternal.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B330A841B98E6F7007844AB /* BITInternal.m */; }; @@ -65,10 +61,6 @@ 1B330A8C1B98E789007844AB /* BITUser.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B330A891B98E789007844AB /* BITUser.h */; }; 1B330A8D1B98E789007844AB /* BITUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B330A8A1B98E789007844AB /* BITUser.m */; }; 1B330A8E1B98E789007844AB /* BITUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B330A8A1B98E789007844AB /* BITUser.m */; }; - 1B330A911B98EDE5007844AB /* BITLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B330A8F1B98EDE5007844AB /* BITLocation.h */; }; - 1B330A921B98EDE5007844AB /* BITLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 1B330A8F1B98EDE5007844AB /* BITLocation.h */; }; - 1B330A931B98EDE5007844AB /* BITLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B330A901B98EDE5007844AB /* BITLocation.m */; }; - 1B330A941B98EDE5007844AB /* BITLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B330A901B98EDE5007844AB /* BITLocation.m */; }; 1B460AA41B8E5D910000C344 /* BITTestsDependencyInjection.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B460AA31B8E5D910000C344 /* BITTestsDependencyInjection.m */; }; 1B460AA51B8E5D910000C344 /* BITTestsDependencyInjection.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B460AA31B8E5D910000C344 /* BITTestsDependencyInjection.m */; }; 1B460AB11B8E64AF0000C344 /* libOCMock.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1B460AB01B8E64AF0000C344 /* libOCMock.a */; }; @@ -125,10 +117,6 @@ 1B98D48C1B9A1B6F00B8000B /* BITDomainTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B98D47E1B9A1B6F00B8000B /* BITDomainTests.m */; }; 1B98D48D1B9A1B6F00B8000B /* BITInternalTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B98D47F1B9A1B6F00B8000B /* BITInternalTests.m */; }; 1B98D48E1B9A1B6F00B8000B /* BITInternalTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B98D47F1B9A1B6F00B8000B /* BITInternalTests.m */; }; - 1B98D48F1B9A1B6F00B8000B /* BITLocationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B98D4801B9A1B6F00B8000B /* BITLocationTests.m */; }; - 1B98D4901B9A1B6F00B8000B /* BITLocationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B98D4801B9A1B6F00B8000B /* BITLocationTests.m */; }; - 1B98D4911B9A1B6F00B8000B /* BITOperationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B98D4811B9A1B6F00B8000B /* BITOperationTests.m */; }; - 1B98D4921B9A1B6F00B8000B /* BITOperationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B98D4811B9A1B6F00B8000B /* BITOperationTests.m */; }; 1B98D4931B9A1B6F00B8000B /* BITUserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B98D4821B9A1B6F00B8000B /* BITUserTests.m */; }; 1B98D4941B9A1B6F00B8000B /* BITUserTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B98D4821B9A1B6F00B8000B /* BITUserTests.m */; }; 1B98D4961B9A1CFD00B8000B /* BITReachabilityTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1B98D4951B9A1CFD00B8000B /* BITReachabilityTests.m */; }; @@ -495,14 +483,10 @@ 1B330A6F1B98E267007844AB /* BITTelemetryContext.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITTelemetryContext.m; sourceTree = ""; }; 1B330A771B98E64A007844AB /* BITApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITApplication.h; sourceTree = ""; }; 1B330A781B98E64A007844AB /* BITApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITApplication.m; sourceTree = ""; }; - 1B330A7D1B98E6A2007844AB /* BITOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITOperation.h; sourceTree = ""; }; - 1B330A7E1B98E6A2007844AB /* BITOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITOperation.m; sourceTree = ""; }; 1B330A831B98E6F7007844AB /* BITInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITInternal.h; sourceTree = ""; }; 1B330A841B98E6F7007844AB /* BITInternal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITInternal.m; sourceTree = ""; }; 1B330A891B98E789007844AB /* BITUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITUser.h; sourceTree = ""; }; 1B330A8A1B98E789007844AB /* BITUser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITUser.m; sourceTree = ""; }; - 1B330A8F1B98EDE5007844AB /* BITLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITLocation.h; sourceTree = ""; }; - 1B330A901B98EDE5007844AB /* BITLocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITLocation.m; sourceTree = ""; }; 1B460AA21B8E5D910000C344 /* BITTestsDependencyInjection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BITTestsDependencyInjection.h; sourceTree = ""; }; 1B460AA31B8E5D910000C344 /* BITTestsDependencyInjection.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITTestsDependencyInjection.m; sourceTree = ""; }; 1B460AA71B8E64A60000C344 /* NSNotificationCenter+OCMAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSNotificationCenter+OCMAdditions.h"; sourceTree = ""; }; @@ -542,8 +526,6 @@ 1B98D47D1B9A1B6F00B8000B /* BITDeviceTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITDeviceTests.m; sourceTree = ""; }; 1B98D47E1B9A1B6F00B8000B /* BITDomainTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITDomainTests.m; sourceTree = ""; }; 1B98D47F1B9A1B6F00B8000B /* BITInternalTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITInternalTests.m; sourceTree = ""; }; - 1B98D4801B9A1B6F00B8000B /* BITLocationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITLocationTests.m; sourceTree = ""; }; - 1B98D4811B9A1B6F00B8000B /* BITOperationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITOperationTests.m; sourceTree = ""; }; 1B98D4821B9A1B6F00B8000B /* BITUserTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITUserTests.m; sourceTree = ""; }; 1B98D4951B9A1CFD00B8000B /* BITReachabilityTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BITReachabilityTests.m; sourceTree = ""; }; 1B98D4981B9A1D9F00B8000B /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; @@ -872,11 +854,7 @@ 1B330A541B98DEB4007844AB /* BITEnvelope.m */, 1B330A831B98E6F7007844AB /* BITInternal.h */, 1B330A841B98E6F7007844AB /* BITInternal.m */, - 1B330A8F1B98EDE5007844AB /* BITLocation.h */, - 1B330A901B98EDE5007844AB /* BITLocation.m */, 1B6852DB1B95361D00D5C387 /* BITSessionState.h */, - 1B330A7D1B98E6A2007844AB /* BITOperation.h */, - 1B330A7E1B98E6A2007844AB /* BITOperation.m */, 1B87EFBA1B8D2EF50007C96B /* BITSession.h */, 1B87EFBB1B8D2EF50007C96B /* BITSession.m */, 1B6852DC1B95361D00D5C387 /* BITSessionStateData.h */, @@ -902,8 +880,6 @@ 1B98D47D1B9A1B6F00B8000B /* BITDeviceTests.m */, 1B98D47E1B9A1B6F00B8000B /* BITDomainTests.m */, 1B98D47F1B9A1B6F00B8000B /* BITInternalTests.m */, - 1B98D4801B9A1B6F00B8000B /* BITLocationTests.m */, - 1B98D4811B9A1B6F00B8000B /* BITOperationTests.m */, 1B98D4821B9A1B6F00B8000B /* BITUserTests.m */, ); name = "Contract Files"; @@ -1381,9 +1357,7 @@ 1E0FEE28173BDB260061331F /* BITKeychainUtils.h in Headers */, 1E94F9E416E9136B006570AD /* BITStoreUpdateManagerPrivate.h in Headers */, 1B87EFC91B8D30AC0007C96B /* BITOrderedDictionary.h in Headers */, - 1B330A7F1B98E6A2007844AB /* BITOperation.h in Headers */, 9760F6CF18BB685600959B93 /* BITImageAnnotation.h in Headers */, - 1B330A911B98EDE5007844AB /* BITLocation.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1462,9 +1436,7 @@ 1EB617AD1B0A31BF0035A986 /* BITHockeyManagerDelegate.h in Headers */, 1EB617971B0A31580035A986 /* BITBlurImageAnnotation.h in Headers */, 1B87EFCA1B8D30AC0007C96B /* BITOrderedDictionary.h in Headers */, - 1B330A801B98E6A2007844AB /* BITOperation.h in Headers */, 1EB617611B0A30A50035A986 /* BITHockeyBaseViewController.h in Headers */, - 1B330A921B98EDE5007844AB /* BITLocation.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1771,7 +1743,6 @@ 1ECA8F52192B6954006B9416 /* BITCrashMetaData.m in Sources */, 1B330A571B98DEB4007844AB /* BITEnvelope.m in Sources */, E4933E8117B66CDA00B11ACC /* BITHTTPOperation.m in Sources */, - 1B330A811B98E6A2007844AB /* BITOperation.m in Sources */, 1E49A45A1612223B00463151 /* BITFeedbackMessage.m in Sources */, 1B6852E21B95361D00D5C387 /* BITSessionStateData.m in Sources */, 1ED570C818BF878C00AB3350 /* BITCrashAttachment.m in Sources */, @@ -1786,7 +1757,6 @@ E4B4DB7E17B435550099C67F /* BITAuthenticationViewController.m in Sources */, 1B87EFBE1B8D2EF50007C96B /* BITSession.m in Sources */, 1E49A4B2161222B900463151 /* BITHockeyBaseManager.m in Sources */, - 1B330A931B98EDE5007844AB /* BITLocation.m in Sources */, 1B98D45C1B98F6CA00B8000B /* BITReachability.m in Sources */, B27FBEFF1B9622700082406A /* BITPersistence.m in Sources */, 973EC8C018BE2B5B00DBFFBB /* BITBlurImageAnnotation.m in Sources */, @@ -1844,8 +1814,6 @@ E48A3DEF17B3EFF100924C3D /* BITAuthenticatorTests.m in Sources */, B274DDB31B966914007F2B9E /* BITPersistenceTests.m in Sources */, 1EA1170716F53B91001C015C /* BITTestHelper.m in Sources */, - 1B98D4911B9A1B6F00B8000B /* BITOperationTests.m in Sources */, - 1B98D48F1B9A1B6F00B8000B /* BITLocationTests.m in Sources */, 1B98D4891B9A1B6F00B8000B /* BITDeviceTests.m in Sources */, 1E61CCAF18E0585A00A5E38E /* BITFeedbackManagerTests.m in Sources */, 1BD33EAA1B950BC200C3368B /* BITSessionTests.m in Sources */, @@ -1874,7 +1842,6 @@ 1EB617871B0A31510035A986 /* BITBlurImageAnnotation.m in Sources */, 1B330A581B98DEB4007844AB /* BITEnvelope.m in Sources */, 1EB617941B0A31510035A986 /* BITStoreUpdateManager.m in Sources */, - 1B330A821B98E6A2007844AB /* BITOperation.m in Sources */, 1EB6177F1B0A31230035A986 /* BITCrashReportTextFormatter.m in Sources */, 1B6852E31B95361D00D5C387 /* BITSessionStateData.m in Sources */, 1EB6178D1B0A31510035A986 /* BITFeedbackListViewController.m in Sources */, @@ -1889,7 +1856,6 @@ 1EB617721B0A30E40035A986 /* BITAuthenticationViewController.m in Sources */, 1B87EFBF1B8D2EF50007C96B /* BITSession.m in Sources */, 1EB617851B0A313A0035A986 /* BITRectangleImageAnnotation.m in Sources */, - 1B330A941B98EDE5007844AB /* BITLocation.m in Sources */, 1B98D45D1B98F6CA00B8000B /* BITReachability.m in Sources */, B27FBF001B9622700082406A /* BITPersistence.m in Sources */, 1EB6177E1B0A31200035A986 /* BITCrashAttachment.m in Sources */, @@ -1940,8 +1906,6 @@ 1EB617B41B0A31D30035A986 /* BITHockeyAppClientTests.m in Sources */, B274DDB41B96691E007F2B9E /* BITPersistenceTests.m in Sources */, 1EB617D71B0A387B0035A986 /* BITAuthenticatorTests.m in Sources */, - 1B98D4921B9A1B6F00B8000B /* BITOperationTests.m in Sources */, - 1B98D4901B9A1B6F00B8000B /* BITLocationTests.m in Sources */, 1B98D48A1B9A1B6F00B8000B /* BITDeviceTests.m in Sources */, 1EB617B61B0A31D30035A986 /* BITHockeyHelperTests.m in Sources */, 1BD33EAB1B950BC200C3368B /* BITSessionTests.m in Sources */, diff --git a/Support/HockeySDKTests/BITLocationTests.m b/Support/HockeySDKTests/BITLocationTests.m deleted file mode 100644 index 7bc9368a74..0000000000 --- a/Support/HockeySDKTests/BITLocationTests.m +++ /dev/null @@ -1,31 +0,0 @@ -#import -#import "BITLocation.h" - -@interface BITLocationTests : XCTestCase - -@end - -@implementation BITLocationTests - -- (void)testipPropertyWorksAsExpected { - NSString *expected = @"Test string"; - BITLocation *item = [BITLocation new]; - item.ip = expected; - NSString *actual = item.ip; - XCTAssertTrue([actual isEqualToString:expected]); - - expected = @"Other string"; - item.ip = expected; - actual = item.ip; - XCTAssertTrue([actual isEqualToString:expected]); -} - -- (void)testSerialize { - BITLocation *item = [BITLocation new]; - item.ip = @"Test string"; - NSString *actual = [item serializeToString]; - NSString *expected = @"{\"ai.location.ip\":\"Test string\"}"; - XCTAssertTrue([actual isEqualToString:expected]); -} - -@end diff --git a/Support/HockeySDKTests/BITOperationTests.m b/Support/HockeySDKTests/BITOperationTests.m deleted file mode 100644 index 7929d80656..0000000000 --- a/Support/HockeySDKTests/BITOperationTests.m +++ /dev/null @@ -1,75 +0,0 @@ -#import -#import "BITOperation.h" - -@interface BITOperationTests : XCTestCase - -@end - -@implementation BITOperationTests - -- (void)testidPropertyWorksAsExpected { - NSString *expected = @"Test string"; - BITOperation *item = [BITOperation new]; - item.operationId = expected; - NSString *actual = item.operationId; - XCTAssertTrue([actual isEqualToString:expected]); - - expected = @"Other string"; - item.operationId = expected; - actual = item.operationId; - XCTAssertTrue([actual isEqualToString:expected]); -} - -- (void)testnamePropertyWorksAsExpected { - NSString *expected = @"Test string"; - BITOperation *item = [BITOperation new]; - item.name = expected; - NSString *actual = item.name; - XCTAssertTrue([actual isEqualToString:expected]); - - expected = @"Other string"; - item.name = expected; - actual = item.name; - XCTAssertTrue([actual isEqualToString:expected]); -} - -- (void)testparent_idPropertyWorksAsExpected { - NSString *expected = @"Test string"; - BITOperation *item = [BITOperation new]; - item.parentId = expected; - NSString *actual = item.parentId; - XCTAssertTrue([actual isEqualToString:expected]); - - expected = @"Other string"; - item.parentId = expected; - actual = item.parentId; - XCTAssertTrue([actual isEqualToString:expected]); -} - -- (void)testroot_idPropertyWorksAsExpected { - NSString *expected = @"Test string"; - BITOperation *item = [BITOperation new]; - item.rootId = expected; - NSString *actual = item.rootId; - XCTAssertTrue([actual isEqualToString:expected]); - - expected = @"Other string"; - item.rootId = expected; - actual = item.rootId; - XCTAssertTrue([actual isEqualToString:expected]); -} - -- (void)testSerialize { - BITOperation *item = [BITOperation new]; - item.operationId = @"Test string"; - item.name = @"Test string"; - item.parentId = @"Test string"; - item.rootId = @"Test string"; - item.syntheticSource = @"Test source"; - item.isSynthetic = @"false"; - NSString *actual = [item serializeToString]; - NSString *expected = @"{\"ai.operation.id\":\"Test string\",\"ai.operation.name\":\"Test string\",\"ai.operation.parentId\":\"Test string\",\"ai.operation.rootId\":\"Test string\",\"ai.operation.syntheticSource\":\"Test source\",\"ai.operation.isSynthetic\":false}"; - XCTAssertTrue([actual isEqualToString:expected]); -} - -@end