[abbot-commits] abbot.swt.eclipse/src/abbot/swt/eclipse/tests JavaProjectTester.java,1.2,1.3

[cmjaun <cm...@us...>]

Update of /cvsroot/abbot/abbot.swt.eclipse/src/abbot/swt/eclipse/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24628/src/abbot/swt/eclipse/tests

Modified Files:
	JavaProjectTester.java 
Log Message:
Menu path does not need to be contained in a thread. The tree item finder does. The tree item finder thread must be started before method to open file menu. JavaProjectTester now works.

Index: JavaProjectTester.java
===================================================================
RCS file: /cvsroot/abbot/abbot.swt.eclipse/src/abbot/swt/eclipse/tests/JavaProjectTester.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JavaProjectTester.java	29 Apr 2005 19:09:26 -0000	1.2
--- JavaProjectTester.java	29 Apr 2005 20:43:31 -0000	1.3
***************
*** 122,132 ****
  		final TestHierarchy hierarchy = new TestHierarchy(display);
  		final BasicFinder finder = new BasicFinder(hierarchy);
- 		
- 		System.out.println("Selecting:");
- 		// Select File > New > Other...
- 		menuItemTester.actionSelectMenuItem(
- 				"&File/&New	Alt+Shift+N/&Other...	Ctrl+N", null,parentShell, 1000);
  
  		// beging driving the wizard
  				System.out.println("Waiting for \"New\" window to open.");
  				WidgetTester.waitForShellShowing("New");
--- 122,129 ----
  		final TestHierarchy hierarchy = new TestHierarchy(display);
  		final BasicFinder finder = new BasicFinder(hierarchy);
  
  		// beging driving the wizard
+ 		Thread driveWizard = new Thread() {
+ 			public void run() {
  				System.out.println("Waiting for \"New\" window to open.");
  				WidgetTester.waitForShellShowing("New");
***************
*** 136,140 ****
  					Shell currentShell = (Shell) finder.find(new TextMatcher("New"));
  
! 					// find the tree containing available wizards
  					Tree tree = (Tree) finder.find(currentShell, new ClassMatcher(Tree.class));
  
--- 133,137 ----
  					Shell currentShell = (Shell) finder.find(new TextMatcher("New"));
  
! 					// find the tree containing available wizards in the current shell
  					Tree tree = (Tree) finder.find(currentShell, new ClassMatcher(Tree.class));
  
***************
*** 245,250 ****
  					fail("Multiple widgets found");
  				}
! 
! 		wt.actionDelay(4000); /* try not to wait on 2 things at once */
  		System.out.println("Exiting start");
  	}
--- 242,252 ----
  					fail("Multiple widgets found");
  				}
! 			}
! 		};
! 		driveWizard.start();
! 		System.out.println("Selecting:");
! 		menuItemTester.actionSelectMenuItem(
! 				"&File/&New	Alt+Shift+N/&Other...	Ctrl+N", null,parentShell, 1000);
! 		menuItemTester.actionDelay(750);
  		System.out.println("Exiting start");
  	}