From f70becfe6e08574be2b28ffa0179c07bb93e0f2f Mon Sep 17 00:00:00 2001 From: fredkiefer Date: Mon, 31 Oct 2011 22:17:30 +0000 Subject: [PATCH] * Tests/gui/NSSavePanel/setDelegate_reload.m: Switch the save panel to not show hidden files and remove ".svn" from the expected results. This file was never present in an exported directory and will no longer exist with SVN 1.7. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@34100 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 7 ++++ Tests/gui/NSSavePanel/setDelegate_reload.m | 48 ++++++---------------- 2 files changed, 20 insertions(+), 35 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5df27b9aa..6b02af5ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-10-31 Fred Kiefer + + * Tests/gui/NSSavePanel/setDelegate_reload.m: Switch the save panel to + not show hidden files and remove ".svn" from the expected + results. This file was never present in an exported directory and + will no longer exist with SVN 1.7. + 2011-10-31 Fred Kiefer * Source/NSPopUpButtonCell.m (-_popUpItemAction:): Inform bindings diff --git a/Tests/gui/NSSavePanel/setDelegate_reload.m b/Tests/gui/NSSavePanel/setDelegate_reload.m index 9291cebbd..6b3bef88c 100644 --- a/Tests/gui/NSSavePanel/setDelegate_reload.m +++ b/Tests/gui/NSSavePanel/setDelegate_reload.m @@ -60,64 +60,42 @@ int main(int argc, char **argv) [NSApplication sharedApplication]; sp=p=[NSSavePanel savePanel]; - [p setShowsHiddenFiles: YES]; + [p setShowsHiddenFiles: NO]; [p setDirectory: [[[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] stringByDeletingLastPathComponent] stringByAppendingPathComponent: @"dummy"]]; -#if 0 - [p makeKeyAndOrderFront: nil]; - [p setDelegate: [Delegate self]]; - { - NSButton *b=[[NSButton alloc] initWithFrame: NSMakeRect(0,0,50,50)]; - [b setTitle: @"Click me"]; - [b setTarget: [Delegate self]]; - [b setAction: @selector(foo)]; - [p setAccessoryView: b]; - } -// [p validateVisibleColumns]; - [p runModal]; -#else - - b=((NSSavePanel_ivars *)p)->_browser; - m=[b matrixInColumn: [b lastColumn]]; - pass([m numberOfRows] == 3 - && [[[m cellAtRow: 0 column: 0] stringValue] isEqual: @"A"] - && [[[m cellAtRow: 1 column: 0] stringValue] isEqual: @"B"] - && [[[m cellAtRow: 2 column: 0] stringValue] isEqual: @".svn"], - "browser initially contains all files"); - - [p setDelegate: [Delegate self]]; b=((NSSavePanel_ivars *)p)->_browser; m=[b matrixInColumn: [b lastColumn]]; pass([m numberOfRows] == 2 && [[[m cellAtRow: 0 column: 0] stringValue] isEqual: @"A"] - && [[[m cellAtRow: 1 column: 0] stringValue] isEqual: @".svn"], - "browser is reloaded after -setDelegate:"); + && [[[m cellAtRow: 1 column: 0] stringValue] isEqual: @"B"], + "browser initially contains all files"); + [p setDelegate: [Delegate self]]; + b=((NSSavePanel_ivars *)p)->_browser; + m=[b matrixInColumn: [b lastColumn]]; + pass([m numberOfRows] == 1 + && [[[m cellAtRow: 0 column: 0] stringValue] isEqual: @"A"], + "browser is reloaded after -setDelegate:"); /* Not really a -setDelegate: issue, but the other methods involved are documented as doing the wrong thing. */ [p setDelegate: nil]; b=((NSSavePanel_ivars *)p)->_browser; m=[b matrixInColumn: [b lastColumn]]; - pass([m numberOfRows] == 3 + pass([m numberOfRows] == 2 && [[[m cellAtRow: 0 column: 0] stringValue] isEqual: @"A"] - && [[[m cellAtRow: 1 column: 0] stringValue] isEqual: @"B"] - && [[[m cellAtRow: 2 column: 0] stringValue] isEqual: @".svn"], + && [[[m cellAtRow: 1 column: 0] stringValue] isEqual: @"B"], "browser contains all files after resetting delegate"); [b scrollColumnsLeftBy: [b lastColumn]]; [p setDelegate: [Delegate self]]; b=((NSSavePanel_ivars *)p)->_browser; m=[b matrixInColumn: [b lastColumn]]; - pass([m numberOfRows] == 2 - && [[[m cellAtRow: 0 column: 0] stringValue] isEqual: @"A"] - && [[[m cellAtRow: 1 column: 0] stringValue] isEqual: @".svn"], + pass([m numberOfRows] == 1 + && [[[m cellAtRow: 0 column: 0] stringValue] isEqual: @"A"], "browser is reloaded after -setDelegate: (2)"); -#endif - -// [p validateVisibleColumns]; [arp release]; return 0;