From 6c95778f21ab7353d1791a3faff538ba25701d97 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Mon, 7 May 2012 14:25:37 +0000 Subject: Fix test build. --- UnitTests/SPDatabaseCopyTest.h | 4 ++-- UnitTests/SPDatabaseCopyTest.m | 4 ++-- UnitTests/SPDatabaseRenameTest.h | 4 ++-- UnitTests/SPDatabaseRenameTest.m | 4 ++-- UnitTests/SPTableCopyTest.h | 2 +- UnitTests/SPTableCopyTest.m | 4 ++-- sequel-pro.xcodeproj/project.pbxproj | 28 ++++------------------------ 7 files changed, 15 insertions(+), 35 deletions(-) diff --git a/UnitTests/SPDatabaseCopyTest.h b/UnitTests/SPDatabaseCopyTest.h index 1714d554..ba882ee1 100644 --- a/UnitTests/SPDatabaseCopyTest.h +++ b/UnitTests/SPDatabaseCopyTest.h @@ -29,7 +29,7 @@ @interface SPDatabaseCopyTest : SenTestCase -//- (void)testCopyDatabase; -//- (void)testCreateDatabase; +- (void)testCopyDatabase; +- (void)testCreateDatabase; @end diff --git a/UnitTests/SPDatabaseCopyTest.m b/UnitTests/SPDatabaseCopyTest.m index ce21f98f..358e0c1e 100644 --- a/UnitTests/SPDatabaseCopyTest.m +++ b/UnitTests/SPDatabaseCopyTest.m @@ -48,7 +48,7 @@ return [OCMockObject niceMockForClass:[SPMySQLConnection class]]; } -/*- (void)testCopyDatabase +- (void)testCopyDatabase { SPDatabaseCopy *dbCopy = [self getDatabaseCopyFixture]; id mockConnection = [self getMockConnection]; @@ -79,6 +79,6 @@ - (void)testCreateDatabase { [self getDatabaseCopyFixture]; -}*/ +} @end diff --git a/UnitTests/SPDatabaseRenameTest.h b/UnitTests/SPDatabaseRenameTest.h index 6aa42ec1..d012e8b9 100644 --- a/UnitTests/SPDatabaseRenameTest.h +++ b/UnitTests/SPDatabaseRenameTest.h @@ -29,7 +29,7 @@ @interface SPDatabaseRenameTest : SenTestCase -//- (void)testRenameDatabase; -//- (void)testCreateDatabase; +- (void)testRenameDatabase; +- (void)testCreateDatabase; @end diff --git a/UnitTests/SPDatabaseRenameTest.m b/UnitTests/SPDatabaseRenameTest.m index f3c3bb5e..c0956262 100644 --- a/UnitTests/SPDatabaseRenameTest.m +++ b/UnitTests/SPDatabaseRenameTest.m @@ -47,7 +47,7 @@ return [OCMockObject niceMockForClass:[SPMySQLConnection class]]; } -/*- (void)testRenameDatabase +- (void)testRenameDatabase { SPDatabaseRename *dbRename = [self getDatabaseRenameFixture]; @@ -79,6 +79,6 @@ - (void)testCreateDatabase { [self getDatabaseRenameFixture]; -}*/ +} @end diff --git a/UnitTests/SPTableCopyTest.h b/UnitTests/SPTableCopyTest.h index a8218a7b..62ebbaaf 100644 --- a/UnitTests/SPTableCopyTest.h +++ b/UnitTests/SPTableCopyTest.h @@ -29,6 +29,6 @@ @interface SPTableCopyTest : SenTestCase -//- (void)testCopyTableFromToWithData; +- (void)testCopyTableFromToWithData; @end diff --git a/UnitTests/SPTableCopyTest.m b/UnitTests/SPTableCopyTest.m index 48f7fad5..6a14fa8f 100644 --- a/UnitTests/SPTableCopyTest.m +++ b/UnitTests/SPTableCopyTest.m @@ -41,7 +41,7 @@ return [[OCMockObject niceMockForClass:[SPMySQLResult class]] autorelease]; } -/*- (void)testCopyTableFromToWithData +- (void)testCopyTableFromToWithData { id mockResult = [self mockResult]; @@ -72,6 +72,6 @@ [tableCopy release]; [resultArray release]; -}*/ +} @end diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj index 710f237d..63b2d5b4 100644 --- a/sequel-pro.xcodeproj/project.pbxproj +++ b/sequel-pro.xcodeproj/project.pbxproj @@ -24,18 +24,15 @@ /* Begin PBXBuildFile section */ 1141A389117BBFF200126A28 /* SPTableCopy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1141A388117BBFF200126A28 /* SPTableCopy.m */; }; - 1141A38A117BBFF200126A28 /* SPTableCopy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1141A388117BBFF200126A28 /* SPTableCopy.m */; }; 1198F5B31174EDD500670590 /* SPDatabaseCopy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1198F5B21174EDD500670590 /* SPDatabaseCopy.m */; }; - 1198F7541174FFCF00670590 /* SPDatabaseCopy.m in Sources */ = {isa = PBXBuildFile; fileRef = 1198F5B21174EDD500670590 /* SPDatabaseCopy.m */; }; 11B55BFE1189E3B2009EF465 /* SPDatabaseAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 11B55BFD1189E3B2009EF465 /* SPDatabaseAction.m */; }; - 11C211271180EC0400758039 /* SPDatabaseRename.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C2109D1180E70800758039 /* SPDatabaseRename.m */; }; 11C211301180EC9A00758039 /* SPDatabaseRename.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C2109D1180E70800758039 /* SPDatabaseRename.m */; }; - 11D44DF0118F5887002AA43C /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11D44DEF118F5887002AA43C /* OCMock.framework */; }; 171312CE109D23C700FB465F /* SPTableTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 171312CD109D23C700FB465F /* SPTableTextFieldCell.m */; }; 1713C740140D8AEF00CFD461 /* SPQueryDocumentsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1713C73F140D8AEF00CFD461 /* SPQueryDocumentsController.m */; }; 1713C75F140D8D5900CFD461 /* SPQueryConsoleDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 1713C75E140D8D5900CFD461 /* SPQueryConsoleDataSource.m */; }; 17148565125F5FF500321285 /* SPDatabaseCharacterSets.m in Sources */ = {isa = PBXBuildFile; fileRef = 17148564125F5FF500321285 /* SPDatabaseCharacterSets.m */; }; 1717F9661557E0450065C036 /* SPStringAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1789343B0F30C1DD0097539A /* SPStringAdditions.m */; }; + 1717F9DB1558114D0065C036 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 11D44DEF118F5887002AA43C /* OCMock.framework */; }; 17292443107AC41000B21980 /* SPXMLExporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 17292442107AC41000B21980 /* SPXMLExporter.m */; }; 172A65110F7BED7A001E861A /* SPConsoleMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 172A65100F7BED7A001E861A /* SPConsoleMessage.m */; }; 173284EA1088FEDE0062E892 /* SPConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 173284E91088FEDE0062E892 /* SPConstants.m */; }; @@ -62,9 +59,6 @@ 174CE14210AB9281008F892B /* SPProcessListController.m in Sources */ = {isa = PBXBuildFile; fileRef = 174CE14110AB9281008F892B /* SPProcessListController.m */; }; 175EC63512733B36009A7C0F /* SPExportControllerDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 175EC63412733B36009A7C0F /* SPExportControllerDelegate.m */; }; 1760599F1336199D0098E162 /* SPMenuAdditionsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1760599E1336199D0098E162 /* SPMenuAdditionsTests.m */; }; - 176059B713361D380098E162 /* SPDatabaseRenameTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 11C210DE1180E9B800758039 /* SPDatabaseRenameTest.m */; }; - 176059B913361D390098E162 /* SPTableCopyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 112730551180788A000737FD /* SPTableCopyTest.m */; }; - 176059BA13361D3A0098E162 /* SPDatabaseCopyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1198F5C31174EF3F00670590 /* SPDatabaseCopyTest.m */; }; 1761FD480EF03A6F00331368 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1761FD460EF03A6F00331368 /* MainMenu.xib */; }; 176E14D115570FE300FAF326 /* SPBundleCommandRunner.m in Sources */ = {isa = PBXBuildFile; fileRef = 176E14D015570FE300FAF326 /* SPBundleCommandRunner.m */; }; 177E792E0FCB54EC00E9E122 /* database-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 177E792B0FCB54EC00E9E122 /* database-small.png */; }; @@ -1284,7 +1278,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 11D44DF0118F5887002AA43C /* OCMock.framework in Frameworks */, + 1717F9DB1558114D0065C036 /* OCMock.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3069,14 +3063,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 11C211271180EC0400758039 /* SPDatabaseRename.m in Sources */, - 1141A38A117BBFF200126A28 /* SPTableCopy.m in Sources */, - 1198F7541174FFCF00670590 /* SPDatabaseCopy.m in Sources */, 380F4EF50FC0B68F00B0BFD7 /* SPStringAdditionsTest.m in Sources */, 1760599F1336199D0098E162 /* SPMenuAdditionsTests.m in Sources */, - 176059B713361D380098E162 /* SPDatabaseRenameTest.m in Sources */, - 176059B913361D390098E162 /* SPTableCopyTest.m in Sources */, - 176059BA13361D3A0098E162 /* SPDatabaseCopyTest.m in Sources */, 1798F1C4155018E2004B0AB8 /* SPMutableArrayAdditionsTest.m in Sources */, 17DB5F441555CA300046834B /* SPMutableArrayAdditions.m in Sources */, 17DB5F4A1555CA810046834B /* SPMenuAdditions.m in Sources */, @@ -3967,9 +3955,7 @@ "-framework", SenTestingKit, "-framework", - SPMySQL, - "-framework", - QueryKit, + OCMock, ); PREBINDING = NO; PRODUCT_NAME = "Unit Tests"; @@ -4001,9 +3987,7 @@ "-framework", SenTestingKit, "-framework", - SPMySQL, - "-framework", - QueryKit, + OCMock, ); PREBINDING = NO; PRODUCT_NAME = "Unit Tests"; @@ -4034,11 +4018,7 @@ "-framework", SenTestingKit, "-framework", - SPMySQL, - "-framework", OCMock, - "-framework", - QueryKit, ); PREBINDING = NO; PRODUCT_NAME = "Unit Tests"; -- cgit v1.2.3