Bring outline view branch up to date with trunk (r3246:r3264).

6 files changed, 101 insertions, 10 deletions

diff --git a/UnitTests/MCPKitTest.m b/UnitTests/MCPKitTest.m
index 4480b0a1..559a1407 100644
--- a/UnitTests/MCPKitTest.m
+++ b/UnitTests/MCPKitTest.m
@@ -27,10 +27,10 @@
 
 #import "MCPKitTest.h"
 
-static const NSString *SPTestDatabaseHost     = @"127.0.0.1";
-static const NSString *SPTestDatabaseName     = @"sakila";
-static const NSString *SPTestDatabaseUser     = @"sp_tester";
-static const NSString *SPTestDatabasePassword = @"";
+static NSString *SPTestDatabaseHost     = @"127.0.0.1";
+static NSString *SPTestDatabaseName     = @"sakila";
+static NSString *SPTestDatabaseUser     = @"sp_tester";
+static NSString *SPTestDatabasePassword = @"";
 
 static const NSInteger SPTestDatabasePort     = 3306;
 
diff --git a/UnitTests/SPDatabaseCopyTest.m b/UnitTests/SPDatabaseCopyTest.m
index a1ed99fe..9ba7d5b7 100644
--- a/UnitTests/SPDatabaseCopyTest.m
+++ b/UnitTests/SPDatabaseCopyTest.m
@@ -83,9 +83,9 @@
 	[target release];
 }
 
-- (void) testCreateDatabase {
-	SPDatabaseCopy *dbCopy = [self getDatabaseCopyFixture];
-	// test missing :)
+- (void)testCreateDatabase 
+{
+	[self getDatabaseCopyFixture];
 }
 
 @end
diff --git a/UnitTests/SPDatabaseRenameTest.m b/UnitTests/SPDatabaseRenameTest.m
index 1d432c73..9a1c7b1d 100644
--- a/UnitTests/SPDatabaseRenameTest.m
+++ b/UnitTests/SPDatabaseRenameTest.m
@@ -93,7 +93,7 @@
 
 - (void)testCreateDatabase 
 {
-	SPDatabaseRename *dbRename = [self getDatabaseRenameFixture];
+	[self getDatabaseRenameFixture];
 }
 
 @end
diff --git a/UnitTests/SPMenuAdditionsTests.h b/UnitTests/SPMenuAdditionsTests.h
new file mode 100644
index 00000000..1ff2ab61
--- /dev/null
+++ b/UnitTests/SPMenuAdditionsTests.h
@@ -0,0 +1,33 @@
+//
+//  $Id$  
+//
+//  SPMenuAdditionsTests.h
+//  sequel-pro
+//
+//  Created by Stuart Connolly on March 20, 2011
+//  Copyright (c) 2011 Stuart Connolly. All rights reserved.
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 2 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+//  More info at <http://code.google.com/p/sequel-pro/>
+
+#import <SenTestingKit/SenTestingKit.h>
+
+@interface SPMenuAdditionsTests : SenTestCase
+{
+	NSMenu *menu;
+}
+
+@end
diff --git a/UnitTests/SPMenuAdditionsTests.m b/UnitTests/SPMenuAdditionsTests.m
new file mode 100644
index 00000000..15130df2
--- /dev/null
+++ b/UnitTests/SPMenuAdditionsTests.m
@@ -0,0 +1,58 @@
+//
+//  $Id$  
+//
+//  SPMenuAdditionsTests.m
+//  sequel-pro
+//
+//  Created by Stuart Connolly on March 20, 2011
+//  Copyright (c) 2011 Stuart Connolly. All rights reserved.
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 2 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+//  More info at <http://code.google.com/p/sequel-pro/>
+
+#import "SPMenuAdditionsTests.h"
+#import "SPMenuAdditions.h"
+
+static NSString *SPTestMenuItemTitle = @"Menu Item";
+
+@implementation SPMenuAdditionsTests
+
+- (void)setUp
+{
+	NSUInteger num = 5;
+	
+	menu = [[NSMenu alloc] init];
+	
+	for (NSUInteger i = 0; i < num; i++)
+	{
+		[menu addItemWithTitle:[NSString stringWithFormat:@"%@ %d", SPTestMenuItemTitle, i] action:NULL keyEquivalent:@""];	
+	}
+}
+
+- (void)tearDown
+{
+	[menu release], menu = nil;
+}
+
+- (void)testCompatibleRemoveAllItems
+{
+	[menu compatibleRemoveAllItems];
+	
+	STAssertFalse([menu numberOfItems], @"The menu should have no menu items.");
+}
+
+@end
+
diff --git a/UnitTests/SPStringAdditionsTest.m b/UnitTests/SPStringAdditionsTest.m
index 8fce7e07..b0143a0f 100644
--- a/UnitTests/SPStringAdditionsTest.m
+++ b/UnitTests/SPStringAdditionsTest.m
@@ -26,8 +26,8 @@
 #import "SPStringAdditionsTest.h"
 #import "SPStringAdditions.h"
 
-static const NSString *SPASCIITestString = @"this is a big, crazy test st'ring  with som'e random  spaces and quot'es";
-static const NSString *SPUTFTestString   = @"In der Kürze liegt die Würz";
+static NSString *SPASCIITestString = @"this is a big, crazy test st'ring  with som'e random  spaces and quot'es";
+static NSString *SPUTFTestString   = @"In der Kürze liegt die Würz";
 
 @implementation SPStringAdditionsTest