aboutsummaryrefslogtreecommitdiffstats
path: root/UnitTests
diff options
context:
space:
mode:
Diffstat (limited to 'UnitTests')
-rw-r--r--UnitTests/SPDatabaseCopyTest.h40
-rw-r--r--UnitTests/SPDatabaseCopyTest.m11
-rw-r--r--UnitTests/SPDatabaseRenameTest.h40
-rw-r--r--UnitTests/SPDatabaseRenameTest.m11
-rw-r--r--UnitTests/SPMenuAdditionsTests.h45
-rw-r--r--UnitTests/SPMenuAdditionsTests.m17
-rw-r--r--UnitTests/SPMutableArrayAdditionsTests.h42
-rw-r--r--UnitTests/SPMutableArrayAdditionsTests.m14
-rw-r--r--UnitTests/SPStringAdditionsTests.h40
-rw-r--r--UnitTests/SPStringAdditionsTests.m12
-rw-r--r--UnitTests/SPTableCopyTest.h39
-rw-r--r--UnitTests/SPTableCopyTest.m12
12 files changed, 70 insertions, 253 deletions
diff --git a/UnitTests/SPDatabaseCopyTest.h b/UnitTests/SPDatabaseCopyTest.h
deleted file mode 100644
index 2ed193a3..00000000
--- a/UnitTests/SPDatabaseCopyTest.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// SPDatabaseCopyTest.h
-// sequel-pro
-//
-// Created by David Rekowski.
-// Copyright (c) 2010 David Rekowski. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-// More info at <https://github.com/sequelpro/sequelpro>
-
-#define USE_APPLICATION_UNIT_TEST 1
-
-#import <SenTestingKit/SenTestingKit.h>
-
-@interface SPDatabaseCopyTest : SenTestCase
-
-- (void)testCopyDatabase;
-- (void)testCreateDatabase;
-
-@end
diff --git a/UnitTests/SPDatabaseCopyTest.m b/UnitTests/SPDatabaseCopyTest.m
index 2ab44bea..036a1869 100644
--- a/UnitTests/SPDatabaseCopyTest.m
+++ b/UnitTests/SPDatabaseCopyTest.m
@@ -28,14 +28,23 @@
//
// More info at <https://github.com/sequelpro/sequelpro>
+#define USE_APPLICATION_UNIT_TEST 1
+
#import <OCMock/OCMock.h>
+#import <SenTestingKit/SenTestingKit.h>
#import "SPAlertSheets.h"
-#import "SPDatabaseCopyTest.h"
#import "SPDatabaseCopy.h"
#import "SPTableCopy.h"
#import "SPLogger.h"
+@interface SPDatabaseCopyTest : SenTestCase
+
+- (void)testCopyDatabase;
+- (void)testCreateDatabase;
+
+@end
+
@implementation SPDatabaseCopyTest
- (SPDatabaseCopy *)getDatabaseCopyFixture
diff --git a/UnitTests/SPDatabaseRenameTest.h b/UnitTests/SPDatabaseRenameTest.h
deleted file mode 100644
index 138b0e11..00000000
--- a/UnitTests/SPDatabaseRenameTest.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// SPDatabaseRenameTest.h
-// sequel-pro
-//
-// Created by David Rekowski.
-// Copyright (c) 2010 David Rekowski. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-// More info at <https://github.com/sequelpro/sequelpro>
-
-#define USE_APPLICATION_UNIT_TEST 1
-
-#import <SenTestingKit/SenTestingKit.h>
-
-@interface SPDatabaseRenameTest : SenTestCase
-
-- (void)testRenameDatabase;
-- (void)testCreateDatabase;
-
-@end
diff --git a/UnitTests/SPDatabaseRenameTest.m b/UnitTests/SPDatabaseRenameTest.m
index ce826e13..0c29ad0a 100644
--- a/UnitTests/SPDatabaseRenameTest.m
+++ b/UnitTests/SPDatabaseRenameTest.m
@@ -28,12 +28,21 @@
//
// More info at <https://github.com/sequelpro/sequelpro>
-#import "SPDatabaseRenameTest.h"
+#define USE_APPLICATION_UNIT_TEST 1
+
#import "SPDatabaseRename.h"
#import "SPTableCopy.h"
#import "SPLogger.h"
#import <OCMock/OCMock.h>
+#import <SenTestingKit/SenTestingKit.h>
+
+@interface SPDatabaseRenameTest : SenTestCase
+
+- (void)testRenameDatabase;
+- (void)testCreateDatabase;
+
+@end
@implementation SPDatabaseRenameTest
diff --git a/UnitTests/SPMenuAdditionsTests.h b/UnitTests/SPMenuAdditionsTests.h
deleted file mode 100644
index fbc4d653..00000000
--- a/UnitTests/SPMenuAdditionsTests.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// SPMenuAdditionsTests.h
-// sequel-pro
-//
-// Created by Stuart Connolly (stuconnolly.com) on March 20, 2011.
-// Copyright (c) 2011 Stuart Connolly. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-// More info at <https://github.com/sequelpro/sequelpro>
-
-#import <SenTestingKit/SenTestingKit.h>
-
-/**
- * @class SPMenuAdditionsTests SPMenuAdditionsTests.h
- *
- * @author Stuart Connolly http://stuconnolly.com/
- *
- * SPMenuAdditionsTests tests class.
- */
-@interface SPMenuAdditionsTests : SenTestCase
-{
- NSMenu *menu;
-}
-
-@end
diff --git a/UnitTests/SPMenuAdditionsTests.m b/UnitTests/SPMenuAdditionsTests.m
index e33920e7..83647e6f 100644
--- a/UnitTests/SPMenuAdditionsTests.m
+++ b/UnitTests/SPMenuAdditionsTests.m
@@ -28,9 +28,24 @@
//
// More info at <https://github.com/sequelpro/sequelpro>
-#import "SPMenuAdditionsTests.h"
#import "SPMenuAdditions.h"
+#import <SenTestingKit/SenTestingKit.h>
+
+/**
+ * @class SPMenuAdditionsTests SPMenuAdditionsTests.h
+ *
+ * @author Stuart Connolly http://stuconnolly.com/
+ *
+ * SPMenuAdditionsTests tests class.
+ */
+@interface SPMenuAdditionsTests : SenTestCase
+{
+ NSMenu *menu;
+}
+
+@end
+
static NSString *SPTestMenuItemTitle = @"Menu Item";
@implementation SPMenuAdditionsTests
diff --git a/UnitTests/SPMutableArrayAdditionsTests.h b/UnitTests/SPMutableArrayAdditionsTests.h
deleted file mode 100644
index d96ef285..00000000
--- a/UnitTests/SPMutableArrayAdditionsTests.h
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// SPMutableArrayAdditionsTests.h
-// sequel-pro
-//
-// Created by Stuart Connolly (stuconnolly.com) on February 2, 2011.
-// Copyright (c) 2011 Stuart Connolly. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-// More info at <https://github.com/sequelpro/sequelpro>
-
-#import <SenTestingKit/SenTestingKit.h>
-
-/**
- * @class SPMutableArrayAdditionsTest SPMutableArrayAdditionsTest.h
- *
- * @author Stuart Connolly http://stuconnolly.com/
- *
- * SPMutableArrayAdditions tests class.
- */
-@interface SPMutableArrayAdditionsTests : SenTestCase
-
-@end
diff --git a/UnitTests/SPMutableArrayAdditionsTests.m b/UnitTests/SPMutableArrayAdditionsTests.m
index a2890d8f..e09f00a4 100644
--- a/UnitTests/SPMutableArrayAdditionsTests.m
+++ b/UnitTests/SPMutableArrayAdditionsTests.m
@@ -28,9 +28,21 @@
//
// More info at <https://github.com/sequelpro/sequelpro>
-#import "SPMutableArrayAdditionsTests.h"
#import "SPMutableArrayAdditions.h"
+#import <SenTestingKit/SenTestingKit.h>
+
+/**
+ * @class SPMutableArrayAdditionsTest SPMutableArrayAdditionsTest.h
+ *
+ * @author Stuart Connolly http://stuconnolly.com/
+ *
+ * SPMutableArrayAdditions tests class.
+ */
+@interface SPMutableArrayAdditionsTests : SenTestCase
+
+@end
+
@implementation SPMutableArrayAdditionsTests
/**
diff --git a/UnitTests/SPStringAdditionsTests.h b/UnitTests/SPStringAdditionsTests.h
deleted file mode 100644
index 56b5c6f9..00000000
--- a/UnitTests/SPStringAdditionsTests.h
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// SPStringAdditionsTests.h
-// sequel-pro
-//
-// Created by Jim Knight on May 17, 2009.
-// Copyright (c) 2009 Jim Knight. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-// More info at <https://github.com/sequelpro/sequelpro>
-
-#import <SenTestingKit/SenTestingKit.h>
-
-@interface SPStringAdditionsTests : SenTestCase
-
-- (void)testStringByRemovingCharactersInSet;
-- (void)testStringWithNewUUID;
-- (void)testCreateViewSyntaxPrettifier;
-- (void)testNonConsecutivelySearchStringMatchingRanges;
-
-@end
diff --git a/UnitTests/SPStringAdditionsTests.m b/UnitTests/SPStringAdditionsTests.m
index f455066f..b0528ec7 100644
--- a/UnitTests/SPStringAdditionsTests.m
+++ b/UnitTests/SPStringAdditionsTests.m
@@ -28,10 +28,20 @@
//
// More info at <https://github.com/sequelpro/sequelpro>
-#import "SPStringAdditionsTests.h"
#import "SPStringAdditions.h"
#import "RegexKitLite.h"
+#import <SenTestingKit/SenTestingKit.h>
+
+@interface SPStringAdditionsTests : SenTestCase
+
+- (void)testStringByRemovingCharactersInSet;
+- (void)testStringWithNewUUID;
+- (void)testCreateViewSyntaxPrettifier;
+- (void)testNonConsecutivelySearchStringMatchingRanges;
+
+@end
+
@implementation SPStringAdditionsTests
/**
diff --git a/UnitTests/SPTableCopyTest.h b/UnitTests/SPTableCopyTest.h
deleted file mode 100644
index 29c5eea4..00000000
--- a/UnitTests/SPTableCopyTest.h
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// SPTableCopyTest.h
-// sequel-pro
-//
-// Created by David Rekowski.
-// Copyright (c) 2010 David Rekowski. All rights reserved.
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-// More info at <https://github.com/sequelpro/sequelpro>
-
-#define USE_APPLICATION_UNIT_TEST 1
-
-#import <SenTestingKit/SenTestingKit.h>
-
-@interface SPTableCopyTest : SenTestCase
-
-- (void)testCopyTableFromToWithData;
-
-@end
diff --git a/UnitTests/SPTableCopyTest.m b/UnitTests/SPTableCopyTest.m
index 099066bc..76a2fe45 100644
--- a/UnitTests/SPTableCopyTest.m
+++ b/UnitTests/SPTableCopyTest.m
@@ -29,10 +29,18 @@
// More info at <https://github.com/sequelpro/sequelpro>
#import "SPTableCopy.h"
-#import "SPTableCopyTest.h"
+#import <SPMySQL/SPMySQL.h>
+#import <SenTestingKit/SenTestingKit.h>
#import <OCMock/OCMock.h>
-#import <SPMySQL/SPMySQL.h>
+
+#define USE_APPLICATION_UNIT_TEST 1
+
+@interface SPTableCopyTest : SenTestCase
+
+- (void)testCopyTableFromToWithData;
+
+@end
@implementation SPTableCopyTest