Merge pull request #2419 from Dogild/cappuccino-test-launched

Test: some manual tests were broken
cappuccino · Feb 19, 2016 · 4f13df6 · 4f13df6
2 parents 662db00 + 6d305e4
commit 4f13df6
Show file tree

Hide file tree

Showing 21 changed files with 42 additions and 389 deletions.
diff --git a/Tests/Manual/ArrayControllerRemovingFirstTest/AppController.j b/Tests/Manual/ArrayControllerRemovingFirstTest/AppController.j
@@ -29,7 +29,7 @@
     [arrayController setContent:items];
 
     var label = [CPTextField labelWithTitle:@"Press buttons to see [Remove First By Object] fails while [Remove First By Index] succeeds"];
-    [label setFrameOrigin:CGPointMake(20, 20)];    
+    [label setFrameOrigin:CGPointMake(20, 20)];
     [contentView addSubview:label];
 
     var field = [CPTextField textFieldWithStringValue:@"" placeholder:@"" width:100];
@@ -65,7 +65,8 @@
 
 - (void)removeFirstByIndex:(id)sender
 {
-    [arrayController removeObjectAtArrangedObjectIndex:0];
+    if ([[arrayController contentArray] count])
+        [arrayController removeObjectAtArrangedObjectIndex:0];
 }
 
 - (void)observeValueForKeyPath:(CPString)keyPath ofObject:(id)object change:(CPDictionary)change context:(id)context

diff --git a/Tests/Manual/CPByteCountFormatter/Resources/MainMenu.cib b/Tests/Manual/CPByteCountFormatter/Resources/MainMenu.cib
diff --git a/Tests/Manual/CPCursor/AppController.j b/Tests/Manual/CPCursor/AppController.j
@@ -5,7 +5,7 @@
 @import <AppKit/CPCursor.j>
 
 @implementation CursorTester : CPView
-{ 
+{
     CPCursor testCursor;
     CPTextField label;
 }
@@ -15,6 +15,7 @@
             cursor:(CPCursor)aCursor
 {
     self = [super init];
+
     if (self)
     {
         testCursor = aCursor;
@@ -26,7 +27,16 @@
                                   anOrigin.y,
                                   [label frame].size.width,
                                   [label frame].size.height)];
+
+      var trackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero()
+                                   options:CPTrackingMouseEnteredAndExited | CPTrackingActiveInKeyWindow | CPTrackingInVisibleRect
+                                     owner:self
+                                  userInfo:nil];
+
+      [self addTrackingArea:trackingArea];
+;
     }
+
     return self;
 }
 
@@ -57,7 +67,7 @@
     	yInc = 25,
         imageCursorTester = [[CursorTester alloc] initWithText:@"Image cursor"
                                                         origin:CGPointMake(x, y)
-                                                        cursor:[[CPCursor alloc] initWithImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle mainBundle] resourcePath] + @"spinner.gif"] 
+                                                        cursor:[[CPCursor alloc] initWithImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle mainBundle] resourcePath] + @"spinner.gif"]
                                                                                        hotSpot:CGPointMakeZero()]],
         arrowCursorTester = [[CursorTester alloc] initWithText:@"Arrow cursor"
                                                         origin:CGPointMake(x, y+=yInc)
@@ -110,7 +120,7 @@
         disappearingItemCursorTester = [[CursorTester alloc] initWithText:@"Disappearing item cursor"
                                                         origin:CGPointMake(x, y+=yInc)
  													    cursor:[CPCursor disappearingItemCursor]];
-        
+
     [contentView addSubview:imageCursorTester];
     [contentView addSubview:arrowCursorTester];
     [contentView addSubview:crosshairCursorTester];

diff --git a/Tests/Manual/CPDatePickerTest/Resources/MainMenu.cib b/Tests/Manual/CPDatePickerTest/Resources/MainMenu.cib
diff --git a/Tests/Manual/CrossOriginTest/Resources/MainMenu.cib b/Tests/Manual/CrossOriginTest/Resources/MainMenu.cib
diff --git a/Tests/Manual/Issue-1357-fix/AppController.j → ...ayAfterHidingAndResizeBug/AppController.j b/Tests/Manual/Issue-1357-fix/AppController.j → ...ayAfterHidingAndResizeBug/AppController.j
diff --git a/...DisplayAfterHidingAndResizeBug/Info.plist → ...DisplayAfterHidingAndResizeBug/Info.plist b/...DisplayAfterHidingAndResizeBug/Info.plist → ...DisplayAfterHidingAndResizeBug/Info.plist
diff --git a/...NoDisplayAfterHidingAndResizeBug/Jakefile → ...NoDisplayAfterHidingAndResizeBug/Jakefile b/...NoDisplayAfterHidingAndResizeBug/Jakefile → ...NoDisplayAfterHidingAndResizeBug/Jakefile
diff --git a/...rHidingAndResizeBug/Resources/spinner.gif → ...rHidingAndResizeBug/Resources/spinner.gif b/...rHidingAndResizeBug/Resources/spinner.gif → ...rHidingAndResizeBug/Resources/spinner.gif
diff --git a/...yAfterHidingAndResizeBug/index-debug.html → ...yAfterHidingAndResizeBug/index-debug.html b/...yAfterHidingAndResizeBug/index-debug.html → ...yAfterHidingAndResizeBug/index-debug.html
diff --git a/...DisplayAfterHidingAndResizeBug/index.html → ...DisplayAfterHidingAndResizeBug/index.html b/...DisplayAfterHidingAndResizeBug/index.html → ...DisplayAfterHidingAndResizeBug/index.html
diff --git a/...ewNoDisplayAfterHidingAndResizeBug/main.j → ...ewNoDisplayAfterHidingAndResizeBug/main.j b/...ewNoDisplayAfterHidingAndResizeBug/main.j → ...ewNoDisplayAfterHidingAndResizeBug/main.j
diff --git a/Tests/Manual/Issue-1357-fix/CPViewNoDisplayAfterHidingAndResizeBug/AppController.j b/Tests/Manual/Issue-1357-fix/CPViewNoDisplayAfterHidingAndResizeBug/AppController.j
diff --git a/Tests/Manual/Issue-1357-fix/Info.plist b/Tests/Manual/Issue-1357-fix/Info.plist
diff --git a/Tests/Manual/Issue-1357-fix/Jakefile b/Tests/Manual/Issue-1357-fix/Jakefile
diff --git a/Tests/Manual/Issue-1357-fix/Resources/spinner.gif b/Tests/Manual/Issue-1357-fix/Resources/spinner.gif
diff --git a/Tests/Manual/Issue-1357-fix/index-debug.html b/Tests/Manual/Issue-1357-fix/index-debug.html