diff --git a/KeePassKit b/KeePassKit index 8decbd49..da76d93b 160000 --- a/KeePassKit +++ b/KeePassKit @@ -1 +1 @@ -Subproject commit 8decbd49096d7f48618321fd3bbb1ca40d6a0f43 +Subproject commit da76d93bb36aafe0ad78f731e56ed3bafd6edbdb diff --git a/MacPassTests/KPKIconLoading.m b/MacPassTests/KPKIconLoading.m index 09ad5758..a73d14c4 100644 --- a/MacPassTests/KPKIconLoading.m +++ b/MacPassTests/KPKIconLoading.m @@ -21,7 +21,8 @@ - (void)setUp { NSBundle *myBundle = [NSBundle bundleForClass:[self class]]; _image = [myBundle imageForResource:@"image.png"]; - _imageData = [[[_image representations] lastObject] representationUsingType:NSPNGFileType properties:nil]; + _imageData = [_image TIFFRepresentation]; + //_imageData = [_image.representations.lastObject representationUsingType:NSPNGFileType properties:nil]; } - (void)tearDown { @@ -34,16 +35,16 @@ NSURL *imageURL = [myBundle URLForImageResource:@"image.png"]; KPKIcon *icon = [[KPKIcon alloc] initWithImageAtURL:imageURL]; XCTAssertNotNil(icon, @"Icon should have been loaded"); - NSString *iconString = [icon encodedString]; + NSString *iconString = icon.encodedString; KPKIcon *iconFromString = [[KPKIcon alloc] initWithUUID:[NSUUID UUID] encodedString:iconString]; - XCTAssertTrue([iconString isEqualToString:[iconFromString encodedString]], @"Encoding and Decoding should result in the same string"); + XCTAssertEqualObjects(iconString, iconFromString.encodedString, @"Encoding and Decoding should result in the same string"); Class repClass = [NSBitmapImageRep class]; - NSImageRep *imageRep = [[icon.image representations] lastObject]; + NSImageRep *imageRep = icon.image.representations.lastObject; XCTAssertNotNil(imageRep, @"One image rep shoudl be there"); XCTAssertTrue([imageRep isKindOfClass:repClass], @"Representation should be bitmap"); NSBitmapImageRep *bitmapRep = (NSBitmapImageRep *)imageRep; NSData *pngData = [bitmapRep representationUsingType:NSPNGFileType properties:nil]; - XCTAssertTrue([pngData isEqualToData:_imageData], @"Image and PNG data shoudl be identical"); + XCTAssertEqualObjects(pngData, _imageData, @"Image and PNG data shoudl be identical"); } @end