removes encryption test class headers

hillegass · Aug 14, 2013 · 2c2ee19 · 2c2ee19
1 parent 10403ef
commit 2c2ee19
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 65 deletions.
diff --git a/EncryptionTest/BufferEncryptionTests.h b/EncryptionTest/BufferEncryptionTests.h
diff --git a/EncryptionTest/BufferEncryptionTests.m b/EncryptionTest/BufferEncryptionTests.m
@@ -6,11 +6,18 @@
 //  Copyright 2010 Big Nerd Ranch. All rights reserved.
 //
 
-#import "BufferEncryptionTests.h"
+#import <SenTestingKit/SenTestingKit.h>
 #import "BNRDataBuffer.h"
 #import "BNRDataBuffer+Encryption.h"
 #import "BNRCrypto.h"
 
+@interface BufferEncryptionTests : SenTestCase {
+    BNRDataBuffer *buffer;
+    NSMutableData *randomData;
+    UInt32 salt[2];
+}
+@end
+
 @interface NSData (RandomizedData)
 + (id)dataWithRandomBytesOfLength:(int)length;
 @end

diff --git a/EncryptionTest/EncryptionTest.xcodeproj/project.pbxproj b/EncryptionTest/EncryptionTest.xcodeproj/project.pbxproj
@@ -94,17 +94,14 @@
 		663ED6F1116BF0BD00D00CB9 /* BNRDataBuffer+Encryption.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "BNRDataBuffer+Encryption.m"; sourceTree = "<group>"; };
 		663ED7C8116C19E800D00CB9 /* Person.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Person.h; sourceTree = "<group>"; };
 		663ED7C9116C19E800D00CB9 /* Person.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Person.m; sourceTree = "<group>"; };
-		663ED7D5116C1ACB00D00CB9 /* IntegrationTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntegrationTests.h; sourceTree = "<group>"; };
 		663ED7D6116C1ACB00D00CB9 /* IntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IntegrationTests.m; sourceTree = "<group>"; };
 		663ED7E3116C1B4A00D00CB9 /* EncryptionTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EncryptionTests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
 		663ED7E4116C1B4A00D00CB9 /* EncryptionTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "EncryptionTests-Info.plist"; sourceTree = "<group>"; };
 		663ED814116C1E2300D00CB9 /* libtokyocabinet.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libtokyocabinet.dylib; path = usr/local/lib/libtokyocabinet.dylib; sourceTree = SDKROOT; };
 		663ED816116C1E4100D00CB9 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; };
-		663ED95F116CCE8100D00CB9 /* BufferEncryptionTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BufferEncryptionTests.h; sourceTree = "<group>"; };
 		663ED960116CCE8100D00CB9 /* BufferEncryptionTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BufferEncryptionTests.m; sourceTree = "<group>"; };
 		663EDD0F116EA47B00D00CB9 /* BNRCrypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNRCrypto.h; sourceTree = "<group>"; };
 		663EDD10116EA47B00D00CB9 /* BNRCrypto.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNRCrypto.m; sourceTree = "<group>"; };
-		663EDF2A116FDFE200D00CB9 /* GeneralTests.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GeneralTests.h; sourceTree = "<group>"; };
 		663EDF2B116FDFE200D00CB9 /* GeneralTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneralTests.m; sourceTree = "<group>"; };
 		8DD76FA10486AA7600D96B5E /* EncryptionTest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = EncryptionTest; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -217,11 +214,8 @@
 			children = (
 				663ED7C8116C19E800D00CB9 /* Person.h */,
 				663ED7C9116C19E800D00CB9 /* Person.m */,
-				663EDF2A116FDFE200D00CB9 /* GeneralTests.h */,
 				663EDF2B116FDFE200D00CB9 /* GeneralTests.m */,
-				663ED7D5116C1ACB00D00CB9 /* IntegrationTests.h */,
 				663ED7D6116C1ACB00D00CB9 /* IntegrationTests.m */,
-				663ED95F116CCE8100D00CB9 /* BufferEncryptionTests.h */,
 				663ED960116CCE8100D00CB9 /* BufferEncryptionTests.m */,
 			);
 			name = "Unit Tests";

diff --git a/EncryptionTest/GeneralTests.h b/EncryptionTest/GeneralTests.h
diff --git a/EncryptionTest/GeneralTests.m b/EncryptionTest/GeneralTests.m
@@ -6,14 +6,16 @@
 //  Copyright 2010 Big Nerd Ranch. All rights reserved.
 //
 
-#import "GeneralTests.h"
+#import <SenTestingKit/SenTestingKit.h>
 #import "Person.h"
 #import "BNRTCBackend.h"
 #import "BNRStore.h"
 
 extern NSString * const IntegrationTestsDatabasePath;
 
-@interface GeneralTests ()
+@interface GeneralTests : SenTestCase {
+    BNRStore *store;
+}
 - (void)reopen;
 @end
 

diff --git a/EncryptionTest/IntegrationTests.h b/EncryptionTest/IntegrationTests.h
diff --git a/EncryptionTest/IntegrationTests.m b/EncryptionTest/IntegrationTests.m
@@ -7,13 +7,14 @@
 //
 
 #import <SenTestingKit/SenTestingKit.h>
-#import "IntegrationTests.h"
 #import "Person.h"
 #import "BNRTCBackend.h"
 #import "BNRStore.h"
 #import "BNRDataBuffer.h"
 
-@interface IntegrationTests ()
+@interface IntegrationTests : SenTestCase {
+    BNRStore *store;
+}
 - (void)reopen;
 @end