From cb3663f86733a31b82bfad0879220f23734cd866 Mon Sep 17 00:00:00 2001 From: michael starke Date: Wed, 28 Oct 2015 11:40:23 +0100 Subject: [PATCH] Using private umbreall header for KeePassKit tests Signed-off-by: michael starke --- KeePassKit | 2 +- MacPass.xcodeproj/project.pbxproj | 2 ++ MacPass/MPTreeDelegate.m | 2 +- MacPassTests/KPKHashedDataTest.m | 3 +-- MacPassTests/KPKIconLoading.m | 2 +- MacPassTests/KPKTestAutotype.m | 2 +- MacPassTests/KPKTestEntryLookup.m | 6 +----- MacPassTests/KPKTestHexColor.m | 3 +-- MacPassTests/KPKTestKeyfileParsing.m | 3 ++- MacPassTests/KPKTestLegacyLoading.m | 7 +------ MacPassTests/KPKTestLegacyWriting.m | 3 +-- MacPassTests/KPKTestModificationDates.m | 3 +-- MacPassTests/KPKTestPerformance.m | 5 ++--- MacPassTests/KPKTestPlaceholder.m | 4 +--- MacPassTests/KPKTestReference.m | 7 +------ MacPassTests/KPKTestUUIDAdditions.m | 4 +++- MacPassTests/KPKTestUndo.m | 7 ++----- MacPassTests/KPKTestXmlLoading.m | 5 +---- MacPassTests/KPKTestXmlParsing.m | 4 ++-- MacPassTests/KPKTestXmlWriting.m | 5 +++-- MacPassTests/KPKTextXMLUtilities.m | 3 +-- 21 files changed, 30 insertions(+), 52 deletions(-) diff --git a/KeePassKit b/KeePassKit index a1b1ef3c..4f4af8c1 160000 --- a/KeePassKit +++ b/KeePassKit @@ -1 +1 @@ -Subproject commit a1b1ef3cb95738587916a43f63fbc0f03508fae9 +Subproject commit 4f4af8c13ede42793b0398fdbf159243cc05f6c4 diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index 7d5a9192..f6bb6284 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -921,6 +921,7 @@ 4CE501331BBC47F500FB819D /* MPTagsTokenFieldDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPTagsTokenFieldDelegate.m; sourceTree = ""; }; 4CE5B548173AFBA700207B39 /* MPDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDocument.h; sourceTree = ""; }; 4CE5B549173AFBA700207B39 /* MPDocument.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = MPDocument.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; }; + 4CE5DFE51BE0DAD700A6C685 /* KeePassKit+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "KeePassKit+Private.h"; sourceTree = ""; }; 4CE76DAC17B3AD010043B82B /* KPKHashedDataTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKHashedDataTest.m; sourceTree = ""; }; 4CE8246D16E2E93400573141 /* MPOverlayWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOverlayWindowController.h; sourceTree = ""; }; 4CE8246E16E2E93400573141 /* MPOverlayWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOverlayWindowController.m; sourceTree = ""; }; @@ -1787,6 +1788,7 @@ isa = PBXGroup; children = ( 4CEFC2F118BA7644007D2565 /* KeePassKit.h */, + 4CE5DFE51BE0DAD700A6C685 /* KeePassKit+Private.h */, 4C0104B817C37BFC00173EF3 /* Utilites */, 4C1842D6179C716100E2F5BC /* Format */, 4CD3ABAF178F71B50073F5C5 /* Categories */, diff --git a/MacPass/MPTreeDelegate.m b/MacPass/MPTreeDelegate.m index 3b638c4e..7073cf23 100644 --- a/MacPass/MPTreeDelegate.m +++ b/MacPass/MPTreeDelegate.m @@ -29,7 +29,7 @@ } - (NSString *)defaultAutotypeSequenceForTree:(KPKTree *)tree { - return [[NSUserDefaults standardUserDefaults] stringForKey:kMPSettingsKeyDefaultGlobalAutotypeSequence]; + return [[NSUserDefaults standardUserDefaults] stringForKey:kMPSettingsKeyDefaultGlobalAutotypeSequence]; } - (BOOL)shouldEditTree:(KPKTree *)tree { diff --git a/MacPassTests/KPKHashedDataTest.m b/MacPassTests/KPKHashedDataTest.m index c44be6af..9d140f00 100644 --- a/MacPassTests/KPKHashedDataTest.m +++ b/MacPassTests/KPKHashedDataTest.m @@ -8,8 +8,7 @@ #import -#import "NSData+HashedData.h" -#import "NSData+Random.h" +#import "KeePassKit.h" @interface KPKHashedDataTest : XCTestCase diff --git a/MacPassTests/KPKIconLoading.m b/MacPassTests/KPKIconLoading.m index 9e88c77e..611745fb 100644 --- a/MacPassTests/KPKIconLoading.m +++ b/MacPassTests/KPKIconLoading.m @@ -8,7 +8,7 @@ #import -#import "KPKIcon.h" +#import "KeePassKit.h" @interface KPKIconLoading : XCTestCase { NSImage *_image; diff --git a/MacPassTests/KPKTestAutotype.m b/MacPassTests/KPKTestAutotype.m index 7695ee9f..914364cf 100644 --- a/MacPassTests/KPKTestAutotype.m +++ b/MacPassTests/KPKTestAutotype.m @@ -8,7 +8,7 @@ #import -#import "NSString+Commands.h" +#import "KeePassKit.h" @interface KPKTestAutotype : XCTestCase @end diff --git a/MacPassTests/KPKTestEntryLookup.m b/MacPassTests/KPKTestEntryLookup.m index 71b0c8db..0138358e 100644 --- a/MacPassTests/KPKTestEntryLookup.m +++ b/MacPassTests/KPKTestEntryLookup.m @@ -6,13 +6,9 @@ // Copyright (c) 2015 HicknHack Software GmbH. All rights reserved. // -#import #import -#import "KPKTree.h" -#import "KPKGroup.h" -#import "KPKEntry.h" -#import "KPKAutotype.h" +#import "KeePassKit.h" @interface KPKTestEntryLookup : XCTestCase @property (strong) KPKTree *tree; diff --git a/MacPassTests/KPKTestHexColor.m b/MacPassTests/KPKTestHexColor.m index 6aa37d0b..63e564e4 100644 --- a/MacPassTests/KPKTestHexColor.m +++ b/MacPassTests/KPKTestHexColor.m @@ -8,8 +8,7 @@ #import -#import "NSColor+KeePassKit.h" - +#import "KeePassKit.h" @interface KPKTestHexColor : XCTestCase diff --git a/MacPassTests/KPKTestKeyfileParsing.m b/MacPassTests/KPKTestKeyfileParsing.m index 6b56105c..100fa126 100644 --- a/MacPassTests/KPKTestKeyfileParsing.m +++ b/MacPassTests/KPKTestKeyfileParsing.m @@ -7,7 +7,8 @@ // #import -#import "NSData+Keyfile.h" + +#import "KeePassKit.h" @interface KPKTestKeyfileParsing : XCTestCase diff --git a/MacPassTests/KPKTestLegacyLoading.m b/MacPassTests/KPKTestLegacyLoading.m index f57b82b3..d6dd9a66 100644 --- a/MacPassTests/KPKTestLegacyLoading.m +++ b/MacPassTests/KPKTestLegacyLoading.m @@ -9,12 +9,7 @@ #import -#import "KPKTree+Serializing.h" -#import "KPKCompositeKey.h" -#import "KPKMetaData.h" -#import "KPKIcon.h" - -#import "KPKErrors.h" +#import "KeePassKit.h" @interface KPKTestLegacyLoading : XCTestCase diff --git a/MacPassTests/KPKTestLegacyWriting.m b/MacPassTests/KPKTestLegacyWriting.m index 37a3229b..d136a8af 100644 --- a/MacPassTests/KPKTestLegacyWriting.m +++ b/MacPassTests/KPKTestLegacyWriting.m @@ -8,8 +8,7 @@ #import -#import "KPKCompositeKey.h" -#import "KPKTree+Serializing.h" +#import "KeePassKit.h" @interface KPKTestLegacyWriting : XCTestCase diff --git a/MacPassTests/KPKTestModificationDates.m b/MacPassTests/KPKTestModificationDates.m index 9d3731f6..f9f7df5a 100644 --- a/MacPassTests/KPKTestModificationDates.m +++ b/MacPassTests/KPKTestModificationDates.m @@ -9,8 +9,7 @@ #import #import "KeePassKit.h" -#import "KPKEntry+Private.h" - +#import "KeePassKit+Private.h" @interface KPKTestModificationDates : XCTestCase diff --git a/MacPassTests/KPKTestPerformance.m b/MacPassTests/KPKTestPerformance.m index 0c2ca569..c3f759cd 100644 --- a/MacPassTests/KPKTestPerformance.m +++ b/MacPassTests/KPKTestPerformance.m @@ -7,9 +7,8 @@ // #import -#import "KPKEntry.h" -#import "KPKAttribute.h" -#import "KPKFormat.h" + +#import "KeePassKit.h" NSUInteger const _kKPKEntryCount = 1000; diff --git a/MacPassTests/KPKTestPlaceholder.m b/MacPassTests/KPKTestPlaceholder.m index caec37cb..cb0419f2 100644 --- a/MacPassTests/KPKTestPlaceholder.m +++ b/MacPassTests/KPKTestPlaceholder.m @@ -7,10 +7,8 @@ // #import -#import "KPKEntry.h" -#import "KPKAttribute.h" -#import "NSString+Commands.h" +#import "KeePassKit.h" @interface KPKTextPlaceholder : XCTestCase diff --git a/MacPassTests/KPKTestReference.m b/MacPassTests/KPKTestReference.m index e938c293..12531d54 100644 --- a/MacPassTests/KPKTestReference.m +++ b/MacPassTests/KPKTestReference.m @@ -8,12 +8,7 @@ #import -#import "KPKAttribute.h" -#import "KPKEntry.h" -#import "KPKGroup.h" -#import "KPKTree.h" - -#import "NSString+Commands.h" +#import "KeePassKit.h" @interface KPKTestReference : XCTestCase @property (strong) KPKTree *tree; diff --git a/MacPassTests/KPKTestUUIDAdditions.m b/MacPassTests/KPKTestUUIDAdditions.m index 74f75250..72474fb0 100644 --- a/MacPassTests/KPKTestUUIDAdditions.m +++ b/MacPassTests/KPKTestUUIDAdditions.m @@ -7,7 +7,9 @@ // #import -#import "NSUUID+KeePassKit.h" + +#import "KeePassKit.h" + @interface KPKTestUUIDAdditions : XCTestCase @end diff --git a/MacPassTests/KPKTestUndo.m b/MacPassTests/KPKTestUndo.m index db5366cf..7b96c307 100644 --- a/MacPassTests/KPKTestUndo.m +++ b/MacPassTests/KPKTestUndo.m @@ -6,13 +6,10 @@ // Copyright (c) 2015 HicknHack Software GmbH. All rights reserved. // -#import #import -#import "KPKTree.h" -#import "KPKNode+Private.h" -#import "KPKGroup.h" -#import "KPKEntry.h" +#import "KeePassKit.h" +#import "KeePassKit+Private.h" @interface KPKTestUndo : XCTestCase { NSUndoManager *_undoManager; diff --git a/MacPassTests/KPKTestXmlLoading.m b/MacPassTests/KPKTestXmlLoading.m index 53659bec..b277c842 100644 --- a/MacPassTests/KPKTestXmlLoading.m +++ b/MacPassTests/KPKTestXmlLoading.m @@ -8,10 +8,7 @@ #import -#import "KPKCompositeKey.h" -#import "KPKTree+Serializing.h" -#import "KPKEntry.h" -#import "KPKGroup.h" +#import "KeePassKit.h" @interface KPKTestXmlLoading : XCTestCase { diff --git a/MacPassTests/KPKTestXmlParsing.m b/MacPassTests/KPKTestXmlParsing.m index 01701627..734fc132 100644 --- a/MacPassTests/KPKTestXmlParsing.m +++ b/MacPassTests/KPKTestXmlParsing.m @@ -9,8 +9,8 @@ #import -#import "KPKXmlTreeReader.h" -#import "KPKErrors.h" +#import "KeePassKit.h" +#import "KeePassKit+Private.h" #import "DDXMLDocument.h" diff --git a/MacPassTests/KPKTestXmlWriting.m b/MacPassTests/KPKTestXmlWriting.m index b111af6b..0c02e8c6 100644 --- a/MacPassTests/KPKTestXmlWriting.m +++ b/MacPassTests/KPKTestXmlWriting.m @@ -7,8 +7,9 @@ // #import -#import "KPKCompositeKey.h" -#import "KPKTree+Serializing.h" + +#import "KeePassKit.h" + @interface KPKTestXmlWriting : XCTestCase diff --git a/MacPassTests/KPKTextXMLUtilities.m b/MacPassTests/KPKTextXMLUtilities.m index 943c416f..50bcd899 100644 --- a/MacPassTests/KPKTextXMLUtilities.m +++ b/MacPassTests/KPKTextXMLUtilities.m @@ -6,10 +6,9 @@ // Copyright (c) 2014 HicknHack Software GmbH. All rights reserved. // -#import #import -#import "NSString+XMLUtilities.h" +#import "KeePassKit.h" @interface KPKTextXMLUtilities : XCTestCase