Merge branch 'master' of github.com:cappuccino/cappuccino

Tests/AppKit/CPApplicationTest.j

@@ -90,7 +90,6 @@ var globalResults = [];
 
 - (void)testRunModalForWindow
 {
-    var aWindow = [[CPWindow alloc] init];
     [app runModalForWindow:aWindow];
 
     [self assertTrue:[aWindow isKeyWindow] message:@"A window must be made key when it's run modally"];

Tests/AppKit/CPButtonTest.j

@@ -181,7 +181,7 @@
 
 - (void)testTypeMasks
 {
-    var button = [[CPButton alloc] initWithFrame:CGRectMakeZero()];
+    button = [[CPButton alloc] initWithFrame:CGRectMakeZero()];
 
     // The default mask should be that of CPMomentaryPushInButton.
     [self assert:CPPushInButtonMask | CPGrayButtonMask | CPBackgroundButtonMask equals:[button highlightsBy]];

Tests/AppKit/CPKeyValueBindingTest.j

@@ -154,8 +154,9 @@
 - (void)testTableColumn
 {
     var tableView = [CPTableView new],
-        tableColumn = [[CPTableColumn alloc] initWithIdentifier:"A Column"],
-        arrayController = [CPArrayController new];
+        tableColumn = [[CPTableColumn alloc] initWithIdentifier:"A Column"];
+
+    arrayController = [CPArrayController new];
 
     [tableView addTableColumn:tableColumn];
 
@@ -401,4 +402,4 @@
     return valueB;
 }
 
-@end
+@end

Tests/AppKit/CPTableViewTest.j

@@ -243,9 +243,10 @@
 - (void)testContentBinding
 {
     var contentBindingTable = [[CPTableView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)],
-        tableColumn = [[CPTableColumn alloc] initWithIdentifier:@"A"],
         delegate = [ContentBindingTableDelegate new];
 
+    tableColumn = [[CPTableColumn alloc] initWithIdentifier:@"A"];
+
     [contentBindingTable addTableColumn:tableColumn];
     [delegate setTester:self];
     [contentBindingTable setDelegate:delegate];

Tests/Foundation/CPKVOTest.j

@@ -65,7 +65,7 @@
 
 - (void)testDirectIVarObservation
 {
-    var bob = [[PersonTester alloc] init];
+    bob = [[PersonTester alloc] init];
 
     [bob addObserver:self forKeyPath:@"phoneNumber" options:nil context:@"testDirectIVarObservation"];
 
@@ -446,8 +446,9 @@
 
 - (void)testSettersReplacedOnce
 {
-    var bob = [[PersonTester alloc] init],
-        betty = [CPObject new];
+    var betty = [CPObject new];
+
+    bob = [[PersonTester alloc] init];
 
     [bob addObserver:self forKeyPath:@"name" options:nil context:@"testSettersReplacedOnce"];
 
@@ -470,7 +471,7 @@
 
 - (void)testNestedNotifications
 {
-    var bob = [[PersonTester alloc] init];
+    bob = [[PersonTester alloc] init];
 
     [bob willChangeValueForKey:@"name"];
     [self assertTrue:bob._willChangeMessageCounter[@"name"] === 1];

Tests/Foundation/CPSetTest.j

@@ -4,7 +4,6 @@
 
 @implementation CPSetTest : OJTestCase
 {
-    CPSet set;
 }
 
 - (void)assertSet:(CPSet)aSet onlyHasObjects:(CPArray)objects

Tests/Tools/ToolsTest.j

@@ -22,13 +22,13 @@ function cleanup() {
     var status;
 
     status = OS.system(["capp", "gen", "ToolsTestApp"].map(OS.enquote).join(" ") + " > /dev/null");
-    [self assert:status equals:0 message:"capp gen failed"];
+    [self assert:0 equals:status message:"capp gen failed"];
 
     status = OS.system(["press", "-f", "ToolsTestApp", "PressTestApp"].map(OS.enquote).join(" ") + " > /dev/null");
-    [self assert:status equals:0 message:"press failed"];
+    [self assert:0 equals:status message:"press failed"];
 
     status = OS.system(["flatten", "-f", "ToolsTestApp", "FlattenTestApp"].map(OS.enquote).join(" ") + " > /dev/null");
-    [self assert:status equals:0 message:"flatten failed"];
+    [self assert:0 equals:status message:"flatten failed"];
 }
 
 - (void)tearDown