Abbot Java GUI Testing Framework

Revision: 2826
          http://abbot.svn.sourceforge.net/abbot/?rev=2826&view=rev
Author:   gdavison
Date:     2012-04-02 14:56:57 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
Provide a proper error dialog when the user tries to open an invalid script

Modified Paths:
--------------
    abbot/trunk/src/abbot/editor/ScriptEditor.java
    abbot/trunk/test/abbot/editor/ScriptEditorTest.java

Modified: abbot/trunk/src/abbot/editor/ScriptEditor.java
===================================================================
--- abbot/trunk/src/abbot/editor/ScriptEditor.java	2012-03-22 09:16:26 UTC (rev 2825)
+++ abbot/trunk/src/abbot/editor/ScriptEditor.java	2012-04-02 14:56:57 UTC (rev 2826)
@@ -1701,7 +1701,7 @@
         }
         if (chooser.showOpenDialog(view) == JFileChooser.APPROVE_OPTION) {
             File file = chooser.getSelectedFile();
-            setScript(file.getAbsolutePath());
+            openScript(file);
         }
         if (!getScripts().contains(testScript)
             && model != null) {
@@ -1709,6 +1709,22 @@
         }
     }
 
+
+    /** 
+     * Perform the actual open operation
+     */
+    void openScript(File file) {
+        try
+        {
+          setScript(file.getAbsolutePath());
+        }
+        catch (InvalidScriptException ise)
+        {
+          view.showError(ise.getMessage());
+        }
+    }
+    
+
     private void stopOnFailureToggle() {
         if (testScript != null) {
             runner.setStopOnFailure(!runner.getStopOnFailure());

Modified: abbot/trunk/test/abbot/editor/ScriptEditorTest.java
===================================================================
--- abbot/trunk/test/abbot/editor/ScriptEditorTest.java	2012-03-22 09:16:26 UTC (rev 2825)
+++ abbot/trunk/test/abbot/editor/ScriptEditorTest.java	2012-04-02 14:56:57 UTC (rev 2826)
@@ -1,10 +1,21 @@
 package abbot.editor;
 
+import abbot.finder.BasicFinder;
+
+import abbot.finder.matchers.ClassMatcher;
+
 import java.io.*;
 
 import junit.extensions.abbot.*;
 import abbot.script.Script;
 
+
+import java.awt.EventQueue;
+
+import java.util.concurrent.TimeUnit;
+
+import javax.swing.JOptionPane;
+
 /** Tests for the script editor proper. */
 
 public class ScriptEditorTest extends ComponentTestFixture {
@@ -69,6 +80,44 @@
                    script.hasTerminate());
     }
 
+
+    /** Open a new, empty script. */
+    public void testBrokenScript() throws Throwable {
+        // Try a file that exists
+        final File file = File.createTempFile(getName(), ".xml");
+        file.deleteOnExit();
+        PrintWriter pw = new PrintWriter(file);
+        pw.println("This is not a valid script");
+        pw.close();
+        
+        
+        // Just run this from the event queue
+        EventQueue.invokeLater(new Runnable() {
+
+                @Override
+                public void run() {
+                    editor.openScript(file);
+                }
+            });
+         
+        // Check this pops up a JOptionPane
+        
+        JOptionPane pane = (JOptionPane)BasicFinder.getDefault().find(new ClassMatcher(JOptionPane.class));
+        
+        assertNotNull("Script pop up an error dialog, not found", pane);
+
+        // Get rid of the panel
+        //
+        pane.setVisible(false);
+
+        // Check some of the properties
+        //
+        assertEquals("Script pop up an error dialog, wrong type", JOptionPane.ERROR_MESSAGE,  pane.getMessageType());
+        
+        
+    }
+
+
     /** Construct a test case with the given name. */
     public ScriptEditorTest(String name) { super(name); }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2827
          http://abbot.svn.sourceforge.net/abbot/?rev=2827&view=rev
Author:   gdavison
Date:     2012-04-04 12:19:17 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
Improvements to the CallEditor class for performance with hugh OSGi class loaders.

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/src/abbot/editor/editors/CallEditor.java
    abbot/trunk/src/abbot/editor/editors/StepEditor.java
    abbot/trunk/src/abbot/editor/widgets/TextField.java
    abbot/trunk/src/abbot/tester/ComponentTester.java
    abbot/trunk/src/abbot/tester/JTextComponentTester.java
    abbot/trunk/src/junit/extensions/abbot/ComponentTestFixture.java
    abbot/trunk/test/abbot/editor/editors/CallEditorTest.java
    abbot/trunk/test/abbot/editor/widgets/TextFieldTest.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-04-02 14:56:57 UTC (rev 2826)
+++ abbot/trunk/ChangeLog	2012-04-04 12:19:17 UTC (rev 2827)
@@ -1,3 +1,9 @@
+2012-04-03  Gerard Davison
+	* Show the user an error dialog if the script file contains erros
+	* Rather than consume every key event make the CallStep editor wait for a little while
+          and coalasing similar events so that we don't hit the class loader too much
+        * Deal with an IllegalArgumentException when editing the class for an action step
+
 2012-03-13  Gerard Davison
 
         * Minor fix in TestSelector for a null poiter when pressing "Select Test Suite...." button

Modified: abbot/trunk/src/abbot/editor/editors/CallEditor.java
===================================================================
--- abbot/trunk/src/abbot/editor/editors/CallEditor.java	2012-04-02 14:56:57 UTC (rev 2826)
+++ abbot/trunk/src/abbot/editor/editors/CallEditor.java	2012-04-04 12:19:17 UTC (rev 2827)
@@ -30,7 +30,9 @@
         this.call = call;
 
         target = addTextField(Strings.get("TargetClass"),
-                              call.getTargetClassName());
+                              call.getTargetClassName(),
+                              null,
+                              true); // Delay updates to increate perofmrance in large applications
         target.setName(TAG_CLASS);
 
         method = addComboBox(Strings.get("Method"),
@@ -56,6 +58,12 @@
             Arrays.sort(names);
             return names;
         }
+        // You get this in the case of an action where the value is not a Component or ComponentReference
+        catch (IllegalArgumentException ae) {
+            // TODO update the status bar with this information
+            // we don't seem to have a reference to the ScriptEditor at this point to do this
+            return new String[0];
+        }
         catch(ClassNotFoundException e) {
             return new String[0];
         }

Modified: abbot/trunk/src/abbot/editor/editors/StepEditor.java
===================================================================
--- abbot/trunk/src/abbot/editor/editors/StepEditor.java	2012-04-02 14:56:57 UTC (rev 2826)
+++ abbot/trunk/src/abbot/editor/editors/StepEditor.java	2012-04-04 12:19:17 UTC (rev 2827)
@@ -212,9 +212,16 @@
     }
 
     protected JTextField addTextField(String title, String value,
-                                      String defaultValue) {
+                                          String defaultValue) {
+  
+        return addTextField(title, value, defaultValue, false);
+    }
+    
+    protected JTextField addTextField(String title, String value,
+                                          String defaultValue,
+                                          boolean delayedUpdate) {
         JTextField field =
-            new abbot.editor.widgets.TextField(value, defaultValue);
+            new abbot.editor.widgets.TextField(value, defaultValue, delayedUpdate);
         field.addActionListener(this);
         add(title, field);
         return field;

Modified: abbot/trunk/src/abbot/editor/widgets/TextField.java
===================================================================
--- abbot/trunk/src/abbot/editor/widgets/TextField.java	2012-04-02 14:56:57 UTC (rev 2826)
+++ abbot/trunk/src/abbot/editor/widgets/TextField.java	2012-04-04 12:19:17 UTC (rev 2827)
@@ -27,6 +27,20 @@
 */
 public class TextField extends JTextField {
 
+
+    /**
+     * The delay to update the text field listener after a user action, this is to prevent
+     * a message storm when processing UI updates such as updating the class and methods.
+     */
+    public static final int TEXT_FIELD_UPDATE_DELAY = 300;
+
+    /**
+     * A client property that controls the lazy updating of this text field
+     */
+    /*package*/ static final String DELAYED_EVENTS_CLIENT_PROPERTY = "DELAYED_UPDATE_EVENTS";
+
+
+
     /** Action command when the field loses focus. */
     public static final String ACTION_FOCUS_LOST = "focus-lost";
     /** Action command when the text changes. */
@@ -75,9 +89,10 @@
         decorator = new Decorator(this);
     }
 
-    public TextField(String value, String defaultValue) {
+    public TextField(String value, String defaultValue, boolean delayedUpdate) {
         super(value);
         decorator = new Decorator(this, defaultValue);
+        putClientProperty(DELAYED_EVENTS_CLIENT_PROPERTY, delayedUpdate);
     }
 
     /** Don't allow text field to resize height. */
@@ -126,6 +141,8 @@
         private boolean continuousFire = true;
         // Value to place in field when it is empty and Enter is hit
         private String defaultValue;
+        // Used to make sure we don't kill the event queue for every key event
+        private TextFieldUpdateTimer updateTimer = new TextFieldUpdateTimer();
 
         public Decorator(JTextField textField) {
             this(textField, null);
@@ -211,6 +228,7 @@
             revertText = textField.getText();
         }
 
+
         private void setDefaultValue(String value) {
             this.defaultValue = value;
         }
@@ -223,10 +241,25 @@
         }
 
         private void fireActionPerformed(String command) {
+            
+            if (Boolean.TRUE.equals(textField.getClientProperty(DELAYED_EVENTS_CLIENT_PROPERTY))) {
+                // This will queue the event for a little bit so that we don't end up
+                // storing the class loader, if the events are the same then we coalese the
+                // events, otherwise we post the previous event right away then queue
+                // the new one
+                updateTimer.pushIfDifferent(command);
+            }
+            else {
+                fireActionPerformedImpl(command);
+            }
+        }
+        
+        private void fireActionPerformedImpl(String command) {
             textField.setActionCommand(command);
             textField.postActionEvent();
             textField.setActionCommand(null);
         }
+        
 
         /** Detect temporary focus loss due to menu activation (pre-1.4). */
         private boolean isLocalMenuActive(JTextField field) {
@@ -238,6 +271,50 @@
             return false;
         }
 
+        
+        protected class TextFieldUpdateTimer
+          extends Timer {
+
+
+            public TextFieldUpdateTimer() {
+                super(TEXT_FIELD_UPDATE_DELAY, null);
+                addActionListener(new ActionListener() {
+
+                        @Override
+                        public void actionPerformed(ActionEvent e) {
+                            fireActionPerformedImpl(e.getActionCommand());
+                            // Clear action command
+                            TextFieldUpdateTimer.this.setActionCommand(null);
+                        }
+                    });
+                setRepeats(false);
+            }
+            
+            /**
+             * Assuming this all happens on the event queue
+             * @param command
+             */
+            public void pushIfDifferent(String newCommand) {
+                if (newCommand.equals(getActionCommand())) {
+                    restart();
+                }
+                else {
+                    stop();
+                    // Force this message to first
+                    if (getActionCommand()!=null)
+                    {
+                        fireActionPerformed(new ActionEvent(TextFieldUpdateTimer.this, 0, getActionCommand(),
+                                                            System.currentTimeMillis(),
+                                                            0));
+                    }
+                    // Start the timer with the new command
+                    setActionCommand(newCommand);
+                    restart();
+                }
+            }
+        }
+
+
         protected class RevertFieldAction extends AbstractAction {
             public RevertFieldAction() {
                 super(REVERT_ACTION_NAME);
@@ -247,4 +324,7 @@
             }
         }
     }
+    
+    
+    
 }

Modified: abbot/trunk/src/abbot/tester/ComponentTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/ComponentTester.java	2012-04-02 14:56:57 UTC (rev 2826)
+++ abbot/trunk/src/abbot/tester/ComponentTester.java	2012-04-04 12:19:17 UTC (rev 2827)
@@ -1117,7 +1117,7 @@
      */
     protected void waitAction(String desc, Condition cond)
         throws ActionFailedException {
-        try { wait(cond); }
+        try { Robot.wait(cond); }
         catch(WaitTimedOutError wto) {
             throw new ActionFailedException(desc);
         }

Modified: abbot/trunk/src/abbot/tester/JTextComponentTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JTextComponentTester.java	2012-04-02 14:56:57 UTC (rev 2826)
+++ abbot/trunk/src/abbot/tester/JTextComponentTester.java	2012-04-04 12:19:17 UTC (rev 2827)
@@ -108,7 +108,7 @@
             // Wait for the component to contain the index in question
             //
            
-            wait(new ConditionEDTDecorator(c,new Condition() {
+            Robot.wait(new ConditionEDTDecorator(c,new Condition() {
                         @Override
                         public boolean test() {
                             try {

Modified: abbot/trunk/src/junit/extensions/abbot/ComponentTestFixture.java
===================================================================
--- abbot/trunk/src/junit/extensions/abbot/ComponentTestFixture.java	2012-04-02 14:56:57 UTC (rev 2826)
+++ abbot/trunk/src/junit/extensions/abbot/ComponentTestFixture.java	2012-04-04 12:19:17 UTC (rev 2827)
@@ -16,13 +16,19 @@
 import abbot.tester.Robot;
 import abbot.util.*;
 
+import java.util.concurrent.Callable;
+
+import junit.framework.AssertionFailedError;
+
+import org.junit.Assert;
+
 /** Fixture for testing AWT and/or JFC/Swing components under JUnit.  Ensures
  * proper setup and cleanup for a GUI environment.  Provides methods for
  * automatically placing a GUI component within a frame and properly handling
  * Window showing/hiding (including modal dialogs).  Catches exceptions thrown
- * on the event dispatch thread and rethrows them as test failures.<p> 
+ * on the event dispatch thread and rethrows them as test failures.<p>
  * Use {@link #showFrame(Component)}
- * when testing individual components, or 
+ * when testing individual components, or
  * {@link #showWindow(Window)}
  * when testing a {@link Frame}, {@link Dialog}, or {@link Window}.<p>
  * Any member fields you define which are classes derived from any of the
@@ -33,9 +39,9 @@
  * the tearDown method if those classes are not included or derived from those
  * in {@link #DISPOSE_CLASSES}.  Otherwise the resources will not be subject
  * to GC until the {@link TestCase} itself and any containing
- * {@link junit.framework.TestSuite} is 
+ * {@link junit.framework.TestSuite} is
  * disposed (which, in the case of the standard JUnit test runners, is
- * <i>never</i>). 
+ * <i>never</i>).
  */
 public abstract class ComponentTestFixture extends TestCase {
 
@@ -97,6 +103,58 @@
     /** Return a WindowTracker instance. */
     protected WindowTracker getWindowTracker() { return fixtureHelper.getWindowTracker(); }
 
+
+
+    /**
+     * Waits until a value equals to the value produced by the closure
+     * @param message The message is display if we fail
+     * @param expectedValue The expected value
+     * @param eventualValue The closure that fetched the value we are testing against
+     */
+    public static <T> void assertEqualsEventually(final String message, final T expectedValue, final Callable<T> eventualValue) {
+        try {
+            Robot.wait(
+                new Condition()
+                {
+                    @Override
+                    public boolean test() {
+                        try {
+                            Assert.assertEquals(
+                                message,
+                                expectedValue,
+                                eventualValue.call());
+                            return true;
+                        } catch (Throwable e) {
+                            return false;
+                        }
+                    }
+                });
+                
+        } 
+        catch (WaitTimedOutError wtoe) {
+            try {
+                Assert.assertEquals(
+                    message,
+                    expectedValue,
+                    eventualValue.call());
+            } catch (Exception e) {
+                AssertionFailedError ae = new AssertionFailedError("Failure to process assertion");
+                ae.initCause(e);
+                throw ae;
+            }
+        }
+    }
+
+
+    /**
+     * Waits until a value produce by the closure is true 
+     * @param message The message is display if we fail
+     * @param eventualValue The expected value, true of false
+     */
+    public static void assertTrueEventually(final String message,  final Callable<Boolean> eventualValue) {
+        assertEqualsEventually(message, Boolean.TRUE, eventualValue);
+    }
+
     /** Convenience method to sleep for a UI interval 
      * (same as getRobot().sleep()). 
      */

Modified: abbot/trunk/test/abbot/editor/editors/CallEditorTest.java
===================================================================
--- abbot/trunk/test/abbot/editor/editors/CallEditorTest.java	2012-04-02 14:56:57 UTC (rev 2826)
+++ abbot/trunk/test/abbot/editor/editors/CallEditorTest.java	2012-04-04 12:19:17 UTC (rev 2827)
@@ -7,6 +7,8 @@
 import abbot.tester.JTextComponentTester;
 import abbot.finder.matchers.*;
 
+import java.util.concurrent.Callable;
+
 /** Verify CallEditor operation. */
 
 public class CallEditorTest
@@ -47,13 +49,22 @@
 
     public void testMethodListUpdateOnClassChange() throws Exception {
         showFrame(editor);
-        JTextField tf = getTargetClassBox(editor);
-        JComboBox cb = getMethodComboBox(editor);
-        int count = cb.getItemCount();
+        final JTextField tf = getTargetClassBox(editor);
+        final JComboBox cb = getMethodComboBox(editor);
+        final int count = cb.getItemCount();
+
+        // Type some text
+        //
+
         String TEXT = "abbot.tester.ComponentTester";
         tester.actionEnterText(tf, TEXT);
-        assertEquals("Text entered improperly", TEXT, tf.getText());
-        assertTrue("Method list was not updated", count != cb.getItemCount());
+        
+        // The field are lazily updated so that we need to use these special versions
+        // of the assertion
+        ComponentTestFixture.assertEqualsEventually("Text entered improperly", TEXT, 
+                               new Callable<String>() { public String call() { return tf.getText(); } });
+        ComponentTestFixture.assertTrueEventually("Method list was not updated", 
+                              new Callable<Boolean>() { public Boolean call() { return count != cb.getItemCount();}});
     }
 
     protected JTextField getTargetClassBox(CallEditor editor)

Modified: abbot/trunk/test/abbot/editor/widgets/TextFieldTest.java
===================================================================
--- abbot/trunk/test/abbot/editor/widgets/TextFieldTest.java	2012-04-02 14:56:57 UTC (rev 2826)
+++ abbot/trunk/test/abbot/editor/widgets/TextFieldTest.java	2012-04-04 12:19:17 UTC (rev 2827)
@@ -4,6 +4,8 @@
 import junit.extensions.abbot.*;
 import abbot.tester.*;
 
+import java.util.concurrent.Callable;
+
 public class TextFieldTest extends ComponentTestFixture {
 
     private TextField textField;
@@ -29,10 +31,12 @@
         tester.actionEnterText(textField, "new text");
         assertTrue("Text not entered", !textField.getText().equals(orig));
         textField.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                fired.flag = true;
-                fired.command = e.getActionCommand();
-            }
+            public void actionPerformed(ActionEvent     e) {
+                    if (TextField.ACTION_TEXT_REVERTED.equals(e.getActionCommand())) {
+                        fired.flag = true;
+                        fired.command = e.getActionCommand();
+                    }
+                }
         });
         tester.actionKeyStroke(textField, KeyEvent.VK_ESCAPE);
         assertEquals("Text not reverted", orig, textField.getText());
@@ -49,6 +53,59 @@
                      text, textField.getSelectedText());
     }
 
+
+    //
+    // Versions with the message delay built in
+    //
+
+    public void testDelayedReplaceText() {
+        textField.putClientProperty(TextField.DELAYED_EVENTS_CLIENT_PROPERTY, true);
+        tester.actionActionMap(textField, "select-all");
+        tester.actionKeyString("replaced");
+        
+        assertEqualsEventually("Text not replaced", "replaced", 
+                               new Callable<String>() { public String call() { return textField.getText(); } });
+    }
+
+    public void testdDelayedRevert() {
+        textField.putClientProperty(TextField.DELAYED_EVENTS_CLIENT_PROPERTY, true);
+        class Flag { volatile boolean flag; String command; }
+        final Flag fired = new Flag();
+        String orig = textField.getText();
+        tester.actionEnterText(textField, "new text");
+        assertTrue("Text not entered", !textField.getText().equals(orig));
+        textField.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent     e) {
+                if (TextField.ACTION_TEXT_REVERTED.equals(e.getActionCommand())) {
+                    fired.flag = true;
+                    fired.command = e.getActionCommand();
+                }
+            }
+        });
+
+        tester.actionKeyStroke(textField, KeyEvent.VK_ESCAPE);
+
+
+        assertEqualsEventually("Text not reverted", orig, 
+                               new Callable<String>() { public String call() { return textField.getText(); } });
+        // Event can be fired after a slight delay
+        assertTrueEventually("No action fired on revert", 
+                              new Callable<Boolean>() { public Boolean call() { return fired.flag; } });
+        assertEquals("Wrong action command",
+                     TextField.ACTION_TEXT_REVERTED, fired.command);
+    }
+
+    public void testDelayedSelectAllOnEnter() {
+        textField.putClientProperty(TextField.DELAYED_EVENTS_CLIENT_PROPERTY, true);
+        String text = "new text";
+        tester.actionEnterText(textField, text);
+        tester.actionKeyStroke(textField, KeyEvent.VK_ENTER);
+        assertEqualsEventually("Text should be selected",
+                     text, 
+                     new Callable<String>() { public String call() { return textField.getSelectedText(); } });
+    }
+
+
     /** Construct a test case with the given name. */
     public TextFieldTest(String name) { super(name); }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2828
          http://abbot.svn.sourceforge.net/abbot/?rev=2828&view=rev
Author:   gdavison
Date:     2012-04-26 16:11:29 +0000 (Thu, 26 Apr 2012)
Log Message:
-----------
JTeeLocation was not EDT safe as we were seeing this as test failures

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/src/abbot/tester/JTreeLocation.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-04-04 12:19:17 UTC (rev 2827)
+++ abbot/trunk/ChangeLog	2012-04-26 16:11:29 UTC (rev 2828)
@@ -1,3 +1,6 @@
+2012-04-26  Gerard Davison
+        * Make the code in JTreeLocation EDT safe
+
 2012-04-03  Gerard Davison
 	* Show the user an error dialog if the script file contains erros
 	* Rather than consume every key event make the CallStep editor wait for a little while

Modified: abbot/trunk/src/abbot/tester/JTreeLocation.java
===================================================================
--- abbot/trunk/src/abbot/tester/JTreeLocation.java	2012-04-04 12:19:17 UTC (rev 2827)
+++ abbot/trunk/src/abbot/tester/JTreeLocation.java	2012-04-26 16:11:29 UTC (rev 2828)
@@ -12,6 +12,8 @@
 import abbot.script.parsers.TreePathParser;
 import abbot.util.ExtendedComparator;
 
+import java.util.concurrent.Callable;
+
 /** Provides encapsulation of a visible location on a {@link JTree}.
  *  A row index or a {@link String}ified {@link TreePath} (i.e. each
  * {@link TreePath} component is a {@link String}) or a {@link TreePath}
@@ -84,8 +86,14 @@
     /** Convert the given row to an x, y coordinate.
         @throws LocationUnavailableException if the row is not visible.
      */
-    protected Point rowToPoint(JTree tree, int row) {
-        TreePath path = tree.getPathForRow(row);
+    protected Point rowToPoint(final JTree tree, final int row) {
+        TreePath path = Robot.callAndWait(tree, new Callable<TreePath>() {
+            @Override
+            public TreePath call() {
+                return tree.getPathForRow(row);
+            }
+        });
+
         if (path == null) {
             String msg = Strings.get("tester.JTree.row_not_visible",
                                      new Object[] { new Integer(row) });
@@ -98,12 +106,21 @@
         @throws LocationUnavailableException if any part of the path is
         hidden. 
      */
-    protected Point pathToPoint(JTree tree, TreePath path) {
-        path = findMatchingPath(tree, path);
-        Rectangle rect = tree.getPathBounds(path);
+    protected Point pathToPoint(final JTree tree, final TreePath path) {
+        final TreePath matchingPath = findMatchingPath(tree, path);
+        
+        Rectangle rect = Robot.callAndWait(tree, new Callable<Rectangle>() {
+            @Override
+            public Rectangle call() {
+                return tree.getPathBounds(matchingPath);
+            }
+        });
+            
+            
+            
         if (rect == null) {
             String msg = Strings.get("tester.JTree.path_not_visible",
-                                     new Object[] { path });
+                                     new Object[] { matchingPath });
             throw new LocationUnavailableException(msg);
         }
         if (inExpansion) 
@@ -119,7 +136,7 @@
     /** Return the path represented by this JTree location.  
         @return null if the path can not be found.
     */
-    TreePath getPath(JTree tree) {
+    TreePath getPath(final JTree tree) {
         if (treePath != null) {
             try {
                 return findMatchingPath(tree, treePath);
@@ -129,22 +146,44 @@
             }
         }
         if (row != -1) {
-            return tree.getPathForRow(row);
+            return Robot.callAndWait(tree, new Callable<TreePath>() {
+                @Override
+                public TreePath call() {
+                    return tree.getPathForRow(row);
+                }
+            });
         }
-        Point where = super.getPoint(tree);
-        return tree.getPathForLocation(where.x, where.y);
+        final Point where = super.getPoint(tree);
+        return Robot.callAndWait(tree, new Callable<TreePath>() {
+            @Override
+            public TreePath call() {
+                return tree.getPathForLocation(where.x, where.y);
+            }
+        });
     }
 
     /** Return the row represented by this JTree location.  
         @return -1 if the row is not found.
     */
-    int getRow(JTree tree) {
-        if (treePath != null) 
-            return tree.getRowForPath(getPath(tree));
-        else if (row != -1)
+    int getRow(final JTree tree) {
+        if (treePath != null) {
+            return Robot.callAndWait(tree, new Callable<Integer>() {
+                @Override
+                public Integer call() {
+                    return tree.getRowForPath(getPath(tree));
+                }
+            }); 
+        }
+        else if (row != -1) {
             return row;
-        Point where = super.getPoint(tree);
-        return tree.getRowForLocation(where.x, where.y);
+        }
+        final Point where = super.getPoint(tree);
+        return Robot.callAndWait(tree, new Callable<Integer>() {
+            @Override
+            public Integer call() {
+                return tree.getRowForLocation(where.x, where.y);
+            }
+        });
     }
 
     /** Return a concrete point for the abstract location. */
@@ -161,13 +200,20 @@
     }
 
     public Rectangle getBounds(Component c) {
-        JTree tree = (JTree)c;
-        int row = getRow(tree);
+        final JTree tree = (JTree)c;
+        final int row = getRow(tree);
         if (row == -1) {
             Point where = getPoint(c);
             return new Rectangle(where.x, where.y, 1, 1);
         }
-        Rectangle rect = tree.getRowBounds(row);
+        Rectangle rect = Robot.callAndWait(tree, new Callable<Rectangle>() {
+            @Override
+            public Rectangle call() {
+                return tree.getRowBounds(row);
+            }
+        });
+            
+            
         if (rect == null) {
             String msg = Strings.get("tester.JTree.row_not_visible",
                                      new Object[] { new Integer(row) });
@@ -318,7 +364,7 @@
         // Return null if any of them are not found.
         Log.debug("Comparing " + realPath + " with " + input[0]
                   + " from " + java.util.Arrays.asList(input));
-        TreeModel model = tree.getModel();
+        final TreeModel model = tree.getModel();
         if (!matchesLastComponent(tree, input[0], realPath)) {
             Log.debug("no root match");
         }
@@ -329,12 +375,26 @@
 
             Object[] subs = new Object[input.length-1];
             System.arraycopy(input, 1, subs, 0, subs.length);
-            Object obj = realPath.getLastPathComponent();
-            int count = model.getChildCount(obj);
-            Log.debug("Obj " + obj + " (" + obj.getClass() + ") has " + count);
+            final Object obj = realPath.getLastPathComponent();
+            
+            // Talk to the model on the event queue
+            //
+            Object[] children = Robot.callAndWait(tree, new Callable<Object[]>() {
+                @Override
+                public Object[] call() {
+                    int count = model.getChildCount(obj);
+                    Object ret[] = new Object[count];
+                    for (int i = 0; i < count; i++) {
+                        ret[i] = model.getChild(obj, i);
+                    }
+                    return ret;
+                }
+            });
+            
+            Log.debug("Obj " + obj + " (" + obj.getClass() + ") has " + children.length);
             // Find the right child to match
-            for (int i=0;i < count;i++) {
-                Object child = model.getChild(obj, i);
+            for (int i=0;i < children.length;i++) {
+                Object child = children[i];
                 Log.debug("checking child " + i + " (" + child + ")");
                 TreePath newPath =
                     findMatchingPath(tree, realPath.pathByAddingChild(child),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2829
          http://abbot.svn.sourceforge.net/abbot/?rev=2829&view=rev
Author:   gdavison
Date:     2012-05-09 16:02:38 +0000 (Wed, 09 May 2012)
Log Message:
-----------
2012-05-12  Gerard Davison

        * Updated version number to 1.3.0RC1

        * Added very basic cut/copy/paste clipboard support, don't support references from another file yet
        * Added the ability to just delete a step
        * Bug 3524725, using the incorrect version of actionClick when parameter is a number not a string
           * sort methods so that we try to match boolean, primitives, Numbers, strings then any other object
        
        * RecordingFailedException, now uses standard cause property
        * ScriptEditorFrame, a coupld of EDT violations in normal operation
        * JTextComponentTester, unreliable selection on text that is not visible as drag doesn't happen when
            text is offset to the end of the text field. [Removed as doesn't quite work]
        * EDT violations in JTreeTester
        * EDT violation in JComboxBoxTester
        * EDT vioaltions in JTableTester
        
        * JDK 7 Fixes
          * StringsTest failed on JDK 7, looks like a difference in classloading, using different property names
            fixed the problems
          * TreePath tests failed on JDK 7, you can no longer have a null root path
          * AppClassLoaderTest, fixed tests to be more reliable under garbage collection
          * FileDialogRecorderTest, fixed the difference in the returned strings on different platforms
          * JTabbedPanelTester, not waiting for idle after tab click
          * JTableTesterTest, EDT vioaltion causing test to intermittently fail
          * WeakAWTEventListenerTest, gc code lead to unreliable test
          * ComponentReference, failures due to inability to access parent reference correct. (Not sure why this
              wasn't cauing a problem with JDK 6, should make things faster though)
          * Added support for more recent JDK versions in the Platform class
          
          
        TODO add tests for editor cut/copy/paste support
        

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/build.xml
    abbot/trunk/doc/FAQ.shtml
    abbot/trunk/doc/Tutorial-1.shtml
    abbot/trunk/doc/Tutorial-2.shtml
    abbot/trunk/doc/Tutorial-3.shtml
    abbot/trunk/doc/download.shtml
    abbot/trunk/doc/examples.shtml
    abbot/trunk/doc/help.shtml
    abbot/trunk/doc/news.shtml
    abbot/trunk/doc/overview.shtml
    abbot/trunk/doc/quick-start.shtml
    abbot/trunk/doc/tutorials.shtml
    abbot/trunk/doc/user-guide.shtml
    abbot/trunk/lib/costello.jar
    abbot/trunk/projects/jdeveloper/Tests/Tests.jpr
    abbot/trunk/src/abbot/Platform.java
    abbot/trunk/src/abbot/Version.java
    abbot/trunk/src/abbot/editor/EditorConstants.java
    abbot/trunk/src/abbot/editor/ScriptEditor.java
    abbot/trunk/src/abbot/editor/ScriptEditorFrame.java
    abbot/trunk/src/abbot/editor/ScriptTable.java
    abbot/trunk/src/abbot/editor/i18n/costello.properties
    abbot/trunk/src/abbot/editor/recorder/RecordingFailedException.java
    abbot/trunk/src/abbot/overview.html
    abbot/trunk/src/abbot/script/Call.java
    abbot/trunk/src/abbot/script/ComponentReference.java
    abbot/trunk/src/abbot/script/Script.java
    abbot/trunk/src/abbot/script/Sequence.java
    abbot/trunk/src/abbot/script/Step.java
    abbot/trunk/src/abbot/tester/JComboBoxTester.java
    abbot/trunk/src/abbot/tester/JTabbedPaneTester.java
    abbot/trunk/src/abbot/tester/JTableTester.java
    abbot/trunk/src/abbot/tester/JTextComponentTester.java
    abbot/trunk/src/abbot/tester/JTreeTester.java
    abbot/trunk/src/abbot/tester/Robot.java
    abbot/trunk/src/abbot/util/WeakAWTEventListener.java
    abbot/trunk/test/abbot/editor/recorder/AbstractRecorderFixture.java
    abbot/trunk/test/abbot/editor/recorder/FileDialogRecorderTest.java
    abbot/trunk/test/abbot/i18n/StringsTest.java
    abbot/trunk/test/abbot/script/ActionTest.java
    abbot/trunk/test/abbot/script/AppClassLoaderTest.java
    abbot/trunk/test/abbot/script/CallTest.java
    abbot/trunk/test/abbot/script/parsers/TreePathParserTest.java
    abbot/trunk/test/abbot/tester/JTableTesterTest.java
    abbot/trunk/test/abbot/tester/JTextComponentTesterTest.java
    abbot/trunk/test/abbot/tester/JTreeLocationTest.java
    abbot/trunk/test/abbot/tester/JTreeTesterTest.java
    abbot/trunk/test/abbot/util/WeakAWTEventListenerTest.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/ChangeLog	2012-05-09 16:02:38 UTC (rev 2829)
@@ -1,3 +1,37 @@
+2012-05-12  Gerard Davison
+
+        * Updated version number to 1.3.0RC1
+
+        * Added very basic cut/copy/paste clipboard support, don't support references from another file yet
+        * Added the ability to just delete a step
+        * Bug 3524725, using the incorrect version of actionClick when parameter is a number not a string
+           * sort methods so that we try to match boolean, primitives, Numbers, strings then any other object
+        
+        * RecordingFailedException, now uses standard cause property
+        * ScriptEditorFrame, a coupld of EDT violations in normal operation
+        * JTextComponentTester, unreliable selection on text that is not visible as drag doesn't happen when
+            text is offset to the end of the text field. [Removed as doesn't quite work]
+        * EDT violations in JTreeTester
+        * EDT violation in JComboxBoxTester
+        * EDT vioaltions in JTableTester
+        
+        * JDK 7 Fixes
+          * StringsTest failed on JDK 7, looks like a difference in classloading, using different property names
+            fixed the problems
+          * TreePath tests failed on JDK 7, you can no longer have a null root path
+          * AppClassLoaderTest, fixed tests to be more reliable under garbage collection
+          * FileDialogRecorderTest, fixed the difference in the returned strings on different platforms
+          * JTabbedPanelTester, not waiting for idle after tab click
+          * JTableTesterTest, EDT vioaltion causing test to intermittently fail
+          * WeakAWTEventListenerTest, gc code lead to unreliable test
+          * ComponentReference, failures due to inability to access parent reference correct. (Not sure why this
+              wasn't cauing a problem with JDK 6, should make things faster though)
+          * Added support for more recent JDK versions in the Platform class
+          
+          
+        TODO add tests for editor cut/copy/paste support
+        
+
 2012-04-26  Gerard Davison
         * Make the code in JTreeLocation EDT safe
 

Modified: abbot/trunk/build.xml
===================================================================
--- abbot/trunk/build.xml	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/build.xml	2012-05-09 16:02:38 UTC (rev 2829)
@@ -11,7 +11,7 @@
   </description>
   <!-- global properties -->
   <!-- This is the master version number.  Changes here affect everything. -->
-  <property name="abbot.version" value="1.2.0"/>
+  <property name="abbot.version" value="1.3.0RC1"/>
   <property name="copyright"
     value="Copyright &#169; 2002-2011 Timothy Wall. All Rights Reserved."/>
   <property name="company.full" value="Abbot Framework"/>

Modified: abbot/trunk/doc/FAQ.shtml
===================================================================
--- abbot/trunk/doc/FAQ.shtml	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/doc/FAQ.shtml	2012-05-09 16:02:38 UTC (rev 2829)
@@ -18,7 +18,7 @@
 All materials Copyright &#169; 2002-2011
 <a href=mailto:twall_AT_users.sf.net>Timothy Wall</a>,
 All Rights Reserved<br><p>
-This version 1.2.0<br>
+This version 1.3.0RC1<br>
 </center> 
 
 <h1>FAQ:

Modified: abbot/trunk/doc/Tutorial-1.shtml
===================================================================
--- abbot/trunk/doc/Tutorial-1.shtml	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/doc/Tutorial-1.shtml	2012-05-09 16:02:38 UTC (rev 2829)
@@ -16,7 +16,7 @@
 <font color="#00CC00">A</font><font color="#FF0000">b</font><font color="#00CC00">b</font>ot framework for testing Java GUI components and programs</i><br> 
 All materials Copyright &#169 2002-2011 All Rights Reserved
 <a href=mailto:twall_AT_users.sourceforge.net>Timothy Wall</a><br><p>
-This version 1.2.0-RC2
+This version 1.3.0RC1-RC2
 </center> 
 
 <h1>Tutorial 1: Unit Testing A Single GUI Component</h1>

Modified: abbot/trunk/doc/Tutorial-2.shtml
===================================================================
--- abbot/trunk/doc/Tutorial-2.shtml	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/doc/Tutorial-2.shtml	2012-05-09 16:02:38 UTC (rev 2829)
@@ -16,7 +16,7 @@
 <font color="#00CC00">A</font><font color="#FF0000">b</font><font color="#00CC00">b</font>ot framework for testing Java GUI components and programs</i><br> 
 All materials Copyright &#169; 2002-2011 All Rights Reserved
 <a href=mailto:twall_AT_users.sourceforge.net>Timothy Wall</a><br><p>
-This version 1.2.0-RC2
+This version 1.3.0RC1-RC2
 </center> 
 
 <h1>Tutorial 2: Testing A Group of Components (Part I)</h1>

Modified: abbot/trunk/doc/Tutorial-3.shtml
===================================================================
--- abbot/trunk/doc/Tutorial-3.shtml	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/doc/Tutorial-3.shtml	2012-05-09 16:02:38 UTC (rev 2829)
@@ -16,7 +16,7 @@
 <font color="#00CC00">A</font><font color="#FF0000">b</font><font color="#00CC00">b</font>ot framework for testing Java GUI components and programs</i><br> 
 All materials Copyright &#169; 2002-2011 All Rights Reserved
 <a href=mailto:twall_AT_users.sourceforge.net>Timothy Wall</a><br><p>
-This version 1.2.0
+This version 1.3.0RC1
 </center> 
 
 <h1>Tutorial 3: Testing A Group of Components (Part II)</h1>

Modified: abbot/trunk/doc/download.shtml
===================================================================
--- abbot/trunk/doc/download.shtml	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/doc/download.shtml	2012-05-09 16:02:38 UTC (rev 2829)
@@ -25,14 +25,14 @@
 All materials Copyright \xA9 2002-2011 <a href="mailto:twall_AT_users.sf.net">Timothy
 Wall</a>, All Rights Reserved</p>
 
-<p align=center style='text-align:center'>This version 1.2.0 </p>
+<p align=center style='text-align:center'>This version 1.3.0RC1 </p>
 
 <h2>Download</h2>
 
 <p>The latest abbot package is available in [<a
-href="http://prdownloads.sf.net/abbot/abbot-1.2.0.tgz?download"><span
+href="http://prdownloads.sf.net/abbot/abbot-1.3.0RC1.tgz?download"><span
 style='color:black'>tgz</span></a>] [<a
-href="http://prdownloads.sf.net/abbot/abbot-1.2.0.zip?download"><span
+href="http://prdownloads.sf.net/abbot/abbot-1.3.0RC1.zip?download"><span
 style='color:black'>zip</span></a>] formats, which includes source. You can
 also browse the files available at <a
 href="http://sourceforge.net/project/showfiles.php?group_id=50939">SourceForge</a>,

Modified: abbot/trunk/doc/examples.shtml
===================================================================
--- abbot/trunk/doc/examples.shtml	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/doc/examples.shtml	2012-05-09 16:02:38 UTC (rev 2829)
@@ -29,7 +29,7 @@
 All materials Copyright \xA9 2002-2011 <a href="mailto:twall_AT_users.sf.net">Timothy
 Wall</a>, All Rights Reserved</p>
 
-<p align=center style='text-align:center'>This version 1.2.0-RC2</p>
+<p align=center style='text-align:center'>This version 1.3.0RC1-RC2</p>
 
 <h3>Examples</h3>
 

Modified: abbot/trunk/doc/help.shtml
===================================================================
--- abbot/trunk/doc/help.shtml	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/doc/help.shtml	2012-05-09 16:02:38 UTC (rev 2829)
@@ -29,7 +29,7 @@
 All materials Copyright \xA9 2002-2011 <a href="mailto:twall_AT_users.sf.net">Timothy
 Wall</a>, All Rights Reserved</p>
 
-<p align=center style='text-align:center'>This version 1.2.0</p>
+<p align=center style='text-align:center'>This version 1.3.0RC1</p>
 
 <h3><a name=Support></a>Questions, Help, Support and Contributions</h3>
 

Modified: abbot/trunk/doc/news.shtml
===================================================================
--- abbot/trunk/doc/news.shtml	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/doc/news.shtml	2012-05-09 16:02:38 UTC (rev 2829)
@@ -16,7 +16,7 @@
 <div class=Section1> 
   <p class=MsoNormal align=center style='text-align:center'><i><span style='color:lime'>A</span></i><i><span style='color:red'>b</span></i><i><span style='color:lime'>b</span>ot framework for automated testing of Java GUI components and programs</i><br> 
     All materials Copyright &#169; 2002-2011 <a href="mailto:twall_AT_users.sf.net">Timothy Wall</a>, All Rights Reserved</p> 
-  <p align=center style='text-align:center'>This version 1.2.0-RC2 (111118)</p> 
+  <p align=center style='text-align:center'>This version 1.3.0RC1-RC2 (111118)</p> 
   <h2>NEWS</h2> 
   <ul>
     <li><b>12/2011</b> 1.2 Released

Modified: abbot/trunk/doc/overview.shtml
===================================================================
--- abbot/trunk/doc/overview.shtml	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/doc/overview.shtml	2012-05-09 16:02:38 UTC (rev 2829)
@@ -19,7 +19,7 @@
 style='color:#00CC00'>A</span></i><i><span style='color:red'>b</span></i><i><span
 style='color:#00CC00'>b</span>ot framework for automated testing of Java GUI components and programs</i><br> 
     All materials Copyright \xA9 2002-2011 <a href="mailto:twall_AT_users.sf.net">Timothy Wall</a>, All Rights Reserved</p> 
-  <p align=center style='text-align:center'>This version 1.2.0</p> 
+  <p align=center style='text-align:center'>This version 1.3.0RC1</p> 
   <h1 align=center style='text-align:center'>Getting Started with the Abbot Java GUI Test Framework</h1> 
   <h2 align=center style='text-align:center'><i>Building unit tests and functional tests (AWTUnit/SwingUnit)</i></h2> 
   <p class=MsoBodyText>Abbot helps you test your Java UI. It comprises Abbot, which lets you programmatically drive UI components, and Costello (built on Abbot) which allows you to easily launch, explore and control an application. The framework may be used with both scripts and compiled code.</p> 

Modified: abbot/trunk/doc/quick-start.shtml
===================================================================
--- abbot/trunk/doc/quick-start.shtml	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/doc/quick-start.shtml	2012-05-09 16:02:38 UTC (rev 2829)
@@ -25,7 +25,7 @@
 All materials Copyright \xA9 2002-2011 <a href="mailto:twall_AT_users.sf.net">Timothy
 Wall</a>, All Rights Reserved</p>
 
-<p align=center style='text-align:center'>This version 1.2.0</p>
+<p align=center style='text-align:center'>This version 1.3.0RC1</p>
 
 <h2>Quick Start</h2>
 

Modified: abbot/trunk/doc/tutorials.shtml
===================================================================
--- abbot/trunk/doc/tutorials.shtml	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/doc/tutorials.shtml	2012-05-09 16:02:38 UTC (rev 2829)
@@ -25,7 +25,7 @@
 All materials Copyright \xA9 2002-2011 <a href="mailto:twall_AT_users.sf.net">Timothy
 Wall</a>, All Rights Reserved</p>
 
-<p align=center style='text-align:center'>This version 1.2.0 </p>
+<p align=center style='text-align:center'>This version 1.3.0RC1 </p>
 
 <h3><a name=QuickStart></a>Tutorials</h3>
 

Modified: abbot/trunk/doc/user-guide.shtml
===================================================================
--- abbot/trunk/doc/user-guide.shtml	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/doc/user-guide.shtml	2012-05-09 16:02:38 UTC (rev 2829)
@@ -16,7 +16,7 @@
 All materials Copyright &#169; 2002-2011
 <a href=mailto:twall_AT_users.sf.net>Timothy Wall</a>,
 All Rights Reserved<br><p>
-This version 1.2.0<br>
+This version 1.3.0RC1<br>
 </center> 
 
 <center><h1>Getting Started with Costello</h1></center>

Modified: abbot/trunk/lib/costello.jar
===================================================================
(Binary files differ)

Modified: abbot/trunk/projects/jdeveloper/Tests/Tests.jpr
===================================================================
--- abbot/trunk/projects/jdeveloper/Tests/Tests.jpr	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/projects/jdeveloper/Tests/Tests.jpr	2012-05-09 16:02:38 UTC (rev 2829)
@@ -95,6 +95,7 @@
    <hash n="oracle.jdeveloper.model.PathsConfiguration">
       <hash n="javaContentSet">
          <list n="pattern-filters">
+            <string v="-test/"/>
             <string v="-abbot/tester/extensions/JGraphTesterTest.java"/>
             <string v="-abbot/tester/extensions/JGraphLocationTest.java"/>
             <string v="+**"/>

Modified: abbot/trunk/src/abbot/Platform.java
===================================================================
--- abbot/trunk/src/abbot/Platform.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/Platform.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -15,6 +15,9 @@
     public static final int JAVA_1_4 = 0x1400;
     public static final int JAVA_1_5 = 0x1500;
     public static final int JAVA_1_6 = 0x1600;
+    public static final int JAVA_1_7 = 0x1700;
+    public static final int JAVA_1_8 = 0x1800;
+    public static final int JAVA_1_9 = 0x1900;
 
     public static final String OS_NAME;
     public static final String JAVA_VERSION_STRING;
@@ -76,6 +79,20 @@
     public static boolean isSolaris() { return isSunOS; }
     public static boolean isHPUX() { return isHPUX; }
     public static boolean isLinux() { return isLinux; }
+    
+    public static boolean is6OrAfter() { return JAVA_VERSION>=JAVA_1_6; }
+    public static boolean is7OrAfter() { return JAVA_VERSION>=JAVA_1_7; }
+    public static boolean is8OrAfter() { return JAVA_VERSION>=JAVA_1_8; }
+
+    public static boolean isBefore7() { return JAVA_VERSION<JAVA_1_7; }
+    public static boolean isBefore8() { return JAVA_VERSION<JAVA_1_8; }
+
+        
+    public static boolean is6() { return JAVA_VERSION>=JAVA_1_6 && JAVA_VERSION<JAVA_1_7; }
+    public static boolean is7() { return JAVA_VERSION>=JAVA_1_7 && JAVA_VERSION<JAVA_1_8; }
+    public static boolean is8() { return JAVA_VERSION>=JAVA_1_8 && JAVA_VERSION<JAVA_1_9; }
+    
+    
     public static void main(String[] args) {
         System.out.println("Java version is " + JAVA_VERSION_STRING);
         System.out.println("Version number is " + Integer.toHexString(JAVA_VERSION));

Modified: abbot/trunk/src/abbot/Version.java
===================================================================
--- abbot/trunk/src/abbot/Version.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/Version.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -3,7 +3,7 @@
 /** Current version of the framework. */
 
 public interface Version {
-    String VERSION = "1.2.0";
+    String VERSION = "1.3.0RC1";
 }
 
 

Modified: abbot/trunk/src/abbot/editor/EditorConstants.java
===================================================================
--- abbot/trunk/src/abbot/editor/EditorConstants.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/editor/EditorConstants.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -34,7 +34,10 @@
     String ACTION_SCRIPT_CLOSE = "script-close";
     String ACTION_SCRIPT_DELETE = "script-delete";
     String ACTION_SCRIPT_CLEAR = "script-clear";
+    String ACTION_STEP_DELETE = "step-delete";
     String ACTION_STEP_CUT = "step-cut";
+    String ACTION_STEP_COPY = "step-copy";
+    String ACTION_STEP_PASTE = "step-paste";
     String ACTION_STEP_MOVE_UP = "step-move-up";
     String ACTION_STEP_MOVE_DOWN = "step-move-down";
     String ACTION_STEP_GROUP = "step-group";

Modified: abbot/trunk/src/abbot/editor/ScriptEditor.java
===================================================================
--- abbot/trunk/src/abbot/editor/ScriptEditor.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/editor/ScriptEditor.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -33,6 +33,11 @@
 import abbot.tester.Robot;
 import abbot.util.*;
 
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+
 /**
  * This is the 'model' behind the script editor UI.<p>
  *
@@ -278,6 +283,9 @@
             {
                 MENU_EDIT,
                 ACTION_STEP_CUT,
+                ACTION_STEP_COPY,
+                ACTION_STEP_PASTE,
+                ACTION_STEP_DELETE,
                 null,
                 ACTION_STEP_MOVE_UP,
                 ACTION_STEP_MOVE_DOWN,
@@ -346,6 +354,9 @@
             new ScriptDeleteAction(),
             new ScriptClearAction(),
             new StepCutAction(),
+            new StepCopyAction(),
+            new StepPasteAction(),
+            new StepDeleteAction(),
             new StepMoveUpAction(),
             new StepMoveDownAction(),
             new StepGroupAction(),
@@ -523,7 +534,11 @@
 
         // Override default "cut" action in table
         ActionMap amap = scriptTable.getActionMap();
+        amap.put("delete", actionMap.get(ACTION_STEP_DELETE));
         amap.put("cut", actionMap.get(ACTION_STEP_CUT));
+        amap.put("copy", actionMap.get(ACTION_STEP_COPY));
+        amap.put("paste", actionMap.get(ACTION_STEP_PASTE));
+        
         InputMap imap = scriptTable.getInputMap();
         imap.put(KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0), "toggle");
 
@@ -701,8 +716,8 @@
         }
         catch(RecordingFailedException e) {
             String msg = Strings.get("editor.recording.stop_failure");
-            Throwable error = e.getReason() instanceof BugReport
-                ? e.getReason() : new BugReport(msg, e.getReason());
+            Throwable error = e.getCause() instanceof BugReport
+                ? e.getCause() : new BugReport(msg, e.getCause());
             Log.log("Recording stop failure: " + error.toString());
             view.showWarning(msg);
             status = error.getMessage();
@@ -894,14 +909,60 @@
         }
     }
 
+
     /** Remove the selected step. */
-    private void cutSelection() {
+    private void deleteSelection() {
         int row = scriptTable.getSelectedRow();
         if (row == -1) {
+            Log.warn("Unexpected delete state");
+            return;
+        }
+        List<Step> stepsToRemove = scriptTable.getSelectedSteps();
+
+        // Remove elements as required
+        removeStepsFromModel(row, stepsToRemove);
+    }
+
+    
+    /** Remove the selected step. */
+    private void copySelection(boolean cut) {
+        int row = scriptTable.getSelectedRow();
+        if (row == -1) {
             Log.warn("Unexpected cut state");
             return;
         }
-        scriptModel.removeSteps(scriptTable.getSelectedSteps());
+        List<Step> stepsToRemove = scriptTable.getSelectedSteps();
+
+        // Build a string of the selected characters
+        //
+
+        StringBuilder sb = new StringBuilder();
+        for (Step nextStep : stepsToRemove) {
+            sb.append(Step.toXMLString(nextStep));
+            sb.append("\n");
+        }
+        
+        // Remove elements as required
+        if (cut)
+        {
+            removeStepsFromModel(row, stepsToRemove);
+        }
+        
+        // Place the text on the clipboard
+        
+        Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+        clipboard.setContents(new StringSelection(sb.toString()), null);
+
+        //
+        setActionsEnabledState();
+        setStatus("");
+    }
+
+
+    private void removeStepsFromModel(int row, List<Step> stepsToRemove) {
+        // Remove the steps from the model
+
+        scriptModel.removeSteps(stepsToRemove);
         int count = scriptTable.getRowCount();
         if (count > 0) {
             if (row >= count)
@@ -909,10 +970,75 @@
             scriptTable.setRowSelectionInterval(row, row);
             scriptTable.setCursorLocation(row + 1);
         }
+    }
+
+    /** Remove the selected step. */
+    private void pasteSteps() {
+
+        int row = scriptTable.getSelectedRow();
+        if (row == -1) {
+            Log.warn("Unexpected paste state");
+            return;
+        }
+        
+        //
+        
+        String status = "";
+        
+        // Right lets get hold of the steps
+        
+
+        Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+        Transferable transferable = clipboard.getContents(null);
+        
+        if  (transferable!=null
+            && transferable.isDataFlavorSupported(DataFlavor.stringFlavor)) {
+            
+            try
+            {
+                String st = (String)transferable.getTransferData(DataFlavor.stringFlavor);
+                // Make this string into a sequence so we can parse it
+                String sequenceString = "<sequence>\n" +
+                    st + 
+                    "</sequence>";
+                
+                Sequence sequence = Sequence.createSequenceFromString(scriptModel.getScriptOf(row), sequenceString);
+                Step step = scriptModel.getStepAt(row);
+                Sequence parent;
+                int index;
+                
+                if (step instanceof Sequence
+                    && scriptModel.isOpen(step)) {
+                    parent = (Sequence)step;
+                    index = 0;
+                }
+                else {
+                    parent = scriptModel.getParent(step);
+                    index = parent.indexOf(step) +1;                    
+                }
+                
+                
+                scriptModel.insertSteps(
+                    parent, 
+                    sequence.steps(), 
+                    index);
+                
+                
+            }
+            catch (Exception ex) {
+                Log.warn(ex);
+                status = ex.getMessage();
+            }
+        }
+
+
+
         setActionsEnabledState();
-        setStatus("");
+        setStatus(status);
     }
 
+
+
     private void moveSelectionUp() {
         scriptTable.moveUp();
         setActionsEnabledState();
@@ -1184,6 +1310,19 @@
         setEnabled(ACTION_SCRIPT_CLOSE, haveScript);
 
         setEnabled(ACTION_STEP_CUT, haveScript && haveSelection);
+        setEnabled(ACTION_STEP_COPY, haveScript && haveSelection);
+        
+        // Only allow string pastes
+        Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
+        Transferable transferable = clipboard.getContents(null);
+        
+        setEnabled(ACTION_STEP_PASTE, haveScript && haveSelection &&
+            (transferable!=null
+            && transferable.isDataFlavorSupported(DataFlavor.stringFlavor)));
+
+        setEnabled(ACTION_STEP_DELETE, haveScript && haveSelection);
+
+
         setEnabled(ACTION_STEP_MOVE_UP, 
                    haveScript && haveSelection && scriptTable.canMoveUp());
         setEnabled(ACTION_STEP_MOVE_DOWN, 
@@ -2154,8 +2293,8 @@
                 // Stop recording, but keep what we've got so far
                 stopRecording(false);
                 String msg = Strings.get("editor.recording.failure");
-                Throwable error = e.getReason() instanceof BugReport
-                    ? e.getReason() : new BugReport(msg, e.getReason());
+                Throwable error = e.getCause() instanceof BugReport
+                    ? e.getCause() : new BugReport(msg, e.getCause());
                 Log.log("Recording failure: " + error.toString());
                 setStatus(error.getMessage(), error.toString(), ERROR);
                 view.showWarning(msg);
@@ -2579,9 +2718,17 @@
         else if (cmd.equals(StepEvent.STEP_FAILURE)
                  || cmd.equals(StepEvent.STEP_ERROR)) {
             // Make sure the table updates its colors
-            int index = scriptModel.getRowOf(step);
+            final int index = scriptModel.getRowOf(step);
             if (index != -1) {
-                scriptModel.fireTableRowsUpdated(index, index);
+                // FIX EDT voilation
+                //
+                AWT.invokeAndWait(new Runnable() 
+                                  {
+                                      public void run()
+                                      {
+                                          scriptModel.fireTableRowsUpdated(index, index);
+                                      }
+                                  });
             }
             setStatusForStep(step);
         }
@@ -3214,9 +3361,35 @@
     private class StepCutAction extends EditorAction {
         public StepCutAction() { super(ACTION_STEP_CUT); }
         public void actionPerformed(ActionEvent e) {
-            cutSelection();
+            copySelection(true);
         }
     }
+    private class StepCopyAction extends EditorAction {
+        public StepCopyAction() { super(ACTION_STEP_COPY); }
+        public void actionPerformed(ActionEvent e) {
+            copySelection(false);
+        }
+    }
+    private class StepPasteAction extends EditorAction {
+        public StepPasteAction() { super(ACTION_STEP_PASTE); }
+        public void actionPerformed(ActionEvent e) {
+            pasteSteps();
+        }
+    }
+
+    private class StepDeleteAction extends EditorAction {
+        public StepDeleteAction() { 
+            super(ACTION_STEP_DELETE); 
+            // Remove the extra modifiers
+            putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(
+                                          KeyEvent.VK_DELETE, 0));
+
+        }
+        public void actionPerformed(ActionEvent e) {
+            deleteSelection();
+        }
+    }
+
     private class StepMoveUpAction extends EditorAction {
         public StepMoveUpAction() { super(ACTION_STEP_MOVE_UP); }
         public void actionPerformed(ActionEvent e) {

Modified: abbot/trunk/src/abbot/editor/ScriptEditorFrame.java
===================================================================
--- abbot/trunk/src/abbot/editor/ScriptEditorFrame.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/editor/ScriptEditorFrame.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -207,21 +207,24 @@
     */
     public void setStatus(final String msg, final String extended,
                           final Color color) {
-        // setText is thread-safe w/r/t the dispatch thread, but setForeground
-        // is not 
-        statusBar.setText(msg);
-        statusText.setText(msg + (extended != null
-                                  ? "\n" + extended : ""));
-        Runnable action = new Runnable() {
+        // Nothing is EDT safe with the more modern repaint managers
+        // note invokeAction more like invokeLater
+        abbot.util.AWT.invokeAction(new Runnable()
+        {
+            @Override
             public void run() {
-                statusBar.setForeground(color);
-                statusText.setForeground(color);
-                if (statusWindow.isShowing()) 
-                    resizeStatusWindow();
+                statusBar.setText(msg);
+                statusText.setText(msg + (extended != null
+                                          ? "\n" + extended : ""));
+
+                if (!color.equals(statusBar.getForeground())) {
+                    statusBar.setForeground(color);
+                    statusText.setForeground(color);
+                    if (statusWindow.isShowing()) 
+                        resizeStatusWindow();
+                }
             }
-        };
-        if (!color.equals(statusBar.getForeground()))
-            abbot.util.AWT.invokeAction(action);
+        });
     }
     
     public Dimension getPreferredSize() {

Modified: abbot/trunk/src/abbot/editor/ScriptTable.java
===================================================================
--- abbot/trunk/src/abbot/editor/ScriptTable.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/editor/ScriptTable.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -425,8 +425,8 @@
     /** Return the set of selected steps, restricted to siblings of the first
         selected row.
     */
-    public List getSelectedSteps() {
-        ArrayList list = new ArrayList();
+    public List<Step> getSelectedSteps() {
+        ArrayList<Step> list = new ArrayList<Step>();
         int[] rows = getSelectedRows();
         if (rows.length > 0) {
             Step step = model.getStepAt(rows[0]);

Modified: abbot/trunk/src/abbot/editor/i18n/costello.properties
===================================================================
--- abbot/trunk/src/abbot/editor/i18n/costello.properties	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/editor/i18n/costello.properties	2012-05-09 16:02:38 UTC (rev 2829)
@@ -329,9 +329,18 @@
 actions.editor-quit=E&xit
 actions.editor-quit.desc=Exit the editor
 actions.editor-quit.acc=Q
+actions.step-delete=Delete
+actions.step-delete.desc=Remove the selected steps
+actions.step-delete.acc=DELETE
 actions.step-cut=Cu&t
-actions.step-cut.desc=Remove the selected steps
+actions.step-cut.desc=Remove the selected steps and place in the clipboard
 actions.step-cut.acc=X
+actions.step-copy=C&opy
+actions.step-copy.desc=Copy the selected steps
+actions.step-copy.acc=C
+actions.step-paste=Paste
+actions.step-paste.desc=Attempt to paste selected stesp from the clipboard
+actions.step-paste.acc=V
 actions.step-move-up=Move &Up
 actions.step-move-up.desc=Move the selected steps up
 actions.step-move-up.acc=UP

Modified: abbot/trunk/src/abbot/editor/recorder/RecordingFailedException.java
===================================================================
--- abbot/trunk/src/abbot/editor/recorder/RecordingFailedException.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/editor/recorder/RecordingFailedException.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -1,13 +1,17 @@
 package abbot.editor.recorder;
 
+import java.lang.annotation.Documented;
+
 public class RecordingFailedException extends RuntimeException {
-    private Throwable reason = null;
-    public RecordingFailedException(String msg) {
-        super(msg);
+    public RecordingFailedException(String msg, Throwable cause) {
+        super(msg, cause);
     }
     public RecordingFailedException(Throwable thr) {
-        super(thr.getMessage());
-        reason = thr;
+        super(thr.getMessage(), thr);
     }
-    public Throwable getReason() { return reason != null ? reason : this; }
+    
+    @Deprecated()
+    public Throwable getReason() {
+        return getCause();
+    }
 }

Modified: abbot/trunk/src/abbot/overview.html
===================================================================
--- abbot/trunk/src/abbot/overview.html	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/overview.html	2012-05-09 16:02:38 UTC (rev 2829)
@@ -9,7 +9,7 @@
 <!-- FIXME not sure how to get a title into the summary... -->
 <HR>
 <CENTER>
-<H2>Abbot Automated GUI Testing Framework, version 1.2.0-RC2</H2>
+<H2>Abbot Automated GUI Testing Framework, version 1.3.0RC1-RC2</H2>
 </CENTER>
 <body bgcolor="white">
 This document is the API specification for the

Modified: abbot/trunk/src/abbot/script/Call.java
===================================================================
--- abbot/trunk/src/abbot/script/Call.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/script/Call.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -253,7 +253,7 @@
         // use getDeclaredMethods to include class methods
         Log.debug("Resolving methods on " + cls);
         Method[] mlist = cls.getMethods();
-        ArrayList found = new ArrayList();
+        ArrayList<Method> found = new ArrayList<Method>();
         for (int i=0;i < mlist.length;i++) {
             Method m = mlist[i];
             Class[] params = m.getParameterTypes();
@@ -273,7 +273,59 @@
                 String.valueOf(args.length), cls }));
         }
 
-        // TODO Now sort according to restrictiveness of method arguments
+        // Now sort according to restrictiveness of method arguments
+        // We can assume that the methods are the same name, we just need
+        // to prioritized boolean and scalar numbers over other objects
+        
+        Collections.sort(found, 
+            new Comparator<Method>() {
+
+                @Override
+                public int compare(Method o1, Method o2) {
+                    
+                    return score(o1) - score(o2);
+                }
+    
+                @Override
+                public boolean equals(Object obj) {
+                    return super.equals(obj);
+                }
+
+
+                private int score(Method method) {
+                    int score = 0;
+                    for (Class parameterType : method.getParameterTypes()) {
+                        score += score(parameterType);                        
+                    }
+                    
+                    return score;
+                }
+
+                /**
+                 * So basically scalar types need to be processed first, then numbers
+                 * then strings.
+                 */
+                private int score(Class class1) {
+                    
+                    if (class1 == boolean.class) {
+                        return 1;
+                    }
+                    else if (class1.isPrimitive()) {
+                        return 2;
+                    }
+                    else if (Number.class.isAssignableFrom(class1)) {
+                        return 4;
+                    }
+                    else if (String.class.isAssignableFrom(class1)) {
+                        return 8;
+                    }
+                    else {
+                        // Just any old object
+                        return 16;
+                    }
+                }
+        });      
+        
         Method[] list = (Method[])found.toArray(new Method[found.size()]);
         //Arrays.sort(list);
 

Modified: abbot/trunk/src/abbot/script/ComponentReference.java
===================================================================
--- abbot/trunk/src/abbot/script/ComponentReference.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/script/ComponentReference.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -832,17 +832,18 @@
         }
     }
 
-    /** Return a measure of how well the given component matches the given
-     * component reference.  The weight performs two functions; one is to
-     * loosely match so that we can find a component even if some of its
-     * attributes have changed.  The other is to distinguish between similar
-     * components. <p>
-     * In general, we want to match if we get any weight at all, and there's
-     * only one component that matches.
-     */
-    int getMatchWeight(Component comp) {
-        return getMatchWeight(comp, new HashMap());
-    }
+// Removed as in some cases it mean we were not taking into account new references.
+//    /** Return a measure of how well the given component matches the given
+//     * component reference.  The weight performs two functions; one is to
+//     * loosely match so that we can find a component even if some of its
+//     * attributes have changed.  The other is to distinguish between similar
+//     * components. <p>
+//     * In general, we want to match if we get any weight at all, and there's
+//     * only one component that matches.
+//     */
+//    int getMatchWeight(Component comp) {
+//        return getMatchWeight(comp, new HashMap());
+//    }
 
     /** Return a measure of how well the given component matches the given
      * component reference.  The weight performs two functions; one is to
@@ -1110,7 +1111,7 @@
             if (getAttribute(TAG_PARENT) != null)
                 minWeight -= MW_PARENT;
             if (AWT.getWindow(preferred) == null
-                  && getMatchWeight(preferred) >= minWeight) {
+                  && getMatchWeight(preferred, newReferences) >= minWeight) {
                 Log.debug("Using preferred component: "
                           + Robot.toString(preferred));
                 found = preferred;
@@ -1188,7 +1189,7 @@
      */
     public static ComponentReference matchExisting(final Component comp,
                                                    Collection existing,
-                                                   Map newReferences) {
+                                                   final Map newReferences) {
 
         Log.debug("Matching " + Robot.toString(comp)
                   + " against existing refs");
@@ -1205,8 +1206,10 @@
         // Sort such that the best match comes first
         Map matches = new TreeMap(new Comparator() {
             public int compare(Object o1, Object o2) {
-                return ((ComponentReference)o2).getMatchWeight(comp)
-                    - ((ComponentReference)o1).getMatchWeight(comp);
+                // Ensure newReferences are used otherwise some parents won't match
+                //
+                return ((ComponentReference)o2).getMatchWeight(comp, newReferences)
+                    - ((ComponentReference)o1).getMatchWeight(comp, newReferences);
             }
         });
         while (iter.hasNext()) {

Modified: abbot/trunk/src/abbot/script/Script.java
===================================================================
--- abbot/trunk/src/abbot/script/Script.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/script/Script.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -323,6 +323,18 @@
             ((Script)child).setRelativeTo(getDirectory());
         }
     }
+    
+    
+    /**Parse XML attributes for the Script.
+     */
+    protected void parseAttributes(Map map) {
+        super.parseAttributes(map);
+        fork = Boolean.valueOf((String)map.get(TAG_FORKED)).booleanValue();
+        slow = Boolean.valueOf((String)map.get(TAG_SLOW)).booleanValue();
+        awt = Boolean.valueOf((String)map.get(TAG_AWT)).booleanValue();
+        vmargs = (String)map.get(TAG_VMARGS);
+    }
+    
 
     protected void parseChild(Element el) throws InvalidScriptException {
         if (el.getName().equals(TAG_COMPONENT)) {
@@ -336,14 +348,6 @@
         }
     }
 
-    /** Parse XML attributes for the Script. */
-    protected void parseAttributes(Map map) {
-        parseStepAttributes(map);
-        fork = Boolean.valueOf((String)map.get(TAG_FORKED)).booleanValue();
-        slow = Boolean.valueOf((String)map.get(TAG_SLOW)).booleanValue();
-        awt = Boolean.valueOf((String)map.get(TAG_AWT)).booleanValue();
-        vmargs = (String)map.get(TAG_VMARGS);
-    }
 
     /** Loads the XML test script.  Performs a check against the XML schema.
         @param reader Provides the script data
@@ -352,30 +356,11 @@
      */
     public void load(Reader reader)
         throws InvalidScriptException, IOException {
+        
+        // Clear existing messages
         clear();
-        try {
-            // Set things up to optionally validate on load
-            SAXBuilder builder = new SAXBuilder(validate);
-            if (validate) {
-                URL url = getClass().getClassLoader().getResource("abbot/abbot.xsd");
-                if (url != null) {
-                    builder.setFeature("http://apache.org/xml/features/validation/schema", true);
-                    builder.setProperty("http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation", url.toString());
-                }
-                else {
-                    Log.warn("Could not find abbot/abbot.xsd, disabling XML validation");
-                    validate = false;
-                }
-            }
-            Document doc = builder.build(reader);
-            Element root = doc.getRootElement();
-            Map map = createAttributeMap(root);
-            parseAttributes(map);
-            parseChildren(root);
-        }
-        catch(JDOMException e) {
-            throw new InvalidScriptException(e.getMessage());
-        }
+        //Create the children from the reader
+        createChildrenFromReader(reader, validate);
         // Make sure we have all referenced components
         synchronized(this) {
             synchReferenceIDs();
@@ -384,6 +369,7 @@
         lastSaved = getHash();
     }
 
+
     public void addStep(int index, Step step) {
         super.addStep(index, step);
         updateRelativePath(step);

Modified: abbot/trunk/src/abbot/script/Sequence.java
===================================================================
--- abbot/trunk/src/abbot/script/Sequence.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/script/Sequence.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -1,11 +1,24 @@
 package abbot.script;
 
+import abbot.Log;
+
+import java.io.IOException;
+import java.io.Reader;
+
+import java.net.URL;
+
 import java.util.*;
 
+import org.jdom.Document;
 import org.jdom.Element;
 
 import abbot.i18n.Strings;
 
+import java.io.StringReader;
+
+import org.jdom.JDOMException;
+import org.jdom.input.SAXBuilder;
+
 /** Script step which groups a sequence of other Steps.  The sub-Steps have a
  * fixed order and are executed in the order contained in the sequence.
  * Events sent by sub-Steps are propagated by this one.
@@ -47,6 +60,9 @@
         }
     }
 
+
+    
+    
     protected void parseChild(Element el) throws InvalidScriptException {
         Step step = createStep(getResolver(), el);
         addStep(step);
@@ -177,4 +193,46 @@
             sequence.remove(index);
         }
     }
+
+    /**
+     * @param string A string that is the serialized for of just a sequence
+     * @return A sequence object containing the relavent items
+     */
+    public static Sequence createSequenceFromString(Resolver resolver, String string) throws IOException {
+        Sequence seq = new Sequence(resolver, "Temporary Sequence");
+        seq.createChildrenFromReader(new StringReader(string), false);
+        return seq;
+    }
+
+    /**
+     * This method takes the given input reader and tries to load the contained elements, this
+     * is exposed here so that it is possible to create a sequence from a clipboard snippet.
+     * @param reader
+     * @param validate Whether to perform validation, use false for the moment for snippets
+     * @throws IOException
+     */
+    protected void createChildrenFromReader(Reader reader, boolean validate) throws IOException {
+        try {
+            // Set things up to optionally validate on load
+            SAXBuilder builder = new SAXBuilder(validate);
+            if (validate) {
+                URL url = getClass().getClassLoader().getResource("abbot/abbot.xsd");
+                if (url != null) {
+                    builder.setFeature("http://apache.org/xml/features/validation/schema", true);
+                    builder.setProperty("http://apache.org/xml/properties/schema/external-noNamespaceSchemaLocation",
+                                        url.toString());
+                } else {
+                    Log.warn("Could not find abbot/abbot.xsd, disabling XML validation");
+                    validate = false;
+                }
+            }
+            Document doc = builder.build(reader);
+            Element root = doc.getRootElement();
+            Map map = createAttributeMap(root);
+            parseAttributes(map);
+            parseChildren(root);
+        } catch (JDOMException e) {
+            throw new InvalidScriptException(e.getMessage());
+        }
+    }
 }

Modified: abbot/trunk/src/abbot/script/Step.java
===================================================================
--- abbot/trunk/src/abbot/script/Step.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/script/Step.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -56,7 +56,7 @@
                 Log.debug(key + "=" + attributes.get(key));
             }
         }
-        parseStepAttributes(attributes);
+        parseAttributes(attributes);
     }
 
     public Step(Resolver resolver, String description) {
@@ -77,7 +77,7 @@
     }
     
     /** Only exposed so that Script may invoke it on load from disk. */
-    protected final void parseStepAttributes(Map attributes) {
+    protected void parseAttributes(Map attributes) {
         Log.debug("Parsing attributes for " + getClass());
         description = (String)attributes.get(TAG_DESC);
     }

Modified: abbot/trunk/src/abbot/tester/JComboBoxTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JComboBoxTester.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/tester/JComboBoxTester.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -13,9 +13,11 @@
 import abbot.finder.*;
 import abbot.finder.matchers.*;
 
+import java.util.concurrent.Callable;
+
 /**
  * JComboBoxTester for testing JComboBox instances.
- * 
+ *
  * <p>In the case where you need to create a tester for JComboBox subclasses that
  * use novel components in the popup, for example jtree, you can quickly subclass
  * this tester to deal with those cases without the need to create a seperate
@@ -77,6 +79,10 @@
                 }
             });
         }
+        
+        // Wait for all the events to processed
+        
+        waitForIdle();
     }
     
     /** Provide an override point to select the correct index in whatever index
@@ -153,24 +159,36 @@
     
     
 
-    public void actionSelectItem(Component comp, String item) {
-        JComboBox cb = (JComboBox)comp;
+    public void actionSelectItem(Component comp, final String item) {
+        final JComboBox cb = (JComboBox)comp;
         Object obj = cb.getSelectedItem();
         if ((obj == null && item == null)
             || (obj != null
                 && ExtendedComparator.stringsMatch(item, obj.toString())))
             return;
 
-        for (int i=0;i < cb.getItemCount();i++) {
-            obj = cb.getItemAt(i);
-            Log.debug("Comparing against '" + obj + "'");
-            if ((obj == null && item == null)
-                || (obj != null
-                    && ExtendedComparator.stringsMatch(item, obj.toString()))){
-                actionSelectIndex(comp, i);
-                return;
+        int matchedIndex = Robot.callAndWait(cb, new Callable<Integer>() {
+            @Override
+            public Integer call() {
+                for (int i=0;i < cb.getItemCount();i++) {
+                    Object obj = cb.getItemAt(i);
+                    Log.debug("Comparing against '" + obj + "'");
+                    if ((obj == null && item == null)
+                        || (obj != null
+                            && ExtendedComparator.stringsMatch(item, obj.toString()))){
+                        return i;
+                    }
+                }
+                
+                return -1;
             }
+        });
+        
+        if (matchedIndex!=-1) {
+            actionSelectIndex(comp, matchedIndex);
+            return;
         }
+        
         // While actions are supposed to represent real user actions, it's
         // possible that the current environment does not match sufficiently,
         // so we need to throw an appropriate exception that can be used to

Modified: abbot/trunk/src/abbot/tester/JTabbedPaneTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JTabbedPaneTester.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/tester/JTabbedPaneTester.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -35,6 +35,8 @@
                 ((JTabbedPane)comp).setSelectedIndex(e.index);
             }});
         }
+        
+        waitForIdle();
     }
 
     /** Parse the String representation of a JTableLocation into the actual

Modified: abbot/trunk/src/abbot/tester/JTableTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JTableTester.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/tester/JTableTester.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -8,8 +8,9 @@
 
 import javax.swing.JTable;
 import abbot.script.ArgumentParser;
-import abbot.script.Condition;
 
+import abbot.util.Condition;
+
 import java.util.concurrent.Callable;
 
 /** Provide user actions on a JTable.
@@ -60,7 +61,7 @@
         
         final JTableLocation.Cell found[] = new JTableLocation.Cell[1];
         try {
-            wait(new Condition()
+            wait(new Robot.ConditionEDTDecorator(table, new Condition()
                 {
                     public boolean test() {
                         try{
@@ -75,7 +76,7 @@
                         return Strings.get("tester.Component.show_wait",
                                            new Object[] { loc.toString() });
                     }
-                }, timeout);
+                }), timeout);
         } catch(WaitTimedOutError e) {
             throw new LocationUnavailableException(e.getMessage());
         }
@@ -110,7 +111,7 @@
        
        final JTableLocation.Cell found[] = new JTableLocation.Cell[1];
        try {
-           wait(new Condition()
+           wait(new Robot.ConditionEDTDecorator(table, new Condition()
                {
                    public boolean test() {
                        try{
@@ -125,7 +126,7 @@
                        return Strings.get("tester.Component.show_wait",
                                           new Object[] { loc.toString() });
                    }
-               }, timeout);
+               }), timeout);
            return true;
        } catch(WaitTimedOutError e) {
            return false;

Modified: abbot/trunk/src/abbot/tester/JTextComponentTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JTextComponentTester.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/tester/JTextComponentTester.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -164,7 +164,7 @@
             
         }
     }
-
+    
     /** Account for differences in scrolling {@link javax.swing.JTextField}.
         @see JComponentTester#scrollRectToVisible
         @see JComponent#scrollRectToVisible
@@ -219,14 +219,14 @@
      */
     protected void endSelection(Component comp, int index) {
         
-        final JTextComponent jc = (JTextComponent)comp;
+        final JTextComponent tc = (JTextComponent)comp;
         
         // Depending on whether we are performing a normal
         // or revese select we need to nudge the co-ordinate slightly
-        int caretPos = callAndWait(jc, new Callable<Integer>(){
+        final int caretPos = callAndWait(tc, new Callable<Integer>(){
                 @Override
                 public Integer call() {
-                    return jc.getCaretPosition();
+                    return tc.getCaretPosition();
                 }
             });
         
@@ -239,8 +239,39 @@
         }
         
         Point where = scrollToVisible(comp, index);
-        // End move just inside of visible area to make sure
-        // we don't override the componet
+        
+        // Get the current value based on the caret poss
+        //
+        
+        final Callable<Point> mousePosition = new Callable<Point>() {
+            @Override
+            public Point call() throws BadLocationException {
+                Point rect = tc.getMousePosition();
+                return rect;
+            }
+        };
+
+// Remove temporarily as this code breaks a few other cases
+// will fix on next commit
+//        Point mousePos = Robot.callAndWait(tc, mousePosition);
+//        if (mousePos!=null)
+//        {
+//            // In some cases the text will scroll underneath the current component
+//            // so the actual distance dragged is going to be very small if not zero
+//            // so we are going to need to inject some minor moves, just enough
+//            // to trigger the drag on the relavent platform.
+//    
+//            int distance = (int)Math.sqrt(
+//                               Math.pow((where.x - mousePos.x), 2) +
+//                               Math.pow((where.y - mousePos.y), 2));
+//            
+//            if (Math.abs(distance) < AWTConstants.DRAG_THRESHOLD) {
+//                mouseMove(comp, where.x - AWTConstants.DRAG_THRESHOLD, where.y);
+//            }
+//        }
+        
+        //
+        
         mouseMove(comp, where.x, where.y + nudge);
         if (Platform.isOSX())
             delay(75);

Modified: abbot/trunk/src/abbot/tester/JTreeTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JTreeTester.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/tester/JTreeTester.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -393,7 +393,16 @@
 
         final TreePath realPath = getRealPath(path, timeout, tree);
         if (expandWhenFound) {
-            if (!tree.isExpanded(realPath)) {
+            
+            Callable<Boolean> realPathExanded = new Callable<Boolean>()
+                {
+                    @Override
+                    public Boolean call() {
+                        return tree.isExpanded(realPath);
+                    }
+                };
+            
+            if (!Robot.callAndWait(tree, realPathExanded)) {
                 // Use this method instead of a toggle action to avoid
                 // any component visibility requirements
                 invokeAndWait(new Runnable() {
@@ -529,6 +538,9 @@
                 throw new ActionFailedException(e.toString());
             }
         }
+        
+        // Make sure all operations have finsished
+        waitForIdle();
     }
 
     /** Determine whether a given path exists, expanding ancestor nodes as
@@ -575,34 +587,40 @@
     /** Convert the coordinate into a more meaningful location.  Namely, use a
      * path, row, or coordinate.
      */
-    public ComponentLocation getLocation(Component c, Point p) {
-        JTree tree = (JTree)c;
-        if (tree.getRowCount() == 0)
-            return new JTreeLocation(p);
-        Rectangle rect = tree.getRowBounds(tree.getRowCount()-1);
-        int maxY = rect.y + rect.height;
-        if (p.y > maxY)
-            return new JTreeLocation(p);
+    public ComponentLocation getLocation(final Component c, final Point p) {
+       return Robot.callAndWait(c, new Callable<JTreeLocation>()
+       {
+            @Override
+            public JTreeLocation call() {
+                JTree tree = (JTree)c;
+                if (tree.getRowCount() == 0)
+                    return new JTreeLocation(p);
+                Rectangle rect = tree.getRowBounds(tree.getRowCount()-1);
+                int maxY = rect.y + rect.height;
+                if (p.y > maxY)
+                    return new JTreeLocation(p);
 
-        // TODO: ignore clicks to the left of the expansion control, or maybe
-        // embed them in the location.
-        TreePath path = tree.getClosestPathForLocation(p.x, p.y);
-        TreePath stringPath = pathToStringPath(tree, path);
-        if (stringPath != null) {
-            // if the root is hidden, drop it from the path
-            if (!tree.isRootVisible()) {
-                Object[] objs = stringPath.getPath();
-                Object[] subs = new Object[objs.length-1];
-                System.arraycopy(objs, 1, subs, 0, subs.length);
-                stringPath = new TreePath(subs);
+                // TODO: ignore clicks to the left of the expansion control, or maybe
+                // embed them in the location.
+                TreePath path = tree.getClosestPathForLocation(p.x, p.y);
+                TreePath stringPath = pathToStringPath(tree, path);
+                if (stringPath != null) {
+                    // if the root is hidden, drop it from the path
+                    if (!tree.isRootVisible()) {
+                        Object[] objs = stringPath.getPath();
+                        Object[] subs = new Object[objs.length-1];
+                        System.arraycopy(objs, 1, subs, 0, subs.length);
+                        stringPath = new TreePath(subs);
+                    }
+                    return new JTreeLocation(stringPath);
+                }
+                int row = tree.getClosestRowForLocation(p.x, p.y);
+                if (row != -1) {
+                    return new JTreeLocation(row);
+                }
+                return new JTreeLocation(p);
             }
-            return new JTreeLocation(stringPath);
-        }
-        int row = tree.getClosestRowForLocation(p.x, p.y);
-        if (row != -1) {
-            return new JTreeLocation(row);
-        }
-        return new JTreeLocation(p);
+        });
     }
 
 }

Modified: abbot/trunk/src/abbot/tester/Robot.java
===================================================================
--- abbot/trunk/src/abbot/tester/Robot.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/tester/Robot.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -626,6 +626,11 @@
 
     /** Sleep the given duration of ms. */
     public static void delay(int ms) {
+        
+        initializeRobot();
+        
+        //
+        
         if (eventMode == EM_ROBOT) {
             while (ms > MAX_DELAY) {
                 robot.delay(MAX_DELAY);
@@ -673,7 +678,7 @@
         return false;
     }
 
-    private boolean waitForIdle(EventQueue eq) {
+    private  boolean waitForIdle(EventQueue eq) {
         if (EventQueue.isDispatchThread())
             throw new IllegalThreadStateException("Cannot call method from the event dispatcher thread");
 
@@ -725,7 +730,7 @@
      * 
      * @return Whether the waitForIdle timed out or not
      */
-    public boolean waitForIdle() {
+    public  boolean waitForIdle() {
         if (eventPostDelay > autoDelay) {
             delay(eventPostDelay - autoDelay);
         }
@@ -2336,6 +2341,9 @@
      * @throws WaitTimedOutError if the timeout is exceeded. 
      */
     public static void wait(Condition condition, long timeout, int interval) {
+        // Make sure the robot is running
+        initializeRobot();
+        //
         long start = System.currentTimeMillis();
         while (!condition.test()) {
             if (System.currentTimeMillis() - start > timeout) {

Modified: abbot/trunk/src/abbot/util/WeakAWTEventListener.java
===================================================================
--- abbot/trunk/src/abbot/util/WeakAWTEventListener.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/src/abbot/util/WeakAWTEventListener.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -17,6 +17,14 @@
         listener = new WeakReference(l);
         Toolkit.getDefaultToolkit().addAWTEventListener(this, mask);
     }
+
+    /**
+     * @return For testing purposes return whether the listener has been disposed
+     */
+    public boolean isDisposed() {
+        return listener.get()==null;
+    }
+
     public void dispose() {
         Toolkit.getDefaultToolkit().removeAWTEventListener(this);
     }

Modified: abbot/trunk/test/abbot/editor/recorder/AbstractRecorderFixture.java
===================================================================
--- abbot/trunk/test/abbot/editor/recorder/AbstractRecorderFixture.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/test/abbot/editor/recorder/AbstractRecorderFixture.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -39,8 +39,8 @@
             }
             finally {
                 if (failure != null) {
-                    throw failure.getReason() != null
-                        ? failure.getReason() : failure;
+                    throw failure.getCause() != null
+                        ? failure.getCause() : failure;
                 }
             }
         }

Modified: abbot/trunk/test/abbot/editor/recorder/FileDialogRecorderTest.java
===================================================================
--- abbot/trunk/test/abbot/editor/recorder/FileDialogRecorderTest.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/test/abbot/editor/recorder/FileDialogRecorderTest.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -44,7 +44,10 @@
         assertTrue("Expected a sequence", step instanceof Sequence);
         Sequence seq = (Sequence)step;
         assertStepCount(3, seq);
-        assertStep("SetDirectory\\(.*," + dn.replace('\\', '.') + File.separator +  "\\)",
+        
+        // On JDK 7 the path returned doesn't have a file sep at the end so
+        // we add the "?" regex to match for both
+        assertStep("SetDirectory\\(.*," + dn.replace('\\', '.') + File.separator + "?" +  "\\)",
                    seq.getStep(0));
         assertStep("SetFile\\(.*," + fn + "\\)", seq.getStep(1));
         assertStep("Accept\\(.*\\)", seq.getStep(2));

Modified: abbot/trunk/test/abbot/i18n/StringsTest.java
===================================================================
--- abbot/trunk/test/abbot/i18n/StringsTest.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/test/abbot/i18n/StringsTest.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -14,8 +14,8 @@
         File dir = TestHelper.getClasspathDirectory(StringsTest.class);
         Properties p = new Properties();
         p.put("default.properties.loaded", "yes");
-        p.store(new FileOutputStream(new File(dir, "test.properties")), "test");
-        Strings.addBundle("test");
+        p.store(new FileOutputStream(new File(dir, "testMissingResource.properties")), "testMissingResource");
+        Strings.addBundle("testMissingResource");
         Locale oldLocale = Locale.getDefault();
         try {
             Locale.setDefault(Locale.FRENCH);
@@ -44,8 +44,8 @@
         File dir = TestHelper.getClasspathDirectory(StringsTest.class);
         Properties p = new Properties();
         p.put("test.property", "some value");
-        p.store(new FileOutputStream(new File(dir, "test.properties")), "test");
-        Strings.addBundle("test", getClass().getClassLoader());
+        p.store(new FileOutputStream(new File(dir, "testAlternateResource.properties")), "testAlternateResource");
+        Strings.addBundle("testAlternateResource", getClass().getClassLoader());
         assertTrue("Should be able to load additional properties",
                    Strings.get("test.property") != null);
                    

Modified: abbot/trunk/test/abbot/script/ActionTest.java
===================================================================
--- abbot/trunk/test/abbot/script/ActionTest.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/test/abbot/script/ActionTest.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -10,6 +10,8 @@
 import abbot.finder.Hierarchy;
 import abbot.tester.*;
 
+import javax.swing.text.JTextComponent;
+
 public class ActionTest extends ResolverFixture {
 
     public void testMethodFixing() throws Throwable {
@@ -40,6 +42,11 @@
         public Object[] getParameters() throws Exception {
             return evaluateParameters(getMethod(), getArguments());
         }
+
+        @Override
+        protected Method[] getMethods() throws ClassNotFoundException, NoSuchMethodException {
+            return super.getMethods();
+        }
     }
 
     public void testVKPlusModifier() throws Exception {
@@ -55,6 +62,26 @@
                      new Integer(KeyEvent.SHIFT_MASK), params[2]);
     }
 
+
+    /**
+     * Test for method ordering ala bug 3524725 in JDK 7
+     */
+    public void testSortedMethodsWithPrimitivesFirst() throws Exception {
+        ComponentReference ref = new FakeRef(getResolver());
+        MyAction action = new MyAction(getResolver(), "actionClick", 
+                                       new String[] {
+                                           ref.getID(), "0",
+                                       }, JTextComponent.class);
+        
+        Method[] methods = action.getMethods();
+
+        assertEquals("Second parameter of first method should be an int",
+                     methods[0].getParameterTypes()[1], int.class);
+        assertEquals("Second parameter of second method should be an String",
+                     methods[1].getParameterTypes()[1], String.class);
+    }
+
+
     public void testComponentPlusVK() throws Exception {
         ComponentReference ref = new ComponentReference(getResolver(),
                                                         Component.class,

Modified: abbot/trunk/test/abbot/script/AppClassLoaderTest.java
===================================================================
--- abbot/trunk/test/abbot/script/AppClassLoaderTest.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/test/abbot/script/AppClassLoaderTest.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -1,5 +1,9 @@
 package abbot.script;
 
+import abbot.WaitTimedOutError;
+
+import abbot.tester.Robot;
+
 import javax.swing.SwingUtilities;
 
 import junit.extensions.abbot.TestHelper;
@@ -7,7 +11,11 @@
 import abbot.util.NonDelegatingClassLoader;
 import java.lang.ref.WeakReference;
 
-/** 
+import java.util.concurrent.Callable;
+
+import junit.extensions.abbot.ComponentTestFixture;
+
+/**
  * Verify AppClassLoader operation.
  */
 
@@ -23,7 +31,7 @@
     /** Ensure the class loader is GC'd after uninstall. */
     public void testGC() throws Exception {
         acl = new AppClassLoader();
-        WeakReference ref = new WeakReference(acl);
+        final WeakReference ref = new WeakReference(acl);
         class Flag { volatile boolean flag; }
         final Flag flag = new Flag();
 
@@ -40,7 +48,28 @@
         acl.uninstall();
         acl = null;
 
-        System.gc();
+        // Might take more than one cc
+        try
+        {
+            Robot.wait(new abbot.util.Condition()
+                       {
+                @Override
+                public boolean test() {
+                    System.gc();
+                    AppClassLoader test = (AppClassLoader)ref.get();
+                    return test==null;
+                }
+    
+                @Override
+                public String toString() {
+                    return null;
+                }
+            }, 10000, 200);
+        }
+        catch (WaitTimedOutError wteo) {
+            
+        }
+        
         acl = (AppClassLoader)ref.get();
         assertTrue("Class loader reference should be GC'd", acl == null);
     }
@@ -83,15 +112,20 @@
             assertEquals("Context not installed on event thread",
                          dcl, eventClassLoader);
             dcl.uninstall();
-            eventClassLoader = null;
-            SwingUtilities.invokeAndWait(new Runnable() {
-                public void run() {
-                    eventClassLoader =
-                        Thread.currentThread().getContextClassLoader();
-                }
-            });
-            assertTrue("Context not uninstalled from event thread",
-                       eventClassLoader != dcl);
+            
+
+            ComponentTestFixture.assertTrueEventually("Context not uninstalled from event thread",
+                       new Callable<Boolean>()
+                       {
+                            @Override
+                            public Boolean call() {
+                                eventClassLoader =
+                                    Thread.currentThread().getContextClassLoader();
+                                return eventClassLoader != dcl;
+                            }
+                       });
+            
+            
             assertEquals("Original class loader not restored", 
                          getClass().getClassLoader(), original);
             assertEquals("Original context not restored", 

Modified: abbot/trunk/test/abbot/script/CallTest.java
===================================================================
--- abbot/trunk/test/abbot/script/CallTest.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/test/abbot/script/CallTest.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -30,10 +30,13 @@
     }
 
     public void testResolveDuplicateMethods() throws Throwable {
+        // As per bug 3524725 we need to look to whether
+        // we match the correct versions of the method depending on
+        // the method type
         TargetedCall call =
             new TargetedCall(getResolver(), "Test Call",
                              CallTestClass.class.getName(),
-                             "someMethodDuplicated",
+                             "someMethodDuplicatedSameReturn",
                              new String[] { "1" });
         // Invoke the int version
         call.run();
@@ -74,6 +77,14 @@
         public void someMethod() {
             derivedWasCalled = true;
         }
+
+
+        public void someMethodDuplicatedSameReturn(int arg) {
+        }
+        public void someMethodDuplicatedSameReturn(String arg) {
+        }
+
+
         public int someMethodDuplicated(int arg) {
             return 0;
         }

Modified: abbot/trunk/test/abbot/script/parsers/TreePathParserTest.java
===================================================================
--- abbot/trunk/test/abbot/script/parsers/TreePathParserTest.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/test/abbot/script/parsers/TreePathParserTest.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -1,5 +1,7 @@
 package abbot.script.parsers;
 
+import abbot.Platform;
+
 import javax.swing.tree.TreePath;
 
 import junit.extensions.abbot.TestHelper;
@@ -23,8 +25,19 @@
 
     public void testHiddenRoot() {
         String arg = "[null, parent, child]";
-        TreePath path = (TreePath)parser.parse(arg);
-        assertEquals("Wrong path generated", arg, path.toString());
+        try
+        {
+            TreePath path = (TreePath)parser.parse(arg);
+            assertEquals("Wrong path generated", arg, path.toString());
+
+            assertTrue("You cannot have a null path element after JDK 6",Platform.is6OrAfter());
+        }
+        catch (IllegalArgumentException iae) {
+            // This is expected as path elements cannot be null 
+            // as of JDK 7
+
+            assertTrue("Shouldn't hit this test before JDK 7",Platform.is7OrAfter());
+        }
     }
 
     protected void setUp() {

Modified: abbot/trunk/test/abbot/tester/JTableTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JTableTesterTest.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/test/abbot/tester/JTableTesterTest.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -2,6 +2,7 @@
 
 import java.awt.Component;
 import java.awt.Dimension;
+import java.awt.EventQueue;
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -113,17 +114,23 @@
         // Add an item two seconds later
         //
 
-        String longString = "this is a really long section of text that means that the middle co-ordinate just isn't ever going to be visible";
-        dtm.removeRow(0);
-        dtm.removeRow(0);
-        dtm.removeRow(0);
-        dtm.removeRow(0);
-        dtm.addRow(new Object[] {"new value", "", "",  longString });
+        final String longString = "this is a really long section of text that means that the middle co-ordinate just isn't ever going to be visible";
+
+        // Intermittent failure as being done after frame is shown so EDT violation
+        EventQueue.invokeAndWait(new Runnable() {
+                                     public void run() {
+                                         dtm.removeRow(0);
+                                         dtm.removeRow(0);
+                                         dtm.removeRow(0);
+                                         dtm.removeRow(0);
+                                         dtm.addRow(new Object[] {"new value", "", "",  longString });
+                                         
+                                         table.getTableHeader().getColumnModel().getColumn(3)
+                                             .setMinWidth(500);
+                                         table.invalidate();
+                                     }
+                                 });
         
-        table.getTableHeader().getColumnModel().getColumn(3)
-            .setMinWidth(500);
-        table.invalidate();
-        
         // Now try to select
         //
                         
@@ -181,18 +188,23 @@
         JScrollPane scrollPane = new JScrollPane(table);
         showFrame(scrollPane);
         tester.actionClick(table, new JTableLocation(0, 0));
+        tester.waitForIdle();
         assertEquals("Wrong row selected", 0, table.getSelectedRow());
         assertEquals("Wrong column selected", 0, table.getSelectedColumn());
         tester.actionClick(table, new JTableLocation(ROWS-1, COLS-1));
+        tester.waitForIdle();
         assertEquals("Wrong row selected", ROWS-1, table.getSelectedRow());
         assertEquals("Wrong column selected", COLS-1, table.getSelectedColumn());
         tester.actionClick(table, new JTableLocation(ROWS-1, 0));
+        tester.waitForIdle();
         assertEquals("Wrong row selected", ROWS-1, table.getSelectedRow());
         assertEquals("Wrong column selected", 0, table.getSelectedColumn());
         tester.actionClick(table, new JTableLocation(0, COLS-1));
+        tester.waitForIdle();
         assertEquals("Wrong row selected", 0, table.getSelectedRow());
         assertEquals("Wrong column selected", COLS-1, table.getSelectedColumn());
         tester.actionClick(table, new JTableLocation(0, 0));
+        tester.waitForIdle();
         assertEquals("Wrong row selected", 0, table.getSelectedRow());
         assertEquals("Wrong column selected", 0, table.getSelectedColumn());
     }

Modified: abbot/trunk/test/abbot/tester/JTextComponentTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JTextComponentTesterTest.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/test/abbot/tester/JTextComponentTesterTest.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -141,10 +141,10 @@
         assertEquals("Wrong location",
                      23, tc.getCaretPosition());
 
-        // TODO work out why this particular test is failing, seems to require a triple click
+        // A triple click required as the text is no intially visible?
         tester.actionClick(tc, "size");
         tester.actionClick(tc, "size");
-        tester.delay(5000); // We are only testing single click
+        tester.actionClick(tc, "size");
         assertEquals("Wrong location", 56, tc.getCaretPosition());
 
     }
@@ -209,6 +209,15 @@
                      text.length()-1, tc.getSelectionEnd());
     }
 
+    /**
+     * So this test appears to be failing because there is no drag operaion
+     * going on when the text is moved underneath the cursor, in the real
+     * screen the x,y co-ords are not changing so I suspect this is causing
+     * the code not to see this as a selection operation, I suspect we need to 
+     * generate a mouse move event or some kind to have this work but
+     * we might need to provide a different implementation
+     * @exception
+     */
     public void testSelectByText() {
         showFrame(tc);
         // Try a long selection and select a particular string
@@ -216,6 +225,8 @@
         tc.setText(text);
         tester.waitForIdle();
         tester.actionSelectText(tc, "lazy");
+        tester.waitForIdle();
+
         assertEquals("Wrong selection start",
                      36, tc.getSelectionStart());
         assertEquals("Wrong selection end (hidden)",

Modified: abbot/trunk/test/abbot/tester/JTreeLocationTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JTreeLocationTest.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/test/abbot/tester/JTreeLocationTest.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -1,5 +1,7 @@
 package abbot.tester;
 
+import abbot.Platform;
+
 import java.awt.Point;
 import java.awt.Rectangle;
 
@@ -97,10 +99,21 @@
     public void testParsePathHiddenRoot() {
         JTreeLocation loc = new JTreeLocation();
         String parse = "[null, parent, child]";
-        assertEquals("Badly parsed: " + parse,
-                     new JTreeLocation((TreePath)new TreePathParser().
-                         parse(parse)),
-                     loc.parse("\"" + parse + "\""));
+        try
+        {
+            assertEquals("Badly parsed: " + parse,
+                         new JTreeLocation((TreePath)new TreePathParser().
+                             parse(parse)),
+                         loc.parse("\"" + parse + "\""));
+            
+            assertTrue("You cannot have a null path element after JDK 6",Platform.is6OrAfter());
+        }
+        catch (IllegalArgumentException iae) {
+            // This is expected as path elements cannot be null 
+            // as of JDK 7
+
+            assertTrue("Shouldn't hit this test before JDK 7",Platform.is7OrAfter());
+        }
     }
 
     public void testConvertHiddenRoot() {
@@ -111,19 +124,20 @@
         Object parent = tree.getModel().getChild(root, 0);
         Object child = tree.getModel().getChild(parent, 0);
         TreePath p1 = (TreePath)
-            new TreePathParser().parse("[null, parent, child]");
+            new TreePathParser().parse("[parent, child]"); // Cannot have null elements as of JDK 7 "[null, parent, child]");
         TreePath p2 = JTreeLocation.findMatchingPath(tree, p1);
         assertTrue("Got a null path", p2 != null);
         assertEquals("Wrong root", root, p2.getPathComponent(0));
         assertEquals("Wrong parent", parent, p2.getPathComponent(1));
         assertEquals("Wrong child", child, p2.getPathComponent(2));
 
-        p1 = (TreePath)new TreePathParser().parse("[parent, child]");
-        p2 = JTreeLocation.findMatchingPath(tree, p1);
-        assertTrue("Got a null path", p2 != null);
-        assertEquals("Wrong root", root, p2.getPathComponent(0));
-        assertEquals("Wrong parent", parent, p2.getPathComponent(1));
-        assertEquals("Wrong child", child, p2.getPathComponent(2));
+        // Remove as we can no longer perform [null,... test in JDK 7
+//        p1 = (TreePath)new TreePathParser().parse("[parent, child]");
+//        p2 = JTreeLocation.findMatchingPath(tree, p1);
+//        assertTrue("Got a null path", p2 != null);
+//        assertEquals("Wrong root", root, p2.getPathComponent(0));
+//        assertEquals("Wrong parent", parent, p2.getPathComponent(1));
+//        assertEquals("Wrong child", child, p2.getPathComponent(2));
     }
 
     private static int count=0;

Modified: abbot/trunk/test/abbot/tester/JTreeTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JTreeTesterTest.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/test/abbot/tester/JTreeTesterTest.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -174,6 +174,7 @@
         // Avoid the next action being interpreted as the same click
         tester.delay(500);
         tester.actionToggleRow(tree, new JTreeLocation(row));
+        // Make sure events have fired
         assertTrue("Node should not still be expanded", !tree.isExpanded(row));
     }
 

Modified: abbot/trunk/test/abbot/util/WeakAWTEventListenerTest.java
===================================================================
--- abbot/trunk/test/abbot/util/WeakAWTEventListenerTest.java	2012-04-26 16:11:29 UTC (rev 2828)
+++ abbot/trunk/test/abbot/util/WeakAWTEventListenerTest.java	2012-05-09 16:02:38 UTC (rev 2829)
@@ -22,7 +22,9 @@
     }
 
     public void testAddAndRemove() {
-        ArrayList list = new ArrayList();
+        ArrayList<AWTEventListener> list = new ArrayList<AWTEventListener>();
+       final  ArrayList<WeakAWTEventListener> weakList = new ArrayList<WeakAWTEventListener>();
+
         Toolkit toolkit = Toolkit.getDefaultToolkit();
         int SIZE = 1000;
         Listener l1 = new Listener();
@@ -31,13 +33,36 @@
         for (int i=0;i < SIZE;i++) {
             Listener listener = new Listener();
             list.add(listener);
-            new WeakAWTEventListener(listener, -1);
+            // Warning this constructor adds a listener
+            weakList.add(new WeakAWTEventListener(listener, -1));
         }
         Listener l2 = new Listener();
         toolkit.addAWTEventListener(l2, -1);
         list.clear();
-        System.gc();
+        
+        // We need to gc until such time as we are sure that the references are indeed tidied up
+        // System.gc() on it's own just won't cut it
+        abbot.tester.Robot.wait(new Condition()
+             {
+            @Override
+            public boolean test() {
+                System.gc();
+                for (WeakAWTEventListener next : weakList) {
+                    if (!next.isDisposed()) {
+                        return false;
+                    }
+                }
+                return true;
+            }
 
+            @Override
+            public String toString() {
+                return "Need to let everything be disposed";
+            }
+        });
+            
+        
+
         // All unreferenced listeners should be removed on the next posted
         // event. 
         showFrame(new JLabel(getName()));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2831
          http://abbot.svn.sourceforge.net/abbot/?rev=2831&view=rev
Author:   gdavison
Date:     2012-05-10 14:43:52 +0000 (Thu, 10 May 2012)
Log Message:
-----------
Minor tweak to simplify clipboard code and to
fix intermittent failures in a test due to a EDT
violation.

Modified Paths:
--------------
    abbot/trunk/lib/costello.jar
    abbot/trunk/src/abbot/editor/ScriptEditor.java
    abbot/trunk/test/abbot/editor/ScriptEditorTest.java

Modified: abbot/trunk/lib/costello.jar
===================================================================
(Binary files differ)

Modified: abbot/trunk/src/abbot/editor/ScriptEditor.java
===================================================================
--- abbot/trunk/src/abbot/editor/ScriptEditor.java	2012-05-09 16:10:38 UTC (rev 2830)
+++ abbot/trunk/src/abbot/editor/ScriptEditor.java	2012-05-10 14:43:52 UTC (rev 2831)
@@ -1312,13 +1312,19 @@
         setEnabled(ACTION_STEP_CUT, haveScript && haveSelection);
         setEnabled(ACTION_STEP_COPY, haveScript && haveSelection);
         
-        // Only allow string pastes
+        // Only allow string pastes, hope it works
         Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
-        Transferable transferable = clipboard.getContents(null);
+        boolean stringOnClipboard;
+        try {
+            stringOnClipboard = clipboard.isDataFlavorAvailable(DataFlavor.stringFlavor);
+        }
+        catch (IllegalArgumentException iae) {
+            // if we cannot access the clipboard give up.
+            stringOnClipboard = false;
+        }
         
         setEnabled(ACTION_STEP_PASTE, haveScript && haveSelection &&
-            (transferable!=null
-            && transferable.isDataFlavorSupported(DataFlavor.stringFlavor)));
+            (stringOnClipboard));
 
         setEnabled(ACTION_STEP_DELETE, haveScript && haveSelection);
 

Modified: abbot/trunk/test/abbot/editor/ScriptEditorTest.java
===================================================================
--- abbot/trunk/test/abbot/editor/ScriptEditorTest.java	2012-05-09 16:10:38 UTC (rev 2830)
+++ abbot/trunk/test/abbot/editor/ScriptEditorTest.java	2012-05-10 14:43:52 UTC (rev 2831)
@@ -10,6 +10,8 @@
 import abbot.script.Script;
 
 
+import abbot.util.AWT;
+
 import java.awt.EventQueue;
 
 import java.util.concurrent.TimeUnit;
@@ -58,7 +60,7 @@
     /** Open a new, empty script. */
     public void testNewScript() throws Throwable {
         // Try a file that exists
-        File file = File.createTempFile(getName(), ".xml");
+        final File file = File.createTempFile(getName(), ".xml");
         file.deleteOnExit();
         editor.newScript(file, false);
         // Default script should always get a launch + terminate
@@ -69,10 +71,18 @@
                    script.hasTerminate());
 
         // Try a file that doesn't exist
-        file = File.createTempFile(getName(), ".xml");
-        file.delete();
-        editor.newScript(file, false);
-        file.deleteOnExit();
+        final File newFile = File.createTempFile(getName(), ".xml");
+        newFile.deleteOnExit();
+        newFile.delete();
+
+        // Test was failing due to this EDT violation
+        AWT.invokeAndWait(new Runnable() {
+            public void run() {
+                editor.newScript(newFile, false);
+            }
+        });
+            
+        
         script = (Script)editor.getResolverContext();
         assertTrue("Script should have a launch step",
                    script.hasLaunch());

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2833
          http://abbot.svn.sourceforge.net/abbot/?rev=2833&view=rev
Author:   gdavison
Date:     2012-05-15 09:17:19 +0000 (Tue, 15 May 2012)
Log Message:
-----------
Added support for variable substitution on the classpath of the Launch step

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/src/abbot/script/Launch.java
    abbot/trunk/test/abbot/script/LaunchTest.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-05-11 08:18:05 UTC (rev 2832)
+++ abbot/trunk/ChangeLog	2012-05-15 09:17:19 UTC (rev 2833)
@@ -1,3 +1,6 @@
+2012-05-15  Gerard Davison
+        * Added variable subsitution for the Launch step after user request
+
 2012-05-12  Gerard Davison
 
         * Updated version number to 1.3.0RC1

Modified: abbot/trunk/src/abbot/script/Launch.java
===================================================================
--- abbot/trunk/src/abbot/script/Launch.java	2012-05-11 08:18:05 UTC (rev 2832)
+++ abbot/trunk/src/abbot/script/Launch.java	2012-05-15 09:17:19 UTC (rev 2833)
@@ -97,7 +97,9 @@
     }
 
     protected AppClassLoader createClassLoader() {
-        return new AppClassLoader(classpath);
+        return new AppClassLoader(
+          // Make sure we allow variable subsitution on the classpath
+          ArgumentParser.substitute(getResolver(), classpath));
     }
 
     /** Install the class loader context for the code being launched.  The

Modified: abbot/trunk/test/abbot/script/LaunchTest.java
===================================================================
--- abbot/trunk/test/abbot/script/LaunchTest.java	2012-05-11 08:18:05 UTC (rev 2832)
+++ abbot/trunk/test/abbot/script/LaunchTest.java	2012-05-15 09:17:19 UTC (rev 2833)
@@ -1,5 +1,7 @@
 package abbot.script;
 
+import abbot.util.PathClassLoader;
+
 import junit.extensions.abbot.*;
 import javax.swing.*;
 
@@ -14,7 +16,9 @@
         launch = new Launch(r, null, DummyLaunch.class.getName(),
                             "main", new String[] { "[]" });
         // Assumes a little something about the test environment
-        launch.setClasspath("classes");
+        // Also tests that variable subsitution works correctly
+        System.setProperty("LaunchTest.classes","classes");
+        launch.setClasspath("${LaunchTest.classes}");
         terminate = false;
         classLoader = Thread.currentThread().getContextClassLoader();
     }
@@ -29,6 +33,13 @@
         assertTrue("Launch should be launched", launch.isLaunched());
     }
 
+
+  public void testClasspath() throws Throwable {
+      String classpath = ((PathClassLoader)launch.getContextClassLoader()).getClassPath();
+      assertEquals("Variables should be subsituted for classpaths", "classes", classpath);
+  }
+
+
     public void testRunState() throws Throwable {
         launch.runStep();
         assertTrue("Launch should be launched", launch.isLaunched());

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2834
          http://abbot.svn.sourceforge.net/abbot/?rev=2834&view=rev
Author:   gdavison
Date:     2012-05-18 13:12:51 +0000 (Fri, 18 May 2012)
Log Message:
-----------
Make a fix to prevent a StackOverflow error when trying to record a script in Netbeans.

Updated the copyright message to include 2012.

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/build.xml
    abbot/trunk/src/abbot/editor/CompactHierarchy.java
    abbot/trunk/src/abbot/editor/ComponentTree.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-05-15 09:17:19 UTC (rev 2833)
+++ abbot/trunk/ChangeLog	2012-05-18 13:12:51 UTC (rev 2834)
@@ -1,3 +1,12 @@
+2012-05-18  Gerard Davison
+        * Work to resolve a stack overflow when using Costello to record in Netbeans, which it turns out
+          wasn't enough to make the fixes in 3495968. Basically getPopupMenu was causing all child
+          components to be added and removed, so I have modified the code to use reflection first of
+          all to get hold of the popupMenu field followed by getPopupMenu if it doesn't. This gives
+          a snapshot of the current structure of the UI whcih I think is the intent of the code. Future
+          work would be to put some kind of delay in for the ComponentTree to deal with a future packet
+          storm.
+        
 2012-05-15  Gerard Davison
         * Added variable subsitution for the Launch step after user request
 

Modified: abbot/trunk/build.xml
===================================================================
--- abbot/trunk/build.xml	2012-05-15 09:17:19 UTC (rev 2833)
+++ abbot/trunk/build.xml	2012-05-18 13:12:51 UTC (rev 2834)
@@ -13,7 +13,7 @@
   <!-- This is the master version number.  Changes here affect everything. -->
   <property name="abbot.version" value="1.3.0RC1"/>
   <property name="copyright"
-    value="Copyright &#169; 2002-2011 Timothy Wall. All Rights Reserved."/>
+    value="Copyright &#169; 2002-2012 Timothy Wall. All Rights Reserved."/>
   <property name="company.full" value="Abbot Framework"/>
   <property name="compatibility" value="1.6"/>
   <property name="src" value="src"/>

Modified: abbot/trunk/src/abbot/editor/CompactHierarchy.java
===================================================================
--- abbot/trunk/src/abbot/editor/CompactHierarchy.java	2012-05-15 09:17:19 UTC (rev 2833)
+++ abbot/trunk/src/abbot/editor/CompactHierarchy.java	2012-05-18 13:12:51 UTC (rev 2834)
@@ -1,5 +1,7 @@
    package abbot.editor;
 
+import abbot.Log;
+
 import java.awt.*;
 import javax.swing.*;
 import java.util.*;
@@ -7,6 +9,8 @@
 import abbot.util.AWT;
 import abbot.finder.Hierarchy;
 
+import java.lang.reflect.Field;
+
 import java.util.concurrent.Callable;
 
 /** Provides a condensed, more easily readable version of the original
@@ -123,8 +127,29 @@
                     {
                         @Override
                         public JPopupMenu call() {
-//                            System.out.println("%%%%%%% Calling getPopupMenu on event queue %%%%%%%%%%");
-                            return ((JMenu) c).getPopupMenu();
+
+                            // Sometime, in particular using Netbeans the popupMenu
+                            // call might have side effects, so just access the field
+                            // directly to understand the current state of the object
+                            // if it hasn't already been created.
+                            JPopupMenu menu = null;
+                            
+                            try
+                            {
+                                Field $popupMenu = JMenu.class.getDeclaredField("popupMenu");
+                                $popupMenu.setAccessible(true);
+                                menu = (JPopupMenu)$popupMenu.get(c);
+                            }
+                            catch (Exception ex) {
+                                Log.warn(ex);
+                            }
+                            
+                            if (menu==null)
+                            {
+                                menu = ((JMenu)c).getPopupMenu();
+                            }
+                            
+                            return menu;
                         }
                     });
                 return getComponents(popupMenu);
@@ -149,6 +174,11 @@
 
         return list;
     }
+    
+    
+    
+    
+    
 
     /** Scan for popups which have been invoked by the given invoker. */
     private Collection findInvokerPopups(Component invoker) {

Modified: abbot/trunk/src/abbot/editor/ComponentTree.java
===================================================================
--- abbot/trunk/src/abbot/editor/ComponentTree.java	2012-05-15 09:17:19 UTC (rev 2833)
+++ abbot/trunk/src/abbot/editor/ComponentTree.java	2012-05-18 13:12:51 UTC (rev 2834)
@@ -10,8 +10,11 @@
 import abbot.finder.*;
 import abbot.util.*;
 
+import java.util.IdentityHashMap;
+import java.util.Map;
+
 /** Provides a Tree view into a given Hierarchy of components.  Refreshes its
-    display based on changes to the default AWT hierarchy.  
+    display based on changes to the default AWT hierarchy.
     The selection path is preserved to the extent possible across changes in
     the hierarchy.
  */
@@ -164,27 +167,59 @@
         reload(null);
     }
 
-    /** Reloads the hierarchy starting at the given component. */
-    public void reload(Component comp) {
-        ComponentNode node = comp != null ? root.getNode(comp) : root;
-        TreePath path = getSelectionPath();
-        Component selected = path == null 
-            ? null : ((ComponentNode)path.getLastPathComponent()).getComponent();
-        if (node == null)
-            node = root;
 
-        // suppress selection change notifications until we're certain we
-        // can't restore the original selection.
-        ignoreSelectionChanges = true;
-        node.reload();
-        model.reload(node);
-        if (selected != null) {
-            TreePath newPath = root.getPath(selected);
-            // if the selection is exactly the same as it was before the
-            // reload, suppress selection change notifications
-            ignoreSelectionChanges = path.equals(newPath);
-            setSelectionPath(newPath);
-        }
-        ignoreSelectionChanges = false;
-    }
+   /**
+    * Using an identity hash map rather than a normal one to 
+    * prevent any equals methods being called.
+    */
+   private Map<Component, Component> currentlyProccessing = 
+           new IdentityHashMap<Component, Component>();
+   
+   
+   /** Reloads the hierarchy starting at the given component. */
+   public void reload(Component comp) {
+       
+       // Prevent possible stack overflows because of components being added
+       // as we walk the tree
+       if (currentlyProccessing.containsKey(comp)){
+           return;
+       }
+       else {
+
+           try {
+               
+               // Store this element in the set so that we don't get
+               // stuck in a look if getting child elements has side effects
+               currentlyProccessing.put(comp, comp);
+               
+               // Process nodes
+               
+               ComponentNode node = comp != null ? root.getNode(comp) : root;
+               TreePath path = getSelectionPath();
+               Component selected = path == null 
+                   ? null : ((ComponentNode)path.getLastPathComponent()).getComponent();
+               if (node == null)
+                   node = root;
+
+               // suppress selection change notifications until we're certain we
+               // can't restore the original selection.
+               ignoreSelectionChanges = true;
+               node.reload();
+               model.reload(node);
+               if (selected != null) {
+                   TreePath newPath = root.getPath(selected);
+                   // if the selection is exactly the same as it was before the
+                   // reload, suppress selection change notifications
+                   ignoreSelectionChanges = path.equals(newPath);
+                   setSelectionPath(newPath);
+               }
+               ignoreSelectionChanges = false;
+
+           }
+           finally {
+               currentlyProccessing.remove(comp);
+           }
+       }
+   }
+
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2835
          http://abbot.svn.sourceforge.net/abbot/?rev=2835&view=rev
Author:   gdavison
Date:     2012-05-28 09:19:02 +0000 (Mon, 28 May 2012)
Log Message:
-----------
Fixes to resolve EDT violation caused by accessing the accessible context when trying
to generate a component name.

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/projects/jdeveloper/Tests/Tests.jpr
    abbot/trunk/src/abbot/tester/Robot.java
    abbot/trunk/test/abbot/script/ComponentReferenceTest.java
    abbot/trunk/test/abbot/tester/ComponentTesterTest.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-05-18 13:12:51 UTC (rev 2834)
+++ abbot/trunk/ChangeLog	2012-05-28 09:19:02 UTC (rev 2835)
@@ -1,3 +1,7 @@
+2012-05-25  Gerard Davison
+        * Resolve possible and actualy EDT violations in String Robot.getXXXXX methods as reported 
+          with internal testing.
+
 2012-05-18  Gerard Davison
         * Work to resolve a stack overflow when using Costello to record in Netbeans, which it turns out
           wasn't enough to make the fixes in 3495968. Basically getPopupMenu was causing all child

Modified: abbot/trunk/projects/jdeveloper/Tests/Tests.jpr
===================================================================
--- abbot/trunk/projects/jdeveloper/Tests/Tests.jpr	2012-05-18 13:12:51 UTC (rev 2834)
+++ abbot/trunk/projects/jdeveloper/Tests/Tests.jpr	2012-05-28 09:19:02 UTC (rev 2835)
@@ -115,7 +115,7 @@
             </hash>
             <value n="programArguments" v=""/>
             <url n="runDirectoryURL" path="../../../"/>
-            <value n="targetURL"/>
+            <url n="targetURL" path="../../../test/abbot/script/ComponentReferenceTest.java"/>
          </hash>
       </hash>
    </hash>

Modified: abbot/trunk/src/abbot/tester/Robot.java
===================================================================
--- abbot/trunk/src/abbot/tester/Robot.java	2012-05-18 13:12:51 UTC (rev 2834)
+++ abbot/trunk/src/abbot/tester/Robot.java	2012-05-28 09:19:02 UTC (rev 2835)
@@ -2527,9 +2527,15 @@
         */
         return name;
     }
+
     /** Returns the index of the given component within the given container. */
     public static int getIndex(Container parent, Component comp) {
         if (comp instanceof Window) {
+            
+            // getOwnedWindows is protoected by a synchronized block so this
+            // is probably safe to call
+            //
+            
             Window[] owned = ((Window)parent).getOwnedWindows();
             for (int i=0;i < owned.length;i++) {
                 if (owned[i] == comp) {
@@ -2538,16 +2544,27 @@
             }
         }
         else {
-            Component[] children = parent.getComponents();
-            for (int i = 0; i < children.length; ++i) {
-                if (children[i] == comp) {
-                    return i;
+            
+            // Getting a list of components need to be protected by the tree lock
+            // at least possibility if this is a problem then we are going to 
+            // have to do a callAndWait instead.
+            //
+            
+            synchronized(comp.getTreeLock())
+            {
+                Component[] children = parent.getComponents();
+                for (int i = 0; i < children.length; ++i) {
+                    if (children[i] == comp) {
+                        return i;
+                    }
                 }
             }
         }
         return -1;
     }
-    public static String getText(Component c) {
+
+
+    public static String getText(final Component c) {
         if (c instanceof AbstractButton) {
             return ComponentTester.stripHTML(((AbstractButton)c).getText());
         }
@@ -2559,6 +2576,8 @@
         }
         return null;
     }
+    
+    
     public static String getLabel(Component c) {
         String label = null;
         if (c instanceof JComponent) {
@@ -2583,9 +2602,49 @@
         }
         return ComponentTester.stripHTML(label);
     }
-    public static String getIconName(Component c) {
+
+    private static final Object ACCESSIBLE_CONTEXT_CACHE = new Object() {};
+
+    public static String getIconName(final Component c) {
+        
+        if (c instanceof JComponent)
+        {
+            // So we had a case where getting hold of the AccessibleContext was causing
+            // work to be done off the event queue; but invoking this code everytime on a particular
+            // component proved to be expense, so using a clientProperty to cache this value, just
+            // calling the method the first time should it not exist. Appears to be a safe thing
+            // to do after a brief review of the swing classes
+            AccessibleContext ac = (AccessibleContext)((JComponent)c).getClientProperty(ACCESSIBLE_CONTEXT_CACHE);
+            // 
+            if (ac==null) {
+                ac = callAndWait(c, new Callable<AccessibleContext>() {
+                                public AccessibleContext call() {
+                                    AccessibleContext accessibleContext = c.getAccessibleContext();
+                                    ((JComponent)c).putClientProperty(ACCESSIBLE_CONTEXT_CACHE, accessibleContext);
+                                    return accessibleContext;
+                                }
+                
+                });
+            }
+            else {
+                int i = 0;
+            }
+            
+            // Otherwise we need to access the accessible context
+            
+            return getIconName(ac);
+            
+        }
+        else {
+            // Just don't think this will happen very much
+            return getIconName(c.getAccessibleContext());
+        }
+    }
+
+
+    private static String getIconName(AccessibleContext context)
+    {
         String icon = null;
-        AccessibleContext context = c.getAccessibleContext();
         if (context != null) {
             AccessibleIcon[] icons = context.getAccessibleIcon();
             if (icons != null && icons.length > 0) {
@@ -2598,6 +2657,8 @@
         }
         return icon;
     }
+
+
     public static String getBorderTitle(Component c) {
         String title = null;
         if (c instanceof JComponent) {
@@ -2620,14 +2681,14 @@
     }
 
     public static String getTitle(Component c) {
-        if (c instanceof Dialog)
-            return ((Dialog)c).getTitle();
-        else if (c instanceof Frame) 
-            return ((Frame)c).getTitle();
-        else if (c instanceof JInternalFrame)
-            return ((JInternalFrame)c).getTitle();
-        return null;
-    }
+                            if (c instanceof Dialog)
+                                return ((Dialog)c).getTitle();
+                            else if (c instanceof Frame) 
+                                return ((Frame)c).getTitle();
+                            else if (c instanceof JInternalFrame)
+                                return ((JInternalFrame)c).getTitle();
+                            return null;
+                        }
     /** Returns whether it is possible to resize windows that are not an
         instance of Frame or Dialog.  Most X11 window managers will allow
         this, but stock Macintosh and Windows do not.

Modified: abbot/trunk/test/abbot/script/ComponentReferenceTest.java
===================================================================
--- abbot/trunk/test/abbot/script/ComponentReferenceTest.java	2012-05-18 13:12:51 UTC (rev 2834)
+++ abbot/trunk/test/abbot/script/ComponentReferenceTest.java	2012-05-28 09:19:02 UTC (rev 2835)
@@ -879,7 +879,8 @@
         showFrame(tabs);
         Timer timer = new Timer();
         ComponentReference ref = resolver.addComponent(button);
-        if (timer.elapsed() > 500) 
+        long elapsed = timer.elapsed();
+        if (elapsed > 500) 
             fail("Creation of non-visible tabbed pane component took "
                  + timer.elapsed() + "ms");
     }

Modified: abbot/trunk/test/abbot/tester/ComponentTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/ComponentTesterTest.java	2012-05-18 13:12:51 UTC (rev 2834)
+++ abbot/trunk/test/abbot/tester/ComponentTesterTest.java	2012-05-28 09:19:02 UTC (rev 2835)
@@ -12,8 +12,10 @@
 import abbot.util.*;
 import abbot.util.Bugs;
 
+import java.util.concurrent.TimeUnit;
+
 /** Unit test to verify the base ComponentTester class.<p>
-    
+
     <ul>
     <li>Test all exported actions.
     </ul>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2836
          http://abbot.svn.sourceforge.net/abbot/?rev=2836&view=rev
Author:   gdavison
Date:     2012-06-11 09:05:56 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
Provide the user with a little bit more help when there are multiple matches
for a given component reference.

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/src/abbot/i18n/Strings.java
    abbot/trunk/src/abbot/i18n/abbot.properties
    abbot/trunk/src/abbot/script/ComponentReference.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-05-28 09:19:02 UTC (rev 2835)
+++ abbot/trunk/ChangeLog	2012-06-11 09:05:56 UTC (rev 2836)
@@ -1,3 +1,6 @@
+2012-06-11  Gerard Davison
+	* Provide better information for the user when we match multiple components to a single ComponentReference
+
 2012-05-25  Gerard Davison
         * Resolve possible and actualy EDT violations in String Robot.getXXXXX methods as reported 
           with internal testing.

Modified: abbot/trunk/src/abbot/i18n/Strings.java
===================================================================
--- abbot/trunk/src/abbot/i18n/Strings.java	2012-05-28 09:19:02 UTC (rev 2835)
+++ abbot/trunk/src/abbot/i18n/Strings.java	2012-06-11 09:05:56 UTC (rev 2836)
@@ -152,17 +152,10 @@
         {@link java.text.MessageFormat} syntax for the format string and 
         arguments.
     */
-    public static String get(String key, Object[] args) {
+    public static String get(String key, Object... args) {
         return new MessageFormat(get(key)).format(args);
     }
     
-    /** Convenience method for a single-argument format. */
-    public static String get(String key, Object arg) {
-        return get(key, new Object[] { arg });
-    }
 
-    /** Convenience method for a two-argument format. */
-    public static String get(String key, Object arg1, Object arg2) {
-        return get(key, new Object[] { arg1, arg2 });
-    }
+
 }

Modified: abbot/trunk/src/abbot/i18n/abbot.properties
===================================================================
--- abbot/trunk/src/abbot/i18n/abbot.properties	2012-05-28 09:19:02 UTC (rev 2835)
+++ abbot/trunk/src/abbot/i18n/abbot.properties	2012-06-11 09:05:56 UTC (rev 2836)
@@ -101,6 +101,12 @@
 sequence.desc=Sequence ({0})
 finder.not_found=No Component found with matcher ''{0}''
 finder.multiple_found=Multiple Components found with matcher ''{0}''
+reference.multiple_found_reference=Could not distinguish between {0} components using {1} \n\n\
+This is likely because either:\n\
+* The component is not yet visible on the screen, consider using a wait for component visible\n\
+* The component reference no longer matches, consider re-recording the reference\n\
+* The component cannot be easily uniquely identified, consider whether this component should have a \
+JLabel associated with it or setting the Name property in order to distinguish it from other components.
 tester.zero_size=Component has zero size
 tester.JComponent.not_visible=Could not make visible by scrolling the point ({0},{1}) on {2}
 tester.JScrollBar.out_of_range=Position {0} is not within the scroll bar bounds of ({1},{2})

Modified: abbot/trunk/src/abbot/script/ComponentReference.java
===================================================================
--- abbot/trunk/src/abbot/script/ComponentReference.java	2012-05-28 09:19:02 UTC (rev 2835)
+++ abbot/trunk/src/abbot/script/ComponentReference.java	2012-06-11 09:05:56 UTC (rev 2836)
@@ -745,8 +745,8 @@
                 }
             }
         }
-        String msg = "Could not distinguish between " + best.size()
-            + " components using " + toXMLString();
+        String msg = Strings.get("reference.multiple_found_reference",
+           best.size(),toXMLString());
         matches = (Component[])best.toArray(new Component[best.size()]);
         throw new MultipleComponentsFoundException(msg, matches);
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2837
          http://abbot.svn.sourceforge.net/abbot/?rev=2837&view=rev
Author:   gdavison
Date:     2012-06-21 16:02:58 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
Try to improve reliability of toggleRow in a JTree in the case where the
node has a double click listener. Temporarily change the threshold of
click to trigger a toggle to 5.

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/src/abbot/tester/JTreeTester.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-06-11 09:05:56 UTC (rev 2836)
+++ abbot/trunk/ChangeLog	2012-06-21 16:02:58 UTC (rev 2837)
@@ -1,3 +1,7 @@
+2012-06-21  Gerard Davison
+        * Modify the toggleRow funcition in JTreeTester to temporaily up the number of clicks for a toggle to
+          5 so that we don't acidently trigger a double click listener.
+
 2012-06-11  Gerard Davison
 	* Provide better information for the user when we match multiple components to a single ComponentReference
 

Modified: abbot/trunk/src/abbot/tester/JTreeTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JTreeTester.java	2012-06-11 09:05:56 UTC (rev 2836)
+++ abbot/trunk/src/abbot/tester/JTreeTester.java	2012-06-21 16:02:58 UTC (rev 2837)
@@ -507,38 +507,71 @@
     // row height.  clicking in the center of that square should work.
     public void actionToggleRow(Component c, ComponentLocation loc) {
         final JTree tree = (JTree)c;
-        // Alternatively, we can reflect into the UI and do a single click
-        // on the appropriate expand location, but this is safer.
-        if (tree.getToggleClickCount() != 0) {
+        
+        // Accessing the toggle click count is thread safe; but updating
+        // it can fire a properly listener which is going to be an issue in some cases
+        // hence this little class to update the value as required
+        class SetToggleClickCount implements Runnable {
+
+            int clickCount;
+            
+            public SetToggleClickCount(int clickCount) {
+                this.clickCount = clickCount;
+            }
+
+            @Override
+            public void run() {
+                tree.setToggleClickCount(clickCount);
+            }
+        }
+        
+        // It turns out that some trees have double click actions on them
+        // so this doesn't work too well. So we are going to increase the click
+        // count to 5 just for the toggle operation, this should make things more
+        // reliable
+        int originalToggleRowCount = tree.getToggleClickCount();
+        invokeAndWait(new SetToggleClickCount(5));
+        try {
             actionClick(tree, loc, InputEvent.BUTTON1_MASK,
                         tree.getToggleClickCount());
+            
         }
-        else {
-            // BasicTreeUI provides this method; punt if we can't find it
-            if (!(tree.getUI() instanceof BasicTreeUI))
-                throw new ActionFailedException("Can't toggle row for "
-                                                + tree.getUI());
-            try {
-                final java.lang.reflect.Method method =
-                    BasicTreeUI.class.
-                    getDeclaredMethod("toggleExpandState",
-                                      new Class[] {
-                                          TreePath.class
-                                      }); 
-                method.setAccessible(true);
-                final Point where = loc.getPoint(tree);
-                Robot.callAndWait(tree, new Callable<Object>() {
-                        public Object call() throws Exception {
-                            return method.invoke(tree.getUI(), new Object[] {
-                                tree.getPathForLocation(where.x, where.y)});
-                        }
-                    });
-            }
-            catch(Exception e) {
-                throw new ActionFailedException(e.toString());
-            }
+        finally {
+            invokeAndWait(new SetToggleClickCount(originalToggleRowCount));
         }
         
+//        // Alternatively, we can reflect into the UI and do a single click
+//        // on the appropriate expand location, but this is safer.
+//        if (tree.getToggleClickCount() != 0) {
+//            actionClick(tree, loc, InputEvent.BUTTON1_MASK,
+//                        tree.getToggleClickCount());
+//        }
+//        else {
+//            // BasicTreeUI provides this method; punt if we can't find it
+//            if (!(tree.getUI() instanceof BasicTreeUI))
+//                throw new ActionFailedException("Can't toggle row for "
+//                                                + tree.getUI());
+//            try {
+//                final java.lang.reflect.Method method =
+//                    BasicTreeUI.class.
+//                    getDeclaredMethod("toggleExpandState",
+//                                      new Class[] {
+//                                          TreePath.class
+//                                      }); 
+//                method.setAccessible(true);
+//                final Point where = loc.getPoint(tree);
+//                Robot.callAndWait(tree, new Callable<Object>() {
+//                        public Object call() throws Exception {
+//                            return method.invoke(tree.getUI(), new Object[] {
+//                                tree.getPathForLocation(where.x, where.y)});
+//                        }
+//                    });
+//            }
+//            catch(Exception e) {
+//                throw new ActionFailedException(e.toString());
+//            }
+//        }
+        
         // Make sure all operations have finsished
         waitForIdle();
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2838
          http://abbot.svn.sourceforge.net/abbot/?rev=2838&view=rev
Author:   gdavison
Date:     2012-06-22 08:49:05 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
Correct yesterday's bug fix to use use 1 rather than 5, and add a unit
test for this case so that double click is not triggered.

Modified Paths:
--------------
    abbot/trunk/src/abbot/tester/JTreeTester.java
    abbot/trunk/test/abbot/tester/JTreeTesterTest.java

Modified: abbot/trunk/src/abbot/tester/JTreeTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JTreeTester.java	2012-06-21 16:02:58 UTC (rev 2837)
+++ abbot/trunk/src/abbot/tester/JTreeTester.java	2012-06-22 08:49:05 UTC (rev 2838)
@@ -527,10 +527,10 @@
         
         // It turns out that some trees have double click actions on them
         // so this doesn't work too well. So we are going to increase the click
-        // count to 5 just for the toggle operation, this should make things more
+        // count to 1 just for the toggle operation, this should make things more
         // reliable
         int originalToggleRowCount = tree.getToggleClickCount();
-        invokeAndWait(new SetToggleClickCount(5));
+        invokeAndWait(new SetToggleClickCount(1));
         try {
             actionClick(tree, loc, InputEvent.BUTTON1_MASK,
                         tree.getToggleClickCount());

Modified: abbot/trunk/test/abbot/tester/JTreeTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JTreeTesterTest.java	2012-06-21 16:02:58 UTC (rev 2837)
+++ abbot/trunk/test/abbot/tester/JTreeTesterTest.java	2012-06-22 08:49:05 UTC (rev 2838)
@@ -8,6 +8,12 @@
 import java.awt.*;
 import java.awt.event.ActionListener;
 
+import java.awt.event.MouseAdapter;
+
+import java.awt.event.MouseEvent;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import javax.swing.*;
 import javax.swing.tree.*;
 
@@ -178,6 +184,25 @@
         assertTrue("Node should not still be expanded", !tree.isExpanded(row));
     }
 
+
+    public void testToggleRowDontTriggerDoubleClick() {
+        final AtomicBoolean triggered = new AtomicBoolean(false);
+        tree.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if (e.getClickCount()==2) {
+                    triggered.set(true);
+                }
+            }
+        });
+        int row = 2;
+        showFrame(scrollPane);
+        tester.actionToggleRow(tree, new JTreeLocation(row));
+        assertTrue("Node should have expanded", tree.isExpanded(row));
+        assertTrue("Double click shouldn't have been triggered", !triggered.get());
+    }
+
+
     public void testGetLocation() {
         showFrame(tree, new Dimension(200, 450));
         // position in expand control

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2839
          http://abbot.svn.sourceforge.net/abbot/?rev=2839&view=rev
Author:   gdavison
Date:     2012-07-18 15:18:41 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
I found that in some test scnarious we would see a StackOverflow coming from
AWTEventMulticaster, and it turned out that this was being caused by WindowTracker
adding hundreds of WindowWatcher instances to the windows that were being displayed.
I haven't gotten to the bottom of why this sometimes happen; but I noticed that
even in normal circumstances that more than one listener was added.

I have modified the code to keep a catch of the adapters that have been added so
that they are not added more than once for a given tracker. Also I have updated the unit
tests to confirm this.

Modified Paths:
--------------
    abbot/trunk/src/abbot/tester/WindowTracker.java
    abbot/trunk/test/abbot/tester/WindowTrackerTest.java

Modified: abbot/trunk/src/abbot/tester/WindowTracker.java
===================================================================
--- abbot/trunk/src/abbot/tester/WindowTracker.java	2012-06-22 08:49:05 UTC (rev 2838)
+++ abbot/trunk/src/abbot/tester/WindowTracker.java	2012-07-18 15:18:41 UTC (rev 2839)
@@ -16,7 +16,10 @@
  * windows.
  */
 public class WindowTracker {
-    
+
+    private WeakAWTEventListener windowReadyTrackerListener;
+    private WeakAWTEventListener contextTrackerListener;
+
     private static class Holder {
         public static final WindowTracker INSTANCE = new WindowTracker();
     }
@@ -41,7 +44,10 @@
     static int WINDOW_READY_DELAY = 
         Properties.getProperty("abbot.window_ready_delay", 10000, 0, 60000);
     private Timer windowReadyTimer;
+    /** Windows which have had an adapter added */
+    private Map<Window, WindowWatcher> watchers = new WeakHashMap<Window, WindowWatcher>();
     
+    
     /** Only ever want one of these. */
     public static WindowTracker getTracker() {
         return Holder.INSTANCE;
@@ -78,15 +84,24 @@
         
         long mask = WindowEvent.WINDOW_EVENT_MASK
             | ComponentEvent.COMPONENT_EVENT_MASK;
-        new WeakAWTEventListener(contextTracker, mask);
+        contextTrackerListener = new WeakAWTEventListener(contextTracker, mask);
         mask = InputEvent.MOUSE_MOTION_EVENT_MASK
             |InputEvent.MOUSE_EVENT_MASK|InputEvent.PAINT_EVENT_MASK;
-        new WeakAWTEventListener(windowReadyTracker, mask);
+        windowReadyTrackerListener = new WeakAWTEventListener(windowReadyTracker, mask);
     }
+    
+    
+    public void dispose() {
+        // Remove listener
+        windowReadyTrackerListener.dispose();
+        contextTrackerListener.dispose();
+        // Canclet the timer
+        windowReadyTimer.cancel();
+    }
 
     private void scanExistingWindows(Window w) {
         // Make sure we catch subsequent show/hide events for this window
-        new WindowWatcher(w);
+        attachWindowWatcherIfRequired(w);
         Window[] windows = w.getOwnedWindows();
         for (int i=0;i < windows.length;i++) {
             scanExistingWindows(windows[i]);
@@ -179,8 +194,12 @@
      * on WINDOW_OPEN and remove it on WINDOW_CLOSE to avoid having to process
      * extraneous ComponentEvents.
      */
-    private class WindowWatcher
+    /*package*/ class WindowWatcher
         extends WindowAdapter implements ComponentListener {
+        /**
+         * Do not call directly as can cause a stack overflow with multiple attacments to the 
+         * listener list
+         */
         public WindowWatcher(Window w) {
             w.addComponentListener(this);
             w.addWindowListener(this);
@@ -198,6 +217,9 @@
         public void windowClosed(WindowEvent e) {
             e.getWindow().removeWindowListener(this);
             e.getWindow().removeComponentListener(this);
+            
+            // Remove self when we tidy up
+            watchers.remove(e.getWindow());
         }
         public void componentResized(ComponentEvent e) { }
         public void componentMoved(ComponentEvent e) { }
@@ -291,7 +313,7 @@
         // it as "open".  There is no Java API for this, so we institute an
         // empirically tested delay.
         if (comp instanceof Window) {
-            new WindowWatcher((Window)comp);
+            attachWindowWatcherIfRequired((Window)comp);
             markWindowShowing((Window)comp);
             // Native components don't receive events anyway...
             if (comp instanceof FileDialog) {
@@ -299,6 +321,14 @@
             }
         }
     }
+    
+    private void attachWindowWatcherIfRequired(Window win)
+    {
+       if (!watchers.containsKey(win))
+       {
+          watchers.put(win, new WindowWatcher(win));
+       }
+    }
 
     private void noteClosed(Component comp) {
         if (comp.getParent() == null) {

Modified: abbot/trunk/test/abbot/tester/WindowTrackerTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/WindowTrackerTest.java	2012-06-22 08:49:05 UTC (rev 2838)
+++ abbot/trunk/test/abbot/tester/WindowTrackerTest.java	2012-07-18 15:18:41 UTC (rev 2839)
@@ -2,6 +2,11 @@
 
 import java.awt.*;
 import java.awt.event.*;
+
+import java.io.PrintStream;
+
+import java.lang.reflect.Field;
+
 import javax.swing.*;
 import junit.framework.*;
 import junit.extensions.abbot.*;
@@ -32,6 +37,7 @@
     }
 
     protected void tearDown() {
+        tracker.dispose();
         tracker = null;
     }
 
@@ -52,23 +58,27 @@
         w.setVisible(true);
         wait(w, true, "WindowTracker didn't catch initial Window.show()");
         assertTrue("Window should be showing", w.isShowing());
+        assertEquals("Should only be one adapter per window, but in this test there is another tracker",2, countWindowAdapters(w));
 
         w.setVisible(false);
         wait(w, false, "WindowTracker didn't catch Window.hide()");
         assertTrue("Window should not be showing", !w.isShowing());
+        assertEquals("Should only be one adapter per window, but in this test there is another tracker",2, countWindowAdapters(w));
 
         w.setVisible(true);
         wait(w, true, "WindowTracker didn't catch Window.show() after hide");
         assertTrue("Window should be showing", w.isShowing());
+        assertEquals("Should only be one adapter per window, but in this test there is another tracker",2, countWindowAdapters(w));
 
         // Generates WINDOW_CLOSE, may or may not generate COMPONENT_HIDDEN
         w.dispose();
         wait(w, false, "WindowTracker didn't catch Window.dispose()");
         assertTrue("Window should not be showing", !w.isShowing());
+        assertEquals("Trackers should have been removed",0, countWindowAdapters(w));
     }
 
     public void testSingleWindowReady() throws Throwable {
-        JFrame f = new JFrame(getName());
+        final JFrame f = new JFrame(getName());
         MouseWatcher watcher = new MouseWatcher();
         f.addMouseListener(watcher);
         f.getContentPane().add(new JLabel(getName()));
@@ -77,6 +87,8 @@
         f.setVisible(true);
         try {
             wait(f, true, "WindowTracker didn't catch initial Window.show");
+            assertEquals("Should only be one adapter per window, but in this test there is another tracker",2, countWindowAdapters(f));
+
             getRobot().click(f);
             getRobot().waitForIdle();
             if (!watcher.gotClick)
@@ -85,9 +97,11 @@
             watcher.gotClick = false;
             f.setVisible(false);
             wait(f, false, "WindowTracker didn't catch Window.hide after show");
+            assertEquals("Should only be one adapter per window, but in this test there is another tracker",2, countWindowAdapters(f));
             
             f.setVisible(true);
             wait(f, true, "WindowTracker didn't catch Window.show after hide");
+            assertEquals("Should only be one adapter per window, but in this test there is another tracker",2, countWindowAdapters(f));
             assertTrue("Window not ready", tracker.isWindowReady(f));
             getRobot().click(f);
             getRobot().waitForIdle();
@@ -95,7 +109,12 @@
                 throw new MissedShow2();
         }
         finally {
-            f.dispose();
+            // Do on the event queue otherwise the following tests will fail
+            getRobot().invokeAndWait(new Runnable() { public void run() {
+                f.dispose();
+            }});
+
+            assertEquals("Trackers should be removed at this point",0, countWindowAdapters(f));
         }
     }
 
@@ -117,6 +136,8 @@
             getRobot().waitForIdle();
             
             assertTrue("Window not ready for click", watcher.gotClick);
+
+            assertEquals("Should only be one adapter per window, but in this test there is another tracker",2, countWindowAdapters(f));
         }
         finally {
             f.dispose();
@@ -162,13 +183,15 @@
             w.setVisible(true);
         }});
         wait(w, true, "Didn't catch initial Window.show()");
-        assertTrue("Window not showing", w.isShowing());
+        assertTrue("Window showing", w.isShowing());
+        assertEquals("Should only be one adapter per window, but in this test there is another tracker",2, countWindowAdapters(w));
 
         getRobot().invokeAndWait(new Runnable() { public void run() {
             w.dispose();
         }});
         wait(w, false, "Didn't catch Window.dispose()");
         assertTrue("Window not hidden", !w.isShowing());
+        assertEquals("Should be zero after a dispoe",0, countWindowAdapters(w));
         
         getRobot().invokeAndWait(new Runnable() { public void run() {
             w.pack();
@@ -176,6 +199,7 @@
         }});
         wait(w, true, "Didn't catch Window.show() after dispose(), pack()");
         assertTrue("Window not showing", w.isShowing());
+        assertEquals("Should only be one adapter per window, but in this test there is another tracker",2, countWindowAdapters(w));
     }
     
     public void testDetectEmptyDialog() {
@@ -189,8 +213,39 @@
         }});
         wait(d, true, "Didn't catch empty dialog");
         assertTrue("Dialog not showing", d.isShowing());
+
+        assertEquals("Should only be one adapter per window, but in this test there is another tracker",2, countWindowAdapters(w));
+        assertEquals("Should only be one adapter per window, but in this test there is another tracker",2, countWindowAdapters(d));
     }
+    
+    
+    
+    
+    private int countWindowAdapters(Window win) {
+        try
+        {
+            Field $windowListener = Window.class.getDeclaredField("windowListener");
+            $windowListener.setAccessible(true);
+            WindowListener aem = (WindowListener) $windowListener.get(win);
+            WindowListener[] listeners = AWTEventMulticaster.getListeners(aem, WindowListener.class);
 
+            int count = 0;            
+            for (WindowListener wl : listeners)
+            {
+               if (wl instanceof WindowTracker.WindowWatcher) {
+                   count ++;
+               }
+            }
+            
+            return count;
+        }
+        catch (Throwable th) {
+            throw new RuntimeException(th);
+        }
+    }
+    
+    
+
     public static void main(String[] args) {
         RepeatHelper.runTests(args, WindowTrackerTest.class);
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2842
          http://abbot.svn.sourceforge.net/abbot/?rev=2842&view=rev
Author:   gdavison
Date:     2012-10-18 13:13:48 +0000 (Thu, 18 Oct 2012)
Log Message:
-----------
Integrated a patch suggested by Minato Hamano with respect to using the 
applet step in cases where the language wasn't English.

Modified Paths:
--------------
    abbot/trunk/projects/jdeveloper/Library/Library.jpr
    abbot/trunk/src/abbot/script/Appletviewer.java

Modified: abbot/trunk/projects/jdeveloper/Library/Library.jpr
===================================================================
--- abbot/trunk/projects/jdeveloper/Library/Library.jpr	2012-07-26 16:07:38 UTC (rev 2841)
+++ abbot/trunk/projects/jdeveloper/Library/Library.jpr	2012-10-18 13:13:48 UTC (rev 2842)
@@ -140,7 +140,7 @@
             <hash n="oracle.jdevimpl.runner.debug.DebugConfiguration">
                <value n="tracingExclude" v="sun;sunw"/>
             </hash>
-            <value n="targetURL"/>
+            <url n="targetURL" path="../../../src/abbot/editor/Costello.java"/>
          </hash>
       </hash>
    </hash>

Modified: abbot/trunk/src/abbot/script/Appletviewer.java
===================================================================
--- abbot/trunk/src/abbot/script/Appletviewer.java	2012-07-26 16:07:38 UTC (rev 2841)
+++ abbot/trunk/src/abbot/script/Appletviewer.java	2012-10-18 13:13:48 UTC (rev 2842)
@@ -59,7 +59,35 @@
     protected void quitApplet(final Frame frame) {
         // FIXME: this isn't locale-safe
         // Don't need to wait for idle
-        new ComponentTester().selectAWTMenuItem(frame, "Applet|Quit");
+       
+        // get menu strings from resource(localized by Sun)
+        String menuPath;
+        try {
+            ResourceBundle rb = ResourceBundle.getBundle("sun.applet.resources.MsgAppletViewer");
+            menuPath = rb.getString("appletviewer.menu.applet") + "|" +
+                    rb.getString("appletviewer.menuitem.quit");
+        }
+        catch (MissingResourceException mre) {
+            menuPath = "Applet|Quit";
+            Log.warn("Cannot access the sun applet resources, falling back to english version", mre);
+        }
+        
+        Log.debug("applet quit menu path is '" + menuPath + "'.");
+
+        // set UncaughtExceptionHandler.
+        Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+            @Override
+            public void uncaughtException(Thread t, Throwable e) {
+                if (e instanceof abbot.ExitException) {
+                    // without this, applet's main thread will report error.
+                }
+                else {
+                    Log.warn(e);
+                }
+            }
+        });
+        new ComponentTester().selectAWTMenuItem(frame, menuPath);
+       
     }
 
     private static Map patchAttributes(Map map) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2843
          http://abbot.svn.sourceforge.net/abbot/?rev=2843&view=rev
Author:   gdavison
Date:     2012-10-31 17:07:40 +0000 (Wed, 31 Oct 2012)
Log Message:
-----------

2012-10-31  Gerard Davison
        * Improved diagnostics on JTree selection failure
        * Add support for customer renderers and lazy population of JComboBox
        * Fixed possible EDT issues when working with action and input maps
        * Fixed null pointer in logging when trying to get hold of unparented component
        * Fixed EDT violation in ComponentTree

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/src/abbot/editor/ComponentTree.java
    abbot/trunk/src/abbot/editor/ScriptEditorFrame.java
    abbot/trunk/src/abbot/editor/recorder/JComboBoxRecorder.java
    abbot/trunk/src/abbot/editor/recorder/JComponentRecorder.java
    abbot/trunk/src/abbot/i18n/abbot.properties
    abbot/trunk/src/abbot/tester/JComboBoxTester.java
    abbot/trunk/src/abbot/tester/JComponentTester.java
    abbot/trunk/src/abbot/tester/JListTester.java
    abbot/trunk/src/abbot/tester/JTreeLocation.java
    abbot/trunk/src/abbot/tester/JTreeTester.java
    abbot/trunk/src/abbot/tester/Robot.java
    abbot/trunk/src/abbot/tester/WindowTracker.java
    abbot/trunk/test/abbot/editor/ComponentTreeTest.java
    abbot/trunk/test/abbot/tester/JComboBoxTesterTest.java
    abbot/trunk/test/abbot/tester/JTreeTesterTest.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-10-18 13:13:48 UTC (rev 2842)
+++ abbot/trunk/ChangeLog	2012-10-31 17:07:40 UTC (rev 2843)
@@ -1,3 +1,13 @@
+2012-10-31  Gerard Davison
+        * Improved diagnostics on JTree selection failure
+        * Add support for customer renderers and lazy population of JComboBox
+        * Fixed possible EDT issues when working with action and input maps
+        * Fixed null pointer in logging when trying to get hold of unparented component
+        * Fixed EDT violation in ComponentTree
+
+2012-10-18  Minato Mamano
+        * Resolve issue with Applet Viewer on non en machines.
+
 2012-06-21  Gerard Davison
         * Modify the toggleRow funcition in JTreeTester to temporaily up the number of clicks for a toggle to
           5 so that we don't acidently trigger a double click listener.

Modified: abbot/trunk/src/abbot/editor/ComponentTree.java
===================================================================
--- abbot/trunk/src/abbot/editor/ComponentTree.java	2012-10-18 13:13:48 UTC (rev 2842)
+++ abbot/trunk/src/abbot/editor/ComponentTree.java	2012-10-31 17:07:40 UTC (rev 2843)
@@ -1,18 +1,39 @@
 package abbot.editor;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-import javax.swing.tree.*;
+import abbot.finder.Hierarchy;
+
+import abbot.util.AWT;
+import abbot.util.WeakAWTEventListener;
+
+import java.awt.AWTEvent;
+import java.awt.Component;
+import java.awt.EventQueue;
+import java.awt.Rectangle;
+import java.awt.Window;
+import java.awt.event.AWTEventListener;
+import java.awt.event.ComponentEvent;
+import java.awt.event.ContainerEvent;
+import java.awt.event.WindowEvent;
+
 import java.net.URL;
 
-import abbot.finder.*;
-import abbot.util.*;
-
 import java.util.IdentityHashMap;
+import java.util.Iterator;
 import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.*;
 
+import javax.swing.CellRendererPane;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+import javax.swing.JLabel;
+import javax.swing.JTree;
+import javax.swing.event.TreeSelectionEvent;
+import javax.swing.tree.DefaultTreeCellRenderer;
+import javax.swing.tree.DefaultTreeModel;
+import javax.swing.tree.DefaultTreeSelectionModel;
+import javax.swing.tree.TreePath;
+
 /** Provides a Tree view into a given Hierarchy of components.  Refreshes its
     display based on changes to the default AWT hierarchy.
     The selection path is preserved to the extent possible across changes in
@@ -24,14 +45,16 @@
     private HierarchyMonitor monitor;
     private DefaultTreeModel model;
     private transient boolean ignoreSelectionChanges;
+
     /** Hash of class name to icon. */
     private ComponentTreeIcons icons = new ComponentTreeIcons();
 
     /** Supports optionally suppressing selection notifications while
         the hierarchy is reloading.
-    */ 
+     */
     private class SelectionModel extends DefaultTreeSelectionModel {
         private transient boolean settingSelection;
+
         protected void fireValueChanged(TreeSelectionEvent e) {
             if (settingSelection || ignoreSelectionChanges)
                 return;
@@ -41,37 +64,52 @@
 
     private class HierarchyMonitor implements AWTEventListener {
         public void eventDispatched(AWTEvent ev) {
-            switch(ev.getID()) {
+
+            Component compToReload = null;
+
+            switch (ev.getID()) {
             case WindowEvent.WINDOW_OPENED:
             case WindowEvent.WINDOW_CLOSED:
-            case ComponentEvent.COMPONENT_SHOWN: {
-                Component c = ((ComponentEvent)ev).getComponent();
-                if (hierarchy.contains(c)) {
-                    reload(hierarchy.getParent(c));
+            case ComponentEvent.COMPONENT_SHOWN:
+                {
+                    Component c = ((ComponentEvent)ev).getComponent();
+                    if (hierarchy.contains(c)) {
+                        compToReload = hierarchy.getParent(c);
+                    }
+                    break;
                 }
-                break;
-            }
             case ContainerEvent.COMPONENT_ADDED:
-            case ContainerEvent.COMPONENT_REMOVED: {
-                ContainerEvent e = (ContainerEvent)ev;
-                Component c = e.getComponent();
-                Window w = AWT.getWindow(c);
-                // CellRendererPanes send out these events in swarms,
-                // every time they repaint a cell, so ignore them
-                if (!(c instanceof CellRendererPane)
-                    && hierarchy.contains(c)
-                    && w != null && hierarchy.contains(w)) {
-                    // TODO: delay reload on tooltip hide to allow access to
-                    // the tooltip; otherwise the tooltip will go away and be
-                    // removed from the tree as soon as the cursor moves to
-                    // the tree to manipulate it.
-                    reload(c);
+            case ContainerEvent.COMPONENT_REMOVED:
+                {
+                    ContainerEvent e = (ContainerEvent)ev;
+                    Component c = e.getComponent();
+                    Window w = AWT.getWindow(c);
+                    // CellRendererPanes send out these events in swarms,
+                    // every time they repaint a cell, so ignore them
+                    if (!(c instanceof CellRendererPane) && hierarchy.contains(c) && w != null &&
+                        hierarchy.contains(w)) {
+                        // TODO: delay reload on tooltip hide to allow access to
+
+                        // the tooltip; otherwise the tooltip will go away and be
+                        // removed from the tree as soon as the cursor moves to
+                        // the tree to manipulate it.
+                        compToReload = c;
+                    }
+                    break;
                 }
-                break;
-            }
             default:
                 break;
             }
+
+            if (compToReload != null) {
+                toProcess.add(compToReload);
+                EventQueue.invokeLater(new Runnable() {
+                    @Override
+                    public void run() {
+                        reloadToProcess();
+                    }
+                });
+            }
         }
     }
 
@@ -87,27 +125,18 @@
                 setClosedIcon(new ImageIcon(url));
             }
         }
-        public Component getTreeCellRendererComponent(JTree tree,
-                                                      Object value,
-                                                      boolean sel,
-                                                      boolean exp,
-                                                      boolean leaf,
-                                                      int row,
-                                                      boolean focus) {
-            Component c =
-                super.getTreeCellRendererComponent(tree, value,
-                                                   sel, exp, leaf,
-                                                   row, focus);
+
+        public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean exp, boolean leaf,
+                                                      int row, boolean focus) {
+            Component c = super.getTreeCellRendererComponent(tree, value, sel, exp, leaf, row, focus);
             if (c instanceof JLabel) {
                 JLabel label = (JLabel)c;
                 Icon icon = null;
                 if (value == root) {
-                    URL url = getClass().
-                        getResource("icons/hierarchy-root.gif");
+                    URL url = getClass().getResource("icons/hierarchy-root.gif");
                     if (url != null)
                         icon = new ImageIcon(url);
-                }
-                else {
+                } else {
                     Component c1 = ((ComponentNode)value).getComponent();
                     if (c1 != null) {
                         icon = icons.getIcon(c1.getClass());
@@ -133,9 +162,8 @@
         root = (ComponentNode)model.getRoot();
 
         monitor = new HierarchyMonitor();
-        long mask = ContainerEvent.CONTAINER_EVENT_MASK
-            | ComponentEvent.COMPONENT_EVENT_MASK
-            | WindowEvent.WINDOW_EVENT_MASK;
+        long mask =
+            ContainerEvent.CONTAINER_EVENT_MASK | ComponentEvent.COMPONENT_EVENT_MASK | WindowEvent.WINDOW_EVENT_MASK;
         new WeakAWTEventListener(monitor, mask);
     }
 
@@ -156,7 +184,7 @@
 
     /** Returns the path to the given component.  If the component does not
      * exist in the current hierarchy, returns as much of its parent path as
-     * does exist.  
+     * does exist.
      */
     public TreePath getPath(Component comp) {
         return root.getPath(comp);
@@ -167,59 +195,71 @@
         reload(null);
     }
 
+    /**
+     * A list of components that are yet to be processed
+     */
+    private Queue<Component> toProcess = new LinkedBlockingQueue<Component>();
 
-   /**
-    * Using an identity hash map rather than a normal one to 
-    * prevent any equals methods being called.
-    */
-   private Map<Component, Component> currentlyProccessing = 
-           new IdentityHashMap<Component, Component>();
-   
-   
-   /** Reloads the hierarchy starting at the given component. */
-   public void reload(Component comp) {
-       
-       // Prevent possible stack overflows because of components being added
-       // as we walk the tree
-       if (currentlyProccessing.containsKey(comp)){
-           return;
-       }
-       else {
+    /** 
+     * Reloads the elements in the toProcess list
+     */
+    private void reloadToProcess() {
+        Component next;
+        
+        while ((next = toProcess.poll())!=null) {
+            reload(next);
+        }
+        
+    }
 
-           try {
-               
-               // Store this element in the set so that we don't get
-               // stuck in a look if getting child elements has side effects
-               currentlyProccessing.put(comp, comp);
-               
-               // Process nodes
-               
-               ComponentNode node = comp != null ? root.getNode(comp) : root;
-               TreePath path = getSelectionPath();
-               Component selected = path == null 
-                   ? null : ((ComponentNode)path.getLastPathComponent()).getComponent();
-               if (node == null)
-                   node = root;
 
-               // suppress selection change notifications until we're certain we
-               // can't restore the original selection.
-               ignoreSelectionChanges = true;
-               node.reload();
-               model.reload(node);
-               if (selected != null) {
-                   TreePath newPath = root.getPath(selected);
-                   // if the selection is exactly the same as it was before the
-                   // reload, suppress selection change notifications
-                   ignoreSelectionChanges = path.equals(newPath);
-                   setSelectionPath(newPath);
-               }
-               ignoreSelectionChanges = false;
+    /**
+     * Using an identity hash map rather than a normal one to
+     * prevent any equals methods being called.
+     */
+    private Map<Component, Component> currentlyProccessing = new IdentityHashMap<Component, Component>();
 
-           }
-           finally {
-               currentlyProccessing.remove(comp);
-           }
-       }
-   }
+    /** Reloads the hierarchy starting at the given component. */
+    public void reload(Component comp) {
 
+        // Prevent possible stack overflows because of components being added
+        // as we walk the tree
+        if (currentlyProccessing.containsKey(comp)) {
+            return;
+        } else {
+
+            try {
+
+                // Store this element in the set so that we don't get
+                // stuck in a look if getting child elements has side effects
+                currentlyProccessing.put(comp, comp);
+
+                // Process nodes
+
+                ComponentNode node = comp != null ? root.getNode(comp) : root;
+                TreePath path = getSelectionPath();
+                Component selected = path == null ? null : ((ComponentNode)path.getLastPathComponent()).getComponent();
+                if (node == null)
+                    node = root;
+
+                // suppress selection change notifications until we're certain we
+                // can't restore the original selection.
+                ignoreSelectionChanges = true;
+                node.reload();
+                model.reload(node);
+                if (selected != null) {
+                    TreePath newPath = root.getPath(selected);
+                    // if the selection is exactly the same as it was before the
+                    // reload, suppress selection change notifications
+                    ignoreSelectionChanges = path.equals(newPath);
+                    setSelectionPath(newPath);
+                }
+                ignoreSelectionChanges = false;
+
+            } finally {
+                currentlyProccessing.remove(comp);
+            }
+        }
+    }
+
 }

Modified: abbot/trunk/src/abbot/editor/ScriptEditorFrame.java
===================================================================
--- abbot/trunk/src/abbot/editor/ScriptEditorFrame.java	2012-10-18 13:13:48 UTC (rev 2842)
+++ abbot/trunk/src/abbot/editor/ScriptEditorFrame.java	2012-10-31 17:07:40 UTC (rev 2843)
@@ -12,13 +12,15 @@
 import abbot.editor.widgets.*;
 import abbot.i18n.Strings;
 
+import javax.swing.text.JTextComponent;
+
 /**
  * Provides the primary frame for the Costello script editor.  Maintains the
  * LAF used when first created, restoring it temporarily when displaying any
- * new components. 
+ * new components.
  *
  * FIXME needs major refactoring:
- * Export actions (via ActionMap) 
+ * Export actions (via ActionMap)
  * Use generic menu setup provided by a special array of actions
  *
  * @author Kyle Girard, twall
@@ -38,7 +40,7 @@
     // script split above, component browser below
     private JSplitPane              scriptBrowserSplit;
     private ScriptTable             scriptTable;
-    private JTextArea               statusBar;
+    private JTextComponent               statusBar;
     private JDialog                 statusWindow;
     private boolean                 statusShown;
     private JTextArea               statusText;
@@ -346,7 +348,7 @@
         JPanel wp = (JPanel)statusWindow.getContentPane();
         wp.add(new JScrollPane(statusText));
 
-        statusBar = new JTextArea(getString("Initializing"));
+        statusBar = new JTextField(getString("Initializing"));
         statusBar.setEditable(false);
         statusBar.setBackground(getContentPane().getBackground());
         statusBar.addMouseListener(new MouseAdapter() {

Modified: abbot/trunk/src/abbot/editor/recorder/JComboBoxRecorder.java
===================================================================
--- abbot/trunk/src/abbot/editor/recorder/JComboBoxRecorder.java	2012-10-18 13:13:48 UTC (rev 2842)
+++ abbot/trunk/src/abbot/editor/recorder/JComboBoxRecorder.java	2012-10-31 17:07:40 UTC (rev 2843)
@@ -21,7 +21,7 @@
 public class JComboBoxRecorder extends JComponentRecorder {
 
     private JComboBox combo = null;
-    private Component popupComponent = null;
+    private JComponent popupComponent = null;
     private int index = -1;
     private ActionListener listener = null;
 
@@ -110,8 +110,10 @@
         
         JComboBoxTester tester = (JComboBoxTester) ComponentTester.getTester(combo);
         
-        if (popupComponent == null && combo.isPopupVisible())
-            popupComponent = tester.findPopupComponent(combo);
+        if (popupComponent == null)// should be possible even if not visible && combo.isPopupVisible())
+        { 
+            popupComponent = tester.findPopupFromUI(combo);
+        }
 
         if (isFinished()) {
             combo.removeActionListener(listener);

Modified: abbot/trunk/src/abbot/editor/recorder/JComponentRecorder.java
===================================================================
--- abbot/trunk/src/abbot/editor/recorder/JComponentRecorder.java	2012-10-18 13:13:48 UTC (rev 2842)
+++ abbot/trunk/src/abbot/editor/recorder/JComponentRecorder.java	2012-10-31 17:07:40 UTC (rev 2843)
@@ -8,10 +8,14 @@
 import abbot.Log;
 import abbot.script.*;
 
+import abbot.tester.Robot;
+
+import java.util.concurrent.Callable;
+
 /**
  * Record basic semantic events you might find on an JComponent. <p>
- * 
- * Watches for events that trigger an action from the component's action map.  
+ *
+ * Watches for events that trigger an action from the component's action map.
  * As of 1.3.1, KEY_TYPED and KEY_RELEASED events can trigger an action.
  */
 public class JComponentRecorder extends ContainerRecorder {
@@ -47,12 +51,35 @@
     }
 
     protected javax.swing.Action getAction(KeyEvent ke) {
-        KeyStroke ks = KeyStroke.getKeyStrokeForEvent(ke);
         JComponent comp = (JComponent)ke.getComponent();
-        Object binding = comp.getInputMap().get(ks);
-        return binding != null ? comp.getActionMap().get(binding) : null;
+        Object binding = getBindingForKeyEvent(comp, ke);
+        return binding != null ? getActionForComponent(comp, binding) : null;
     }
 
+
+    private Object getBindingForKeyEvent(final JComponent comp, final KeyEvent ke) {
+        return Robot.callAndWait(comp, new Callable<Object>() {
+            @Override
+            public Object call() throws Exception {
+                KeyStroke ks = KeyStroke.getKeyStrokeForEvent(ke);
+                Object binding = comp.getInputMap().get(ks);
+                return binding;
+            }
+        });
+    }
+
+    /**
+     * Make sure this happeds o the event queue
+     */
+    private javax.swing.Action getActionForComponent(final JComponent comp, final Object binding) {
+        return Robot.callAndWait(comp, new Callable<javax.swing.Action>() {
+            @Override
+            public javax.swing.Action call() throws Exception {
+                return comp.getActionMap().get(binding);
+            }
+        });
+    }
+
     protected boolean isMappedEvent(KeyEvent ke) {
         return getAction(ke) != null;
     }
@@ -75,8 +102,8 @@
     protected boolean parseActionMapEvent(AWTEvent event) {
         if (target == null) {
             target = (JComponent)event.getSource();
-            KeyStroke ks = KeyStroke.getKeyStrokeForEvent((KeyEvent)event);
-            Object binding = target.getInputMap().get(ks);
+            
+            Object binding = getBindingForKeyEvent(target,(KeyEvent) event);
             Log.debug("Binding is " + binding + " ("
                       + binding.getClass() + ")");
             if (binding instanceof String) {
@@ -85,10 +112,10 @@
             else {
                 // 1.3 and prior sometimes used the actions themselves
                 // as the key
-                javax.swing.Action action = target.getActionMap().get(binding);
+                javax.swing.Action action = getActionForComponent(target,binding);
                 actionKey = (String)action.getValue(javax.swing.Action.NAME);
             }
-            Log.debug("Keystroke '" + ks + "' mapped to " + actionKey);
+            Log.debug("KeyEvent '" + event + "' mapped to " + actionKey);
         }
         // Make sure the entire KEY_PRESSED/KEY_TYPED/KEY_RELEASED
         // sequence is eaten

Modified: abbot/trunk/src/abbot/i18n/abbot.properties
===================================================================
--- abbot/trunk/src/abbot/i18n/abbot.properties	2012-10-18 13:13:48 UTC (rev 2842)
+++ abbot/trunk/src/abbot/i18n/abbot.properties	2012-10-31 17:07:40 UTC (rev 2843)
@@ -125,7 +125,8 @@
 tester.JTree.row_not_visible=Row {0} of the tree is not visible
 tester.JTree.row_not_found=Row {0} is not within the tree
 tester.JTree.path_not_visible=The tree path ''{0}'' is not visible
-tester.JTree.path_not_found=The tree path ''{0}'' was not found
+tester.JTree.path_not_found=The tree path ''{0}'' was not found in tree: \n\n ''{1}''
+tester.JTree.path_not_shown=The tree path ''{0}'' was not shown in tree: \n\n ''{1}''
 tester.JTree.point_not_found=The point {0} is not within the JTree
 tester.JTabbedPane.invalid_index=The index ({0}) is not valid
 tester.JTabbedPane.invalid_name=The tab name ({0}) was not found

Modified: abbot/trunk/src/abbot/tester/JComboBoxTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JComboBoxTester.java	2012-10-18 13:13:48 UTC (rev 2842)
+++ abbot/trunk/src/abbot/tester/JComboBoxTester.java	2012-10-31 17:07:40 UTC (rev 2843)
@@ -4,6 +4,9 @@
 import java.awt.Container;
 import java.util.ArrayList;
 
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+
 import javax.swing.*;
 
 import abbot.Log;
@@ -13,8 +16,16 @@
 import abbot.finder.*;
 import abbot.finder.matchers.*;
 
+import abbot.tester.Robot.ConditionEDTDecorator;
+
+import abbot.util.Condition;
+
 import java.util.concurrent.Callable;
 
+import javax.accessibility.AccessibleSelection;
+
+import javax.swing.plaf.ComboBoxUI;
+
 /**
  * JComboBoxTester for testing JComboBox instances.
  *
@@ -112,7 +123,28 @@
             throw new PopupNotFoundException(Strings.get("tester.JComboBox.popup_not_found"));
         return comp;
     }
+    
+    
+    /**
+     * @param sb The combo box we are testing
+     * @return The JList component used to display the combobox
+     */
+    public JComponent findPopupFromUI(JComboBox sb) {
+        
+        Accessible a =
+            sb.getUI().getAccessibleChild(sb, 0);
+        if (a != null &&
+            a instanceof javax.swing.plaf.basic.ComboPopup) {
 
+            // get the popup list
+            JList list = ((javax.swing.plaf.basic.ComboPopup)a).getList();
+            return list;
+        }
+        
+        
+        return (JList)findPopupComponent(sb);
+    }
+
    
     /** Find the correct popup component in the container */
     protected Component findPopupComponent(Container parent) {
@@ -127,15 +159,11 @@
 
     /** If the value looks meaningful, return it, otherwise return null. */
     public String getValueAsString(JComboBox combo,
-                                   Component popupComponent,
-                                   Object item, int index) {
-        String value = item.toString();
-        // If the value is the default Object.toString method (which
-        // returns <class>@<pointer value>), try to find something better.
-        if (value.startsWith(item.getClass().getName() + "@")) {
-            return getValueAsStringFromRenderer(combo, popupComponent, item, index);
-        }
-        return value;
+                                      JComponent popupComponent,
+                                      Object item, int index) {
+        Component c = combo.getRenderer().
+            getListCellRendererComponent((JList)popupComponent, item, index, true, true);
+        return convertRendererToString(c);
     }
     
     
@@ -145,45 +173,63 @@
     }
 
 
-    /** Convert the value to a string using a local render */
-    protected String getValueAsStringFromRenderer(JComboBox combo,
-                                                Component popupComponent,
-                                                Object item, int index) {
-        Component c = combo.getRenderer().
-            getListCellRendererComponent((JList)popupComponent, item, index, true, true);
-        if (c instanceof javax.swing.JLabel)
-            return ((javax.swing.JLabel)c).getText();
-        return null;
-    }
     
     
     
 
     public void actionSelectItem(Component comp, final String item) {
+        
         final JComboBox cb = (JComboBox)comp;
-        Object obj = cb.getSelectedItem();
-        if ((obj == null && item == null)
-            || (obj != null
-                && ExtendedComparator.stringsMatch(item, obj.toString())))
-            return;
+        final JComponent popup = findPopupFromUI(cb);
 
-        int matchedIndex = Robot.callAndWait(cb, new Callable<Integer>() {
+        // Get rid of any previous popup
+        invokeAndWait(comp, new Runnable() {
             @Override
-            public Integer call() {
-                for (int i=0;i < cb.getItemCount();i++) {
-                    Object obj = cb.getItemAt(i);
-                    Log.debug("Comparing against '" + obj + "'");
-                    if ((obj == null && item == null)
-                        || (obj != null
-                            && ExtendedComparator.stringsMatch(item, obj.toString()))){
-                        return i;
-                    }
-                }
+            public void run() {
+                cb.hidePopup();
+            }
+        });
+        
+        // Need to be done in one block otherwise the selection might changed
+        boolean alreadySelected = Robot.callAndWait(cb, new Callable<Boolean>() {
+            @Override
+            public Boolean call() throws Exception {
+                final Object obj = cb.getSelectedItem();
+                if ((obj == null && item == null)
+                    || (obj != null
+                        && ExtendedComparator.stringsMatch(item,getValueAsString(cb, popup, obj, cb.getSelectedIndex())
+                            )))
+                    return true;
                 
-                return -1;
+                return false;
             }
         });
+        if (alreadySelected) {
+            return;
+        }
         
+
+        final GetIndexForItem mo = new JComboBoxTester.GetIndexForItem(cb, popup, item);
+
+        // Wait for make sure that the combo is populated
+        wait(new ConditionEDTDecorator(cb, new Condition() {
+                public boolean test() {
+                    return mo.call() > -1;
+                }
+                
+                public String toString() {
+                    return Strings.get("tester.JComboBox.item_not_found",
+                                                    new Object[] {
+                                                        item,
+                                                        dumpList(cb)
+                                                    });
+                }
+            }), defaultDelay / 4); // Ramp up delay as still getting 
+        
+
+
+        int matchedIndex = Robot.callAndWait(cb, mo);
+        
         if (matchedIndex!=-1) {
             actionSelectIndex(comp, matchedIndex);
             return;
@@ -193,18 +239,62 @@
         // possible that the current environment does not match sufficiently,
         // so we need to throw an appropriate exception that can be used to
         // diagnose the problem.
+        String contents = dumpList(cb);
+        throw new ActionFailedException(Strings.get("tester.JComboBox.item_not_found",
+                                                    new Object[] {
+                                                        item,
+                                                        contents
+                                                    }));
+    }
+
+
+    protected String dumpList(final JComboBox cb) {
         String mid = "[";
         StringBuffer contents = new StringBuffer();
+        JComponent list = findPopupFromUI(cb);
+
         for (int i=0;i < cb.getItemCount();i++) {
+
             contents.append(mid);
-            contents.append(cb.getItemAt(i).toString());
+            contents.append(
+                getValueAsString(cb, list, cb.getItemAt(i), i));
             mid = ", ";
         }
         contents.append("]");
-        throw new ActionFailedException(Strings.get("tester.JComboBox.item_not_found",
-                                                    new Object[] {
-                                                        item,
-                                                        contents.toString()
-                                                    }));
+        return contents.toString();
     }
+
+    /**
+     * A method object to access the index for particular item, aid in polling
+     */
+    private  class GetIndexForItem implements Callable<Integer> {
+        private JComboBox _cb;
+        private JComponent _list;
+        private String _item;
+
+        GetIndexForItem(JComboBox cb, JComponent list, String item) {
+            this._cb = cb;
+            this._list = list;
+            this._item = item;
+        }
+
+        @Override
+        public Integer call() {
+
+            int found = -1;
+            for (int i = 0; i < this._cb.getItemCount(); i++) {
+                Object obj = this._cb.getItemAt(i);
+                String objString = getValueAsString(this._cb, this._list, obj, i);
+
+                Log.debug("Comparing against '" + objString + "'");
+                if ((obj == null && this._item == null) || (obj != null && ExtendedComparator.stringsMatch(this._item,
+                    objString))) {
+                    found = i;
+                    break;
+                }
+            }
+
+            return found;
+        }
+    }
 }

Modified: abbot/trunk/src/abbot/tester/JComponentTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JComponentTester.java	2012-10-18 13:13:48 UTC (rev 2842)
+++ abbot/trunk/src/abbot/tester/JComponentTester.java	2012-10-31 17:07:40 UTC (rev 2843)
@@ -18,6 +18,8 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import java.util.concurrent.Callable;
+
 /** Provides auto-scrolling prior to events for JComponent-derived classes. */
 // NOTE may eventually need to push ComponentLocation up to Robot, so that
 // only mousePress and actionDrop need to be overridden.  This would be mostly
@@ -212,62 +214,75 @@
     }
 
     /** Invoke an action from the component's action map. */
-    public void actionActionMap(Component comp, String name) {
+    public void actionActionMap(final Component comp, final String name) {
         focus(comp, true);
-        JComponent jc = (JComponent)comp;
 
-        ActionMap am = jc.getActionMap();
-        // On OSX/1.3.1, some action map keys are actions instead of strings.
-        // On XP/1.4.1, all action map keys are strings.
-        // If we can't look it up with the string key we saved, check all the
-        // actions for a corresponding name.
-        Object action = am.get(name);
-        Object key = name;
-        if (action == null) {
-            Object[] keys = am.allKeys();
-            for (int i=0;keys != null && i < keys.length;i++) {
-                Object value = am.get(keys[i]);
-                if ((value instanceof Action)) {
-                    if (name.equals(((Action)value).getValue(Action.NAME))) {
-                        action = value;
-                        key = keys[i];
-                        break;
+        List<KeyStroke> strokes = callAndWait(comp, new Callable<List<KeyStroke>>(){
+
+            @Override
+            public List call() throws Exception {
+                JComponent jc = (JComponent)comp;
+                
+                List<KeyStroke> strokes = new ArrayList<KeyStroke>();
+
+                ActionMap am = jc.getActionMap();
+                // On OSX/1.3.1, some action map keys are actions instead of strings.
+                // On XP/1.4.1, all action map keys are strings.
+                // If we can't look it up with the string key we saved, check all the
+                // actions for a corresponding name.
+                Object action = am.get(name);
+                Object key = name;
+                if (action == null) {
+                    Object[] keys = am.allKeys();
+                    for (int i=0;keys != null && i < keys.length;i++) {
+                        Object value = am.get(keys[i]);
+                        if ((value instanceof Action)) {
+                            if (name.equals(((Action)value).getValue(Action.NAME))) {
+                                action = value;
+                                key = keys[i];
+                                break;
+                            }
+                        }
                     }
                 }
-            }
-        }
-        if (action == null) {
-            String available = "Available actions are the following:";
-            Object[] names = am.allKeys();
-            if (names != null) {
-                Arrays.sort(names, new java.util.Comparator() {
-                    public int compare(Object o1, Object o2) {
-                        String n1 = o1.toString();
-                        String n2 = o2.toString();
-                        return n1.compareTo(n2);
+                if (action == null) {
+                    String available = "Available actions are the following:";
+                    Object[] names = am.allKeys();
+                    if (names != null) {
+                        Arrays.sort(names, new java.util.Comparator() {
+                            public int compare(Object o1, Object o2) {
+                                String n1 = o1.toString();
+                                String n2 = o2.toString();
+                                return n1.compareTo(n2);
+                            }
+                        });
+                        for (int i=0;i < names.length;i++) {
+                            available += "\n" + names[i];
+                            if (!(names[i] instanceof String))
+                                available += " (" + names[i].getClass() + ")";
+                        }
                     }
-                });
-                for (int i=0;i < names.length;i++) {
-                    available += "\n" + names[i];
-                    if (!(names[i] instanceof String))
-                        available += " (" + names[i].getClass() + ")";
+                    throw new AssertionFailedError("No such action '"
+                                                   + name + "'. " + available);
                 }
+                InputMap im = jc.getInputMap();
+                KeyStroke[] events = im.allKeys();
+                for (int i=0;events != null && i < events.length;i++) {
+                    KeyStroke ks = events[i];
+                    if (key.equals(im.get(ks))) {
+                        strokes.add(ks);
+                    }
+                }
+                
+                return strokes;
             }
-            throw new AssertionFailedError("No such action '"
-                                           + name + "'. " + available);
-        }
-        InputMap im = jc.getInputMap();
-        KeyStroke[] events = im.allKeys();
-        List strokes = new ArrayList();
-        for (int i=0;events != null && i < events.length;i++) {
-            KeyStroke ks = events[i];
-            if (key.equals(im.get(ks))) {
-                strokes.add(ks);
-            }
-        }
+        });
+
+
+        // If we have fouNd somethiNg use it
         if (strokes.size() > 0) {
-            for (Iterator i=strokes.iterator();i.hasNext();) {
-                KeyStroke ks = (KeyStroke)i.next();
+            for (Iterator<KeyStroke> i=strokes.iterator();i.hasNext();) {
+                KeyStroke ks = i.next();
                 Log.debug("Generating keystroke " + ks
                           + " for action " + name);
                 try {

Modified: abbot/trunk/src/abbot/tester/JListTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JListTester.java	2012-10-18 13:13:48 UTC (rev 2842)
+++ abbot/trunk/src/abbot/tester/JListTester.java	2012-10-31 17:07:40 UTC (rev 2843)
@@ -7,6 +7,9 @@
 import abbot.Log;
 import abbot.i18n.Strings;
 import abbot.script.ArgumentParser;
+
+import abbot.tester.Robot.ConditionEDTDecorator;
+
 import abbot.util.Condition;
 
 import java.util.concurrent.Callable;
@@ -148,7 +151,7 @@
         // Wait for the selected location to become avaliable
         //
 
-        wait(new Condition() {
+        wait(new ConditionEDTDecorator(c,new Condition() {
                     public boolean test() {
                         int index = location.getIndex(list);
                         return index >= 0 && index < list.getModel().getSize();
@@ -158,7 +161,7 @@
                         return Strings.get("tester.Component.show_wait",
                                            new Object[] { location.toString() });
                     }
-                }, delay);
+                }), delay);
 
         // Select the location
         // 

Modified: abbot/trunk/src/abbot/tester/JTreeLocation.java
===================================================================
--- abbot/trunk/src/abbot/tester/JTreeLocation.java	2012-10-18 13:13:48 UTC (rev 2842)
+++ abbot/trunk/src/abbot/tester/JTreeLocation.java	2012-10-31 17:07:40 UTC (rev 2843)
@@ -330,7 +330,7 @@
      * pattern may be a regular expression bounded by forward slashes.
      * @throws LocationUnavailableException if no matching path is found.
      */
-    public static TreePath findMatchingPath(JTree tree, TreePath path) {
+    public static TreePath findMatchingPath(final JTree tree, TreePath path) {
         Log.debug("Find path matching " + path);
         Object[] input = path.getPath();
         TreeModel model = tree.getModel();
@@ -348,11 +348,16 @@
             findMatchingPath(tree, new TreePath(root), input);
         if (realPath != null)
             return realPath;
+
         String msg = Strings.get("tester.JTree.path_not_found",
-                                 new Object[] { path });
+                                 new Object[] { path, JTreeTester.dumpTree(tree) });
+        
+        
         throw new LocationUnavailableException(msg);
     }
 
+
+
     /** Build up the given tree path with Objects from the TreeModel which
      * match the given array of Objects.
      */

Modified: abbot/trunk/src/abbot/tester/JTreeTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JTreeTester.java	2012-10-18 13:13:48 UTC (rev 2842)
+++ abbot/trunk/src/abbot/tester/JTreeTester.java	2012-10-31 17:07:40 UTC (rev 2843)
@@ -170,8 +170,43 @@
         return string;
     }
 
+    /**
+     * @param tree The tree to dump
+     * @return A textual representaiton of the current tree
+     */
+    public static String dumpTree(final JTree tree) {
+        String treeDump = Robot.callAndWait(tree, new Callable<String>()
+        {
+            @Override
+            public String call() throws Exception {
+                StringBuilder sb = new StringBuilder();
+                try {
+                    dumpTree(sb, tree, new TreePath(tree.getModel().getRoot()), "");
+                    return sb.toString();
+                }
+                catch (Exception ex) {
+                    return "Problem dumping tree,"+ ex.getMessage() + ", so far:\n " + sb.toString();
+                }
+            }
+        });
+        return treeDump;
+    }
+    
+    
+    private static void dumpTree(StringBuilder sb, JTree tree, TreePath path, String prefix) {
+        
+        String currentName = JTreeTester.valueToString(tree, path);
+        sb.append(prefix).append(currentName).append('\n');
+        Object parent = path.getLastPathComponent();
+        int count = tree.getModel().getChildCount(parent);
+        for (int i = 0; i < count; i++) {
+            dumpTree(sb, tree, new TreePath(path, tree.getModel().getChild(parent, i)) {}, prefix + "-");
+        }
 
+    }
 
+
+
     /** Return the {@link String} representation of the final component of the
      * given {@link TreePath}, or <code>null</code> if one can not be
      * obtained.  Assumes the path is visible.
@@ -263,7 +298,7 @@
             TreePath path = convertLocationSafelyToPath((JTree)c,jTreeLocation);
             if (path == null) {
                 String msg = Strings.get("tester.JTree.path_not_found",
-                                         new Object[] { loc });
+                                         new Object[] { loc, JTreeTester.dumpTree(tree) });
                 throw new LocationUnavailableException(msg);
             }
             makeVisible(c, path);
@@ -307,7 +342,7 @@
                 
                 public String toString() {
                     return Strings.get("tester.JTree.path_not_found",
-                                         new Object[] { loc });
+                                         new Object[] { loc, JTreeTester.dumpTree(tree) });
                 }
             }), defaultDelay / 4); // Ramp up delay as still getting 
                                                       // intermittent failures
@@ -429,8 +464,8 @@
                         return tree.getModel().getChildCount(o) != 0;
                     }
                     public String toString() {
-                        return Strings.get("tester.Component.show_wait",
-                                           new Object[] { path.toString() });
+                        return Strings.get("tester.JTree.path_not_shown",
+                                           new Object[] { path.toString(), dumpTree(tree) });
                     }
                 }), timeout);
                 changed = true;
@@ -469,8 +504,8 @@
                         }
                     }
                     public String toString() {
-                        return Strings.get("tester.Component.show_wait",
-                                           new Object[] { path.toString() });
+                        return Strings.get("tester.JTree.path_not_shown",
+                                           new Object[] { path.toString(), dumpTree(tree) });
                     }
                 }), timeout);
         } catch(WaitTimedOutError e) {

Modified: abbot/trunk/src/abbot/tester/Robot.java
===================================================================
--- abbot/trunk/src/abbot/tester/Robot.java	2012-10-18 13:13:48 UTC (rev 2842)
+++ abbot/trunk/src/abbot/tester/Robot.java	2012-10-31 17:07:40 UTC (rev 2843)
@@ -2480,7 +2480,7 @@
         }
         
         public String toString() {
-            return "EDT Decorator " + condition.toString();
+            return "EDT Decorator:\n " + condition.toString();
         }
     }
     

Modified: abbot/trunk/src/abbot/tester/WindowTracker.java
===================================================================
--- abbot/trunk/src/abbot/tester/WindowTracker.java	2012-10-18 13:13:48 UTC (rev 2842)
+++ abbot/trunk/src/abbot/tester/WindowTracker.java	2012-10-31 17:07:40 UTC (rev 2843)
@@ -119,6 +119,13 @@
         window peer is not guaranteed to be ready.
     */ 
     public boolean isWindowReady(Window w) {
+        
+        // If this window is null likely that it can't be found so for convienience
+        // return null
+        if (w==null) {
+            return false;
+        }
+        
         synchronized(openWindows) {
             if (openWindows.containsKey(w)
                 && !hiddenWindows.containsKey(w)) {

Modified: abbot/trunk/test/abbot/editor/ComponentTreeTest.java
===================================================================
--- abbot/trunk/test/abbot/editor/ComponentTreeTest.java	2012-10-18 13:13:48 UTC (rev 2842)
+++ abbot/trunk/test/abbot/editor/ComponentTreeTest.java	2012-10-31 17:07:40 UTC (rev 2843)
@@ -1,6 +1,10 @@
 package abbot.editor;
 
 import java.awt.*;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
 import javax.swing.*;
 import javax.swing.tree.*;
 
@@ -23,18 +27,41 @@
         System.gc();
     }
 
-    private void assertPath(Object[] expected, Object[] path) {
-        for (int i=0;i < expected.length && i < path.length;i++) {
-            assertEquals("Wrong path component " + i,
-                         expected[i], ((ComponentNode)path[i]).getComponent());
-        }
-        assertEquals("Wrong path length", expected.length, path.length);
+    private void assertPath(final Object[] expected, final Callable<Object[]> pathToBe) {
+        
+        assertTrueEventually("Incompatible paths",
+                             new Callable<Boolean>() {
+                    
+                                @Override
+                                public Boolean call() throws Exception {
+                                    
+                                    Object[] path = pathToBe.call();
+                                    
+                                    //
+                                    
+                                    for (int i=0;i < expected.length && i < path.length;i++) {
+                                        assertEquals("Wrong path component " + i,
+                                                     expected[i], ((ComponentNode)path[i]).getComponent());
+                                    }
+                                    assertEquals("Wrong path length", expected.length, path.length);
+                                    
+                                    return true;
+                                }
+                             });
+
     }
 
     public void testDisplayNewFrames() {
         Frame f = showFrame(new JLabel(getName()));
-        TreePath path = tree.getPath(f);
-        assertPath(new Object[] { null, f }, path.getPath());
+        final TreePath path = tree.getPath(f);
+        assertPath(new Object[] { null, f }, 
+                   new Callable<Object[]>() {
+
+                        @Override
+                        public Object[] call() throws Exception {
+                            return path.getPath();
+                        }
+                    });
     }
 
     public void testRefreshOnPopup() {
@@ -58,19 +85,40 @@
         TreePath path = root.getPath(label);
         tree.setSelectionPath(path);
         tree.reload();
-        TreePath newPath = tree.getSelectionPath();
+        final TreePath newPath = tree.getSelectionPath();
         assertTrue("Tree should still have a selection", newPath != null);
         assertTrue("path should be visible", tree.isVisible(newPath));
         assertPath(new Object[] { null, f, f.getContentPane(), label },
-                   newPath.getPath());
+                           new Callable<Object[]>() {
+
+                                @Override
+                                public Object[] call() throws Exception {
+                                    return newPath.getPath();
+                                }
+                            });
     }
 
-    public void testRefreshOnWindowEvents() {
-        Frame f = showFrame(new JLabel(getName()));
-        assertPath(new Object[] { null, f }, tree.getPath(f).getPath());
-        Frame f2 = new JFrame(getName() + "2");
+    public void testRefreshOnWindowEvents() throws InterruptedException {
+        final Frame f = showFrame(new JLabel(getName()));
+        assertPath(new Object[] { null, f }, 
+                   new Callable<Object[]>() {
+
+                        @Override
+                        public Object[] call() throws Exception {
+                            return tree.getPath(f).getPath();
+                        }
+                    });
+        final Frame f2 = new JFrame(getName() + "2");
         showWindow(f);
-        assertPath(new Object[] { null, f2 }, tree.getPath(f2).getPath());
+        
+        assertPath(new Object[] { null, f2 }, 
+                   new Callable<Object[]>() {
+
+                        @Override
+                        public Object[] call() throws Exception {
+                            return  tree.getPath(f2).getPath();
+                        }
+                    });
     }
 
     public ComponentTreeTest(String name) { super(name); }

Modified: abbot/trunk/test/abbot/tester/JComboBoxTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JComboBoxTesterTest.java	2012-10-18 13:13:48 UTC (rev 2842)
+++ abbot/trunk/test/abbot/tester/JComboBoxTesterTest.java	2012-10-31 17:07:40 UTC (rev 2843)
@@ -1,10 +1,28 @@
 package abbot.tester;
 
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.EventQueue;
 import java.awt.event.*;
+
+import java.lang.reflect.InvocationTargetException;
+
 import java.util.Vector;
 
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
+import java.util.concurrent.locks.Lock;
+
+import java.util.concurrent.locks.ReentrantLock;
+
+import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;
 
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.ListCellRenderer;
+
 import junit.extensions.abbot.*;
 
 /** Unit test to verify supported JComboBox operations.<p> */
@@ -61,6 +79,95 @@
         }
     }
 
+    public void testSelectItemLazy() throws InterruptedException {
+        final DefaultComboBoxModel boxModel = new DefaultComboBoxModel();
+        // Add the first item as it doesn't result in a selection change
+        boxModel.addElement("Empty");
+        box.setModel(boxModel);
+        box.setSelectedItem("Empty");
+        
+        Thread t = new Thread(new Runnable() {
+            @Override
+            public void run() {
+                
+                for (int i = 0; i < list.size(); i++) {
+                    
+                    final Object next = list.get(i);
+                    
+                    try {
+                        TimeUnit.MILLISECONDS.sleep(50);
+                        
+            
+                        while (Robot.callAndWait(box, new Callable<Boolean>() {
+
+                            public Boolean call() {
+                                
+                                if (box.isPopupVisible()) {
+                                    return true;
+                                }
+                                else {
+                                    boxModel.addElement(next);
+                                    return false;
+                                }
+                            }
+                        })) {
+                            TimeUnit.MILLISECONDS.sleep(20);
+                        }
+                    } catch (InterruptedException e) {
+                    } 
+                }
+                
+            }
+        });
+     t.start();
+        
+        
+        showFrame(box);
+        for (int i=0;i < MAX_ENTRIES;i += MAX_ENTRIES / 10) {
+            selectedItem = null;
+            String item = "item " + i;
+            tester.actionSelectItem(box, item);
+            assertEquals("Wrong item selected", item, selectedItem);
+        }
+        
+        
+        // Make sure we wait until the thread has finished
+        t.join();
+    }
+
+
+    /**
+     * Check we can still find the items if there is a custom cell renderer
+     */
+    public void testSelectItemCustomRenderer() {
+        
+        box.setRenderer(new ListCellRenderer() {
+
+            @Override
+            public Component getListCellRendererComponent(JList list, final Object value, int index, boolean isSelected,
+                                                          boolean cellHasFocus) {
+                
+                JPanel p = new JPanel()
+                    {
+                        public String getText() {
+                            return value!=null ? value.toString() : "[Null]";
+                        }
+                    };
+                p.setBackground(index % 2 == 0 ? Color.RED : Color.BLUE);
+                return p;
+            }
+        });
+        
+        showFrame(box);
+        for (int i=0;i < MAX_ENTRIES;i += MAX_ENTRIES / 10) {
+            selectedItem = null;
+            String item = "item " + i;
+            tester.actionSelectItem(box, item);
+            assertEquals("Wrong item selected", item, selectedItem);
+        }
+    }
+
+
     public void testSelectIndexEditable() {
         box.setEditable(true);
         showFrame(box);
@@ -82,6 +189,17 @@
         }
     }
 
+    /**
+     * Check we get something sensible out
+     */
+    public void testDumpList() {
+        
+        String result = tester.dumpList(box); 
+        
+        assertTrue("Wrong start", result.startsWith("[item 0, item 1, item 2, item 3, item 4, item 5, "));
+        assertTrue("Wrong end", result.endsWith(", item 96, item 97, item 98, item 99]"));
+    }
+
     public static void main(String[] args) {
         RepeatHelper.runTests(args, JComboBoxTesterTest.class);
     }

Modified: abbot/trunk/test/abbot/tester/JTreeTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JTreeTesterTest.java	2012-10-18 13:13:48 UTC (rev 2842)
+++ abbot/trunk/test/abbot/tester/JTreeTesterTest.java	2012-10-31 17:07:40 UTC (rev 2843)
@@ -14,6 +14,10 @@
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import java.util.regex.Matcher;
+
+import java.util.regex.Pattern;
+
 import javax.swing.*;
 import javax.swing.tree.*;
 
@@ -539,7 +543,23 @@
             "child 2");
     }
     
+    
+    
+    public void testDumpTree() {
+        
+        String tree = JTreeTester.dumpTree(this.tree);
+        System.out.println(tree);
 
+        String[] split = tree.split("\n");
+        int count = split.length;
+        
+        assertEquals("Should contain a  lot of lines", 156, count);
+        assertEquals("First line should be root", "root", split[0]);
+        
+        assertTrue("Should contain nested lines", tree.contains("--child 4"));
+    }
+    
+
     /** Create a new test case with the given name. */
     public JTreeTesterTest(String name) {
         super(name);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2844
          http://abbot.svn.sourceforge.net/abbot/?rev=2844&view=rev
Author:   gdavison
Date:     2012-11-05 11:50:17 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
2012-11-05  Gerard Davison
        * Renamed WaitTimedOutError -> WaitTimedOutException and made extend FailedException for better
          diagnostics
        * assert calls are now performed on the EDT thread if they are to a method of a Component subclass

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/src/abbot/script/ArgumentParser.java
    abbot/trunk/src/abbot/script/Assert.java
    abbot/trunk/src/abbot/script/Call.java
    abbot/trunk/src/abbot/tester/ComponentTester.java
    abbot/trunk/src/abbot/tester/JComboBoxTester.java
    abbot/trunk/src/abbot/tester/JTableTester.java
    abbot/trunk/src/abbot/tester/JTreeTester.java
    abbot/trunk/src/abbot/tester/Robot.java
    abbot/trunk/src/junit/extensions/abbot/ComponentTestFixture.java
    abbot/trunk/test/abbot/editor/recorder/AbstractSemanticRecorderFixture.java
    abbot/trunk/test/abbot/script/AppClassLoaderTest.java
    abbot/trunk/test/abbot/tester/JComboBoxTesterTest.java
    abbot/trunk/test/abbot/tester/JListTesterTest.java
    abbot/trunk/test/abbot/tester/JTreeTesterTest.java

Added Paths:
-----------
    abbot/trunk/src/abbot/WaitTimedOutException.java

Removed Paths:
-------------
    abbot/trunk/src/abbot/WaitTimedOutError.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-10-31 17:07:40 UTC (rev 2843)
+++ abbot/trunk/ChangeLog	2012-11-05 11:50:17 UTC (rev 2844)
@@ -1,3 +1,8 @@
+2012-11-05  Gerard Davison
+        * Renamed WaitTimedOutError -> WaitTimedOutException and made extend FailedException for better
+          diagnostics
+        * assert calls are now performed on the EDT thread if they are to a method of a Component subclass
+
 2012-10-31  Gerard Davison
         * Improved diagnostics on JTree selection failure
         * Add support for customer renderers and lazy population of JComboBox

Deleted: abbot/trunk/src/abbot/WaitTimedOutError.java
===================================================================
--- abbot/trunk/src/abbot/WaitTimedOutError.java	2012-10-31 17:07:40 UTC (rev 2843)
+++ abbot/trunk/src/abbot/WaitTimedOutError.java	2012-11-05 11:50:17 UTC (rev 2844)
@@ -1,7 +0,0 @@
-package abbot;
-
-
-public class WaitTimedOutError extends AssertionFailedError {
-    public WaitTimedOutError() { }
-    public WaitTimedOutError(String msg) { super(msg); }
-}

Added: abbot/trunk/src/abbot/WaitTimedOutException.java
===================================================================
--- abbot/trunk/src/abbot/WaitTimedOutException.java	                        (rev 0)
+++ abbot/trunk/src/abbot/WaitTimedOutException.java	2012-11-05 11:50:17 UTC (rev 2844)
@@ -0,0 +1,13 @@
+package abbot;
+
+import abbot.tester.FailedException;
+
+/**
+ * Record the case where are have failed to wait for something, used to
+ * extend an AssertionError; but now extends FailException so we get the
+ * extra diagnostics.
+ */
+public class WaitTimedOutException extends FailedException {
+//    public WaitTimedOutError() {  }
+    public WaitTimedOutException(String msg) { super(msg); }
+}

Modified: abbot/trunk/src/abbot/script/ArgumentParser.java
===================================================================
--- abbot/trunk/src/abbot/script/ArgumentParser.java	2012-10-31 17:07:40 UTC (rev 2843)
+++ abbot/trunk/src/abbot/script/ArgumentParser.java	2012-11-05 11:50:17 UTC (rev 2844)
@@ -394,7 +394,7 @@
                 }
             }, ComponentTester.componentDelay);
         }
-        catch(WaitTimedOutError wto) {
+        catch(WaitTimedOutException wto) {
             String msg = "Could not find " + ref + ": "
                 + Step.toXMLString(ref);
             throw new ComponentNotFoundException(msg);

Modified: abbot/trunk/src/abbot/script/Assert.java
===================================================================
--- abbot/trunk/src/abbot/script/Assert.java	2012-10-31 17:07:40 UTC (rev 2843)
+++ abbot/trunk/src/abbot/script/Assert.java	2012-11-05 11:50:17 UTC (rev 2844)
@@ -236,10 +236,8 @@
         boolean compareStrings = false;
 
         try {
-            expected =
-                ArgumentParser.eval(getResolver(), expectedResult, type);
-        }
-        catch(IllegalArgumentException iae) {
+            expected = ArgumentParser.eval(getResolver(), expectedResult, type);
+        } catch (IllegalArgumentException iae) {
             // If we can't convert the string to the expected type,
             // match the string against the result's toString method instead
             expected = expectedResult;
@@ -262,12 +260,11 @@
 
         if (invert) {
             assertNotEquals(toString(), expected, actual);
-        }
-        else {
+        } else {
             assertEquals(toString(), expected, actual);
         }
     }
-
+    
     /** Use our own comparison, to get the extended array comparisons. */
     private void assertEquals(String message, Object expected, 
                               Object actual) {
@@ -315,7 +312,7 @@
                 now = System.currentTimeMillis();
                 remaining -= now - start;
             }
-            throw new WaitTimedOutError(Strings.get("wait.timed_out",
+            throw new WaitTimedOutException(Strings.get("wait.timed_out",
                                                     new Object[] {
                 String.valueOf(timeout), toString() }));
         }

Modified: abbot/trunk/src/abbot/script/Call.java
===================================================================
--- abbot/trunk/src/abbot/script/Call.java	2012-10-31 17:07:40 UTC (rev 2843)
+++ abbot/trunk/src/abbot/script/Call.java	2012-11-05 11:50:17 UTC (rev 2844)
@@ -6,6 +6,14 @@
 import abbot.Log;
 import abbot.i18n.Strings;
 
+import abbot.tester.FailedException;
+import abbot.tester.Robot;
+
+import java.awt.Component;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+
 /** Class for script steps that want to invoke a method on a class.
  * Subclasses may override getMethod and getTarget to customize behavior.
  * <blockquote><code>
@@ -162,7 +170,7 @@
         Method[] m = getMethods();
         for (int i=0;i < m.length;i++) {
             try {
-                Object[] params = evaluateParameters(m[i], args);
+                final Object[] params = evaluateParameters(m[i], args);
                 try {
                     Object target = getTarget(m[i]);
                     Log.debug("Invoking " + m[i] + " on " + target
@@ -191,7 +199,29 @@
                                   + "method " + m[i]);
                         m[i].setAccessible(true);
                     }
-                    return m[i].invoke(getTarget(m[i]), params);
+                    
+                    
+                    final Object targetObject = getTarget(m[i]);
+                    final Method method = m[i];
+
+                    if (Component.class.isAssignableFrom(m[i].getDeclaringClass())) {
+                        try {
+                            return Robot.callAndWait(
+                                targetObject instanceof Component ? (Component)targetObject:null,
+                                new Callable<Object>() {
+                                    public Object call() throws Exception {
+                                        return method.invoke(targetObject, params);
+                                    }
+                                });
+                        }
+                        catch (FailedException ee) {
+                           // Catch the failed exception and un-wrap if required
+                           throw ee.getCause();
+                        }
+                    }
+                    else {
+                        return method.invoke(targetObject, params);
+                    }
                 }
                 catch(java.lang.reflect.InvocationTargetException ite) {
                     throw ite.getTargetException();

Modified: abbot/trunk/src/abbot/tester/ComponentTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/ComponentTester.java	2012-10-31 17:07:40 UTC (rev 2843)
+++ abbot/trunk/src/abbot/tester/ComponentTester.java	2012-11-05 11:50:17 UTC (rev 2844)
@@ -17,7 +17,7 @@
 
 import abbot.BugReport;
 import abbot.Log;
-import abbot.WaitTimedOutError;
+import abbot.WaitTimedOutException;
 import abbot.finder.AWTHierarchy;
 import abbot.finder.BasicFinder;
 import abbot.finder.ComponentFinder;
@@ -1118,7 +1118,7 @@
     protected void waitAction(String desc, Condition cond)
         throws ActionFailedException {
         try { Robot.wait(cond); }
-        catch(WaitTimedOutError wto) {
+        catch(WaitTimedOutException wto) {
             throw new ActionFailedException(desc);
         }
     }

Modified: abbot/trunk/src/abbot/tester/JComboBoxTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JComboBoxTester.java	2012-10-31 17:07:40 UTC (rev 2843)
+++ abbot/trunk/src/abbot/tester/JComboBoxTester.java	2012-11-05 11:50:17 UTC (rev 2844)
@@ -265,6 +265,13 @@
     }
 
     /**
+     * Temporary helper interface
+     */
+    private interface RenderToString {
+        public String render(Object obj, int index);
+    }
+
+    /**
      * A method object to access the index for particular item, aid in polling
      */
     private  class GetIndexForItem implements Callable<Integer> {
@@ -281,10 +288,42 @@
         @Override
         public Integer call() {
 
+            int found = find(new RenderToString() {
+                @Override
+                public String render(Object obj, int index) {
+                    return getValueAsString(_cb, _list, obj, index);
+                }
+            });
+            
+            // Previously JComboBoxTester use to default to using toString
+            // so we are going to fall back where to using this so that
+            // the test is some-what backwards'ly compatible
+            if (found == -1) {
+                found = find(new RenderToString() {
+
+                    @Override
+                    public String render(Object item, int index) {
+                        String value = item.toString();
+                        return value;
+                    }
+                });
+                
+                if (found!=-1) {
+                    Log.warn("JComboBoxTester falling back to legacy toString code for item matching", new Error());
+                }
+            }
+
+            return found;
+        }
+        
+
+        private int find(RenderToString render) {
+            
             int found = -1;
+            
             for (int i = 0; i < this._cb.getItemCount(); i++) {
                 Object obj = this._cb.getItemAt(i);
-                String objString = getValueAsString(this._cb, this._list, obj, i);
+                String objString = render.render(obj,i);
 
                 Log.debug("Comparing against '" + objString + "'");
                 if ((obj == null && this._item == null) || (obj != null && ExtendedComparator.stringsMatch(this._item,
@@ -293,7 +332,6 @@
                     break;
                 }
             }
-
             return found;
         }
     }

Modified: abbot/trunk/src/abbot/tester/JTableTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JTableTester.java	2012-10-31 17:07:40 UTC (rev 2843)
+++ abbot/trunk/src/abbot/tester/JTableTester.java	2012-11-05 11:50:17 UTC (rev 2844)
@@ -1,6 +1,6 @@
 package abbot.tester;
 
-import abbot.WaitTimedOutError;
+import abbot.WaitTimedOutException;
 
 import abbot.i18n.Strings;
 
@@ -77,7 +77,7 @@
                                            new Object[] { loc.toString() });
                     }
                 }), timeout);
-        } catch(WaitTimedOutError e) {
+        } catch(WaitTimedOutException e) {
             throw new LocationUnavailableException(e.getMessage());
         }
               
@@ -128,7 +128,7 @@
                    }
                }), timeout);
            return true;
-       } catch(WaitTimedOutError e) {
+       } catch(WaitTimedOutException e) {
            return false;
        }
     }

Modified: abbot/trunk/src/abbot/tester/JTreeTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JTreeTester.java	2012-10-31 17:07:40 UTC (rev 2843)
+++ abbot/trunk/src/abbot/tester/JTreeTester.java	2012-11-05 11:50:17 UTC (rev 2844)
@@ -14,7 +14,7 @@
 import javax.swing.tree.*;
 import javax.swing.plaf.basic.BasicTreeUI;
 
-import abbot.WaitTimedOutError;
+import abbot.WaitTimedOutException;
 import abbot.script.ArgumentParser;
 import abbot.util.AWT;
 import abbot.util.Condition;
@@ -470,7 +470,7 @@
                 }), timeout);
                 changed = true;
             }
-            catch(WaitTimedOutError e) {
+            catch(WaitTimedOutException e) {
                 throw new LocationUnavailableException(e.getMessage());
             }
         }
@@ -508,7 +508,7 @@
                                            new Object[] { path.toString(), dumpTree(tree) });
                     }
                 }), timeout);
-        } catch(WaitTimedOutError e) {
+        } catch(WaitTimedOutException e) {
             throw new LocationUnavailableException(e.getMessage());
         }
         

Modified: abbot/trunk/src/abbot/tester/Robot.java
===================================================================
--- abbot/trunk/src/abbot/tester/Robot.java	2012-10-31 17:07:40 UTC (rev 2843)
+++ abbot/trunk/src/abbot/tester/Robot.java	2012-11-05 11:50:17 UTC (rev 2844)
@@ -62,7 +62,7 @@
 
 import abbot.Log;
 import abbot.Platform;
-import abbot.WaitTimedOutError;
+import abbot.WaitTimedOutException;
 import abbot.finder.BasicFinder;
 import abbot.finder.ComponentNotFoundException;
 import abbot.finder.Matcher;
@@ -77,6 +77,7 @@
 import abbot.util.Reflector;
 
 import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -1499,7 +1500,7 @@
                             }
                         }
                     });  
-                } catch (WaitTimedOutError wtoe) {
+                } catch (WaitTimedOutException wtoe) {
                     // Rethrow any exceptions
                     
                     if (mcfHolder.value!=null) {
@@ -1708,7 +1709,7 @@
                     
                 }, popupDelay);
         }
-        catch (WaitTimedOutError wtoe) {
+        catch (WaitTimedOutException wtoe) {
             String msg = "No popup responded to "
                 + AWTConstants.POPUP_MODIFIER 
                 + where + " on " 
@@ -2294,24 +2295,24 @@
         }
     }
 
-    /** Wait for the given Condition to return true.  The default timeout may
+    /**Wait for the given Condition to return true.  The default timeout may
      * be changed by setting abbot.robot.default_delay.
-     * @throws WaitTimedOutError if the default timeout (30s) is exceeded. 
-     * @see Robot#wait(Condition, long, int) Robot.wait For a description of the use of this function to support lazy loading in class files
+     * @throws WaitTimedOutException if the default timeout (30s) is exceeded.
+     * @see Robot#wait(Condition,long,int) Robot.wait For a description of the use of this function to support lazy loading in class files
      */
     public static void wait(Condition condition) {
         wait(condition, defaultDelay);
     }
 
-    /** Wait for the given Condition to return true, waiting for timeout ms.
-     * @throws WaitTimedOutError if the timeout is exceeded. 
-     * @see Robot#wait(Condition, long, int) Robot.wait For a description of the use of this function to support lazy loading in class files
+    /**Wait for the given Condition to return true, waiting for timeout ms.
+     * @throws WaitTimedOutException if the timeout is exceeded.
+     * @see Robot#wait(Condition,long,int) Robot.wait For a description of the use of this function to support lazy loading in class files
      */
     public static void wait(Condition condition, long timeout) {
         wait(condition, timeout, SLEEP_INTERVAL);
     }
 
-    /** 
+    /**
      * Wait for the given Condition to return true, waiting for timeout ms,
      * polling at the given interval. This method can be used generically to
      * support components that are lazily loaded in the context of writing
@@ -2324,21 +2325,21 @@
      * <p>
      * A general solution to the problem can be seen in this pseudo code:
      * <pre>
-     *   wait(new Condition()
-     *        {
-     *           public boolean test()
-     *           {
-     *             return whether the ui element is avaliable
-     *           }
-     *        });
-     *   performAction(ui element);
+     * wait(new Condition()
+     * {
+     * public boolean test()
+     * {
+     * return whether the ui element is avaliable
+     * }
+     * });
+     * performAction(ui element);
      * </pre>
      * <p>
      * If you are writing a tester method then it is a good idea to use a standard
-     * timeout such as {@link Robot#componentDelay} to ensure they are consistently
-     * handled accross different testers. 
-     * 
-     * @throws WaitTimedOutError if the timeout is exceeded. 
+     * timeout such as {@link Robot#componentDelay}to ensure they are consistently
+     * handled accross different testers.
+     *
+     * @throws WaitTimedOutException if the timeout is exceeded.
      */
     public static void wait(Condition condition, long timeout, int interval) {
         // Make sure the robot is running
@@ -2348,7 +2349,7 @@
         while (!condition.test()) {
             if (System.currentTimeMillis() - start > timeout) {
                 String msg = "Timed out waiting for " + condition;
-                throw new WaitTimedOutError(msg);
+                throw new WaitTimedOutException(msg);
             }
             delay(interval);
         }
@@ -2449,6 +2450,8 @@
             }
         } catch (CallTimoutFailedException e) {
             throw e;
+        } catch (ExecutionException e) {
+            throw new FailedException("Failure to run process on event queue", e.getCause());
         } catch (Exception e) {
             throw new FailedException("Failure to run process on event queue", e);
         }

Modified: abbot/trunk/src/junit/extensions/abbot/ComponentTestFixture.java
===================================================================
--- abbot/trunk/src/junit/extensions/abbot/ComponentTestFixture.java	2012-10-31 17:07:40 UTC (rev 2843)
+++ abbot/trunk/src/junit/extensions/abbot/ComponentTestFixture.java	2012-11-05 11:50:17 UTC (rev 2844)
@@ -131,7 +131,7 @@
                 });
                 
         } 
-        catch (WaitTimedOutError wtoe) {
+        catch (WaitTimedOutException wtoe) {
             try {
                 Assert.assertEquals(
                     message,

Modified: abbot/trunk/test/abbot/editor/recorder/AbstractSemanticRecorderFixture.java
===================================================================
--- abbot/trunk/test/abbot/editor/recorder/AbstractSemanticRecorderFixture.java	2012-10-31 17:07:40 UTC (rev 2843)
+++ abbot/trunk/test/abbot/editor/recorder/AbstractSemanticRecorderFixture.java	2012-11-05 11:50:17 UTC (rev 2844)
@@ -4,7 +4,7 @@
 import java.util.*;
 
 import abbot.Log;
-import abbot.WaitTimedOutError;
+import abbot.WaitTimedOutException;
 
 import abbot.script.*;
 import abbot.tester.Robot;
@@ -259,7 +259,7 @@
                     }
                 }, TimeUnit.SECONDS.toMillis(10), 1000);
         }
-        catch (WaitTimedOutError wte) {
+        catch (WaitTimedOutException wte) {
             // Just ignore
         }
         

Modified: abbot/trunk/test/abbot/script/AppClassLoaderTest.java
===================================================================
--- abbot/trunk/test/abbot/script/AppClassLoaderTest.java	2012-10-31 17:07:40 UTC (rev 2843)
+++ abbot/trunk/test/abbot/script/AppClassLoaderTest.java	2012-11-05 11:50:17 UTC (rev 2844)
@@ -1,6 +1,6 @@
 package abbot.script;
 
-import abbot.WaitTimedOutError;
+import abbot.WaitTimedOutException;
 
 import abbot.tester.Robot;
 
@@ -66,7 +66,7 @@
                 }
             }, 10000, 200);
         }
-        catch (WaitTimedOutError wteo) {
+        catch (WaitTimedOutException wteo) {
             
         }
         

Modified: abbot/trunk/test/abbot/tester/JComboBoxTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JComboBoxTesterTest.java	2012-10-31 17:07:40 UTC (rev 2843)
+++ abbot/trunk/test/abbot/tester/JComboBoxTesterTest.java	2012-11-05 11:50:17 UTC (rev 2844)
@@ -100,8 +100,11 @@
             
                         while (Robot.callAndWait(box, new Callable<Boolean>() {
 
-                            public Boolean call() {
-                                
+                            public Boolean call() throws InterruptedException {
+                                if (box==null) {
+                                    // Test is probably finished
+                                    return true;
+                                }
                                 if (box.isPopupVisible()) {
                                     return true;
                                 }
@@ -119,20 +122,29 @@
                 
             }
         });
-     t.start();
         
-        
-        showFrame(box);
-        for (int i=0;i < MAX_ENTRIES;i += MAX_ENTRIES / 10) {
-            selectedItem = null;
-            String item = "item " + i;
-            tester.actionSelectItem(box, item);
-            assertEquals("Wrong item selected", item, selectedItem);
+        try
+        {
+            t.start();
+            
+            
+            showFrame(box);
+            
+            // I couldn't get this to work reliably with multiple updates,
+            // so until then we will just test with one 
+            for (int i=0;i < MAX_ENTRIES;i += MAX_ENTRIES / 10) {
+                selectedItem = null;
+                String item = "item " + i;
+                tester.actionSelectItem(box, item);
+                assertEquals("Wrong item selected", item, selectedItem);
+            }
+            
+            
+            // Make sure we wait until the thread has finished
         }
-        
-        
-        // Make sure we wait until the thread has finished
-        t.join();
+        finally {
+            t.join();
+        }
     }
 
 
@@ -200,7 +212,7 @@
         assertTrue("Wrong end", result.endsWith(", item 96, item 97, item 98, item 99]"));
     }
 
-    public static void main(String[] args) {
-        RepeatHelper.runTests(args, JComboBoxTesterTest.class);
-    }
+//    public static void main(String[] args) {
+//        RepeatHelper.runTests(args, JComboBoxTesterTest.class);
+//    }
 }

Modified: abbot/trunk/test/abbot/tester/JListTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JListTesterTest.java	2012-10-31 17:07:40 UTC (rev 2843)
+++ abbot/trunk/test/abbot/tester/JListTesterTest.java	2012-11-05 11:50:17 UTC (rev 2844)
@@ -1,6 +1,6 @@
 package abbot.tester;
 
-import abbot.WaitTimedOutError;
+import abbot.WaitTimedOutException;
 
 import java.awt.event.*;
 
@@ -110,7 +110,7 @@
             fail("Action with out-of-bounds index should fail");
         }
         catch(ActionFailedException a) { }
-        catch(WaitTimedOutError w) {}
+        catch(WaitTimedOutException w) {}
     }
 
     /**

Modified: abbot/trunk/test/abbot/tester/JTreeTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JTreeTesterTest.java	2012-10-31 17:07:40 UTC (rev 2843)
+++ abbot/trunk/test/abbot/tester/JTreeTesterTest.java	2012-11-05 11:50:17 UTC (rev 2844)
@@ -1,7 +1,7 @@
 package abbot.tester;
 
 
-import abbot.WaitTimedOutError;
+import abbot.WaitTimedOutException;
 
 import java.awt.event.ActionEvent;
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2845
          http://abbot.svn.sourceforge.net/abbot/?rev=2845&view=rev
Author:   gdavison
Date:     2012-11-08 17:09:52 +0000 (Thu, 08 Nov 2012)
Log Message:
-----------
2012-11-07  Gerard Davison
        * ActionClick make sure component is enabeld before we try to click on it, with a wait
        * Some more waits to make JComboBox more reliable
        * Some more waits to make JList testing more reliable, include current workaround for missing selection
             bug where we retry if we miss the first time. 

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/projects/jdeveloper/Library/Library.jpr
    abbot/trunk/projects/jdeveloper/Tests/Tests.jpr
    abbot/trunk/src/abbot/i18n/abbot.properties
    abbot/trunk/src/abbot/tester/ComponentTester.java
    abbot/trunk/src/abbot/tester/JComboBoxTester.java
    abbot/trunk/src/abbot/tester/JListLocation.java
    abbot/trunk/src/abbot/tester/JListTester.java
    abbot/trunk/test/abbot/tester/JComboBoxTesterTest.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-11-05 11:50:17 UTC (rev 2844)
+++ abbot/trunk/ChangeLog	2012-11-08 17:09:52 UTC (rev 2845)
@@ -1,3 +1,9 @@
+2012-11-07  Gerard Davison
+        * ActionClick make sure component is enabeld before we try to click on it, with a wait
+        * Some more waits to make JComboBox more reliable
+        * Some more waits to make JList testing more reliable, include current workaround for missing selection
+             bug where we retry if we miss the first time. 
+
 2012-11-05  Gerard Davison
         * Renamed WaitTimedOutError -> WaitTimedOutException and made extend FailedException for better
           diagnostics

Modified: abbot/trunk/projects/jdeveloper/Library/Library.jpr
===================================================================
--- abbot/trunk/projects/jdeveloper/Library/Library.jpr	2012-11-05 11:50:17 UTC (rev 2844)
+++ abbot/trunk/projects/jdeveloper/Library/Library.jpr	2012-11-08 17:09:52 UTC (rev 2845)
@@ -138,7 +138,7 @@
             <value n="custom" v="false"/>
             <value n="name" v="Default"/>
             <hash n="oracle.jdevimpl.runner.debug.DebugConfiguration">
-               <value n="tracingExclude" v="sun;sunw"/>
+               <value n="tracingExclude" v=""/>
             </hash>
             <url n="targetURL" path="../../../src/abbot/editor/Costello.java"/>
          </hash>
@@ -192,6 +192,11 @@
             </hash>
          </list>
       </hash>
+      <hash n="jdkReference">
+         <url n="id" path="../../../../../dev_tools/jdev_user_home/system12.1.2.0.40.64.84/o.jdeveloper/1.6.0_35.jdk"/>
+         <value n="isJDK" v="true"/>
+         <value n="jdkVersion" v="1.6.0_35"/>
+      </hash>
       <list n="libraryReferences">
          <hash>
             <value n="id" v="Abbot Dependencies"/>

Modified: abbot/trunk/projects/jdeveloper/Tests/Tests.jpr
===================================================================
--- abbot/trunk/projects/jdeveloper/Tests/Tests.jpr	2012-11-05 11:50:17 UTC (rev 2844)
+++ abbot/trunk/projects/jdeveloper/Tests/Tests.jpr	2012-11-08 17:09:52 UTC (rev 2845)
@@ -107,8 +107,64 @@
    </hash>
    <hash n="oracle.jdeveloper.runner.RunConfigurations">
       <hash n="runConfigurationDefinitions">
+         <hash n="100 reps">
+            <value n="custom" v="false"/>
+            <value n="javaOptions" v=""/>
+            <value n="name" v="100 reps"/>
+            <hash n="oracle.jdevimpl.runner.debug.DebugConfiguration">
+               <value n="tracingExclude" v="sun;sunw"/>
+            </hash>
+            <value n="programArguments" v="100"/>
+            <url n="runDirectoryURL" path="../../../"/>
+            <url n="targetURL" path="../../../test/abbot/script/ComponentReferenceTest.java"/>
+         </hash>
+         <hash n="1 Rep">
+            <value n="custom" v="false"/>
+            <value n="javaOptions" v=""/>
+            <value n="name" v="1 Rep"/>
+            <hash n="oracle.jdevimpl.runner.debug.DebugConfiguration">
+               <value n="tracingExclude" v="sun;sunw"/>
+            </hash>
+            <value n="programArguments" v=""/>
+            <url n="runDirectoryURL" path="../../../"/>
+            <url n="targetURL" path="../../../test/abbot/script/ComponentReferenceTest.java"/>
+         </hash>
+         <hash n="200 reps">
+            <value n="custom" v="false"/>
+            <value n="javaOptions" v=""/>
+            <value n="name" v="200 reps"/>
+            <hash n="oracle.jdevimpl.runner.debug.DebugConfiguration">
+               <value n="tracingExclude" v="sun;sunw"/>
+            </hash>
+            <value n="programArguments" v="200"/>
+            <url n="runDirectoryURL" path="../../../"/>
+            <url n="targetURL" path="../../../test/abbot/script/ComponentReferenceTest.java"/>
+         </hash>
+         <hash n="200 reps of testSelectFirstValue">
+            <value n="custom" v="false"/>
+            <value n="javaOptions" v=""/>
+            <value n="name" v="200 reps of testSelectFirstValue"/>
+            <hash n="oracle.jdevimpl.runner.debug.DebugConfiguration">
+               <value n="tracingExclude" v="sun;sunw"/>
+            </hash>
+            <value n="programArguments" v="200 testSelectFirstValue"/>
+            <url n="runDirectoryURL" path="../../../"/>
+            <url n="targetURL" path="../../../test/abbot/script/ComponentReferenceTest.java"/>
+         </hash>
+         <hash n="40 Reps">
+            <value n="custom" v="false"/>
+            <value n="javaOptions" v=""/>
+            <value n="name" v="40 Reps"/>
+            <hash n="oracle.jdevimpl.runner.debug.DebugConfiguration">
+               <value n="tracingExclude" v="sun;sunw"/>
+            </hash>
+            <value n="programArguments" v="40"/>
+            <url n="runDirectoryURL" path="../../../"/>
+            <url n="targetURL" path="../../../test/abbot/script/ComponentReferenceTest.java"/>
+         </hash>
          <hash n="Default">
             <value n="custom" v="false"/>
+            <value n="javaOptions" v=""/>
             <value n="name" v="Default"/>
             <hash n="oracle.jdevimpl.runner.debug.DebugConfiguration">
                <value n="tracingExclude" v="sun;sunw"/>
@@ -118,8 +174,22 @@
             <url n="targetURL" path="../../../test/abbot/script/ComponentReferenceTest.java"/>
          </hash>
       </hash>
+      <list n="runConfigurationList">
+         <string v="1 Rep"/>
+         <string v="100 reps"/>
+         <string v="200 reps"/>
+         <string v="200 reps of testSelectFirstValue"/>
+         <string v="40 Reps"/>
+         <string v="Default"/>
+      </list>
    </hash>
-   <hash n="oracle.jdevimpl.config.JProjectLibraries"/>
+   <hash n="oracle.jdevimpl.config.JProjectLibraries">
+      <hash n="jdkReference">
+         <url n="id" path="../../../../../dev_tools/jdev_user_home/system12.1.2.0.40.64.84/o.jdeveloper/1.6.0_35.jdk"/>
+         <value n="isJDK" v="true"/>
+         <value n="jdkVersion" v="1.6.0_35"/>
+      </hash>
+   </hash>
    <hash n="oracle.jdevimpl.config.JProjectPaths">
       <url n="outputDirectory" path="../../../build/test-classes/"/>
    </hash>

Modified: abbot/trunk/src/abbot/i18n/abbot.properties
===================================================================
--- abbot/trunk/src/abbot/i18n/abbot.properties	2012-11-05 11:50:17 UTC (rev 2844)
+++ abbot/trunk/src/abbot/i18n/abbot.properties	2012-11-08 17:09:52 UTC (rev 2845)
@@ -108,6 +108,7 @@
 * The component cannot be easily uniquely identified, consider whether this component should have a \
 JLabel associated with it or setting the Name property in order to distinguish it from other components.
 tester.zero_size=Component has zero size
+tester.Component.not_enabled=Component {0} did not become enabled
 tester.JComponent.not_visible=Could not make visible by scrolling the point ({0},{1}) on {2}
 tester.JScrollBar.out_of_range=Position {0} is not within the scroll bar bounds of ({1},{2})
 tester.JFileChooser.filename_not_found=Filename field not found
@@ -119,6 +120,7 @@
 tester.JFileChooser.cancel_not_enabled=Cancel button is disabled
 tester.JComboBox.item_not_found=Item ''{0}'' was not found among the JComboBox contents: {1}
 tester.JComboBox.popup_not_found=Could not find a popup for the JComboBox
+tester.JComboBox.popup_not_ready=The popup for a JComboBox did not become ready after a wait
 tester.JGraph.invalid_index=The object index ({0}) is not valid
 tester.JGraph.cell_not_found=The cell ({0}) was not found
 tester.JSpinner.unknown_editor=Could not provide input to {0}
@@ -133,7 +135,8 @@
 tester.JTable.invalid_cell=The cell ({0},{1}) is not valid
 tester.JTable.invalid_value=The cell ''{0}'' was not found
 tester.JList.invalid_index=The index ({0}) is not valid
-tester.JList.item_not_found=The item ''{0}'' was not found
+tester.JList.item_not_found=The item ''{0}'' was not found in list: \n\n ''{1}''
+tester.JList.item_not_selected=The item ''{0}'' was not selected - instead ''{2}'' in list: \n\n ''{1}''
 tester.JList.point_not_found=The point {0} is not within the JList
 tester.JTableHeader.invalid_index=The index ({0}) is not valid
 tester.JTextComponent.invalid_index=The insertion point ({0}) is not valid

Modified: abbot/trunk/src/abbot/tester/ComponentTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/ComponentTester.java	2012-11-05 11:50:17 UTC (rev 2844)
+++ abbot/trunk/src/abbot/tester/ComponentTester.java	2012-11-08 17:09:52 UTC (rev 2845)
@@ -28,6 +28,9 @@
 import abbot.finder.matchers.WindowMatcher;
 import abbot.i18n.Strings;
 import abbot.script.ComponentReference;
+
+import abbot.tester.Robot.ConditionEDTDecorator;
+
 import abbot.util.*;
 
 /** Provides basic programmatic operation of a {@link Component} and related
@@ -610,8 +613,24 @@
     /** Click on the component at the given location, with the given
      * modifiers and click count.
      */
-    public void actionClick(Component c, ComponentLocation loc,
+    public void actionClick(final Component c, ComponentLocation loc,
                             int buttons, int count) {
+        
+        // Check the component is neabled before clicking on it, wait if required
+        //
+        wait(new ConditionEDTDecorator(c,new Condition() {
+                    public boolean test() {
+                        return c.isEnabled();
+                    }
+
+                    public String toString() {
+                        return  Strings.get("tester.Component.not_enabled", 
+                               new Object[] { c.toString() });
+                    }
+                }), componentDelay);
+        
+        
+        
         Point where = loc.getPoint(c);
         click(c, where.x, where.y, buttons, count);
         waitForIdle();

Modified: abbot/trunk/src/abbot/tester/JComboBoxTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JComboBoxTester.java	2012-11-05 11:50:17 UTC (rev 2844)
+++ abbot/trunk/src/abbot/tester/JComboBoxTester.java	2012-11-08 17:09:52 UTC (rev 2845)
@@ -60,7 +60,49 @@
     public void actionSelectIndex(Component comp, final int index) {
         final JComboBox cb = (JComboBox)comp;
 
-        // activate it, if not already showing 
+        Component popup = makePopupVisible(cb);
+        
+        //
+        
+        try {
+            // Not all LAFs use a JList for the popup
+            try {
+                selectIndexInPopup(popup, index);
+            }
+            catch (ComponentNotShowingException cnse) {
+                
+//                Log.warn("Problem selecting item in a combobox, going to retry then throw original exception");
+//                
+//                popup = makePopupVisible(cb);
+//                try {
+//                    selectIndexInPopup(popup, index);
+//                }
+//                catch (ComponentNotShowingException cnse2) {
+                    throw cnse;
+//                }
+            }
+        }
+        catch(PopupNotFoundException e) {
+            invokeAndWait(new Runnable() {
+                public void run() {
+                    cb.setSelectedIndex(index);
+                    if (cb.getUI().isPopupVisible(cb))
+                        cb.getUI().setPopupVisible(cb, false);
+                }
+            });
+        }
+        
+        // Wait for all the events to processed
+        
+        waitForIdle();
+    }
+
+    /**
+     * @param cb The combobox we are working on.
+     * @return The popup componet we have just made visible
+     */
+    private Component makePopupVisible(final JComboBox cb) {
+        // activate it, if not already showing
         if (!cb.getUI().isPopupVisible(cb)) {
             // NOTE: if the index is out of range, the selected item will be
             // one end or the other of the list.
@@ -76,24 +118,26 @@
                 actionClick(cb);
             }
         }
-        try {
-            // Not all LAFs use a JList for the popup
-            Component popup = findPopupComponent(cb);
-            selectIndexInPopup(popup, index);
-        }
-        catch(PopupNotFoundException e) {
-            invokeAndWait(new Runnable() {
-                public void run() {
-                    cb.setSelectedIndex(index);
-                    if (cb.getUI().isPopupVisible(cb))
-                        cb.getUI().setPopupVisible(cb, false);
-                }
-            });
-        }
         
-        // Wait for all the events to processed
+        // Wait for idle after combo box show
         
         waitForIdle();
+        
+        // Wait for the popup component to be visible
+        //
+
+        final Component popup = findPopupComponent(cb);
+
+        wait(new ConditionEDTDecorator(cb, new Condition() {
+                public boolean test() {
+                    return isReadyForInput(popup);
+                }
+                
+                public String toString() {
+                    return Strings.get("tester.JComboBox.popup_not_ready");
+                }
+            }), defaultDelay / 4); // Ramp up delay as still getting
+        return popup;
     }
     
     /** Provide an override point to select the correct index in whatever index
@@ -186,7 +230,9 @@
         invokeAndWait(comp, new Runnable() {
             @Override
             public void run() {
-                cb.hidePopup();
+                if (cb.isPopupVisible()) {
+                    cb.hidePopup();
+                }
             }
         });
         
@@ -288,12 +334,13 @@
         @Override
         public Integer call() {
 
-            int found = find(new RenderToString() {
+            RenderToString correctRender = new RenderToString() {
                 @Override
                 public String render(Object obj, int index) {
                     return getValueAsString(_cb, _list, obj, index);
                 }
-            });
+            };
+            int found = find(correctRender);
             
             // Previously JComboBoxTester use to default to using toString
             // so we are going to fall back where to using this so that
@@ -309,7 +356,8 @@
                 });
                 
                 if (found!=-1) {
-                    Log.warn("JComboBoxTester falling back to legacy toString code for item matching", new Error());
+                    Log.warn("JComboBoxTester falling back to legacy toString code for item matching " + _item.toString()
+                              + " but should be " + correctRender.render(_item, found));
                 }
             }
 

Modified: abbot/trunk/src/abbot/tester/JListLocation.java
===================================================================
--- abbot/trunk/src/abbot/tester/JListLocation.java	2012-11-05 11:50:17 UTC (rev 2844)
+++ abbot/trunk/src/abbot/tester/JListLocation.java	2012-11-08 17:09:52 UTC (rev 2845)
@@ -109,7 +109,7 @@
     private String invalidMessage(JList list) {
         if (value != null) {
             return Strings.get("tester.JList.item_not_found", 
-                               new Object[] { value });
+                               new Object[] { value, JListTester.dumpList(list) });
         }
         if (row != -1) {
             return Strings.get("tester.JList.invalid_index", 

Modified: abbot/trunk/src/abbot/tester/JListTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JListTester.java	2012-11-05 11:50:17 UTC (rev 2844)
+++ abbot/trunk/src/abbot/tester/JListTester.java	2012-11-08 17:09:52 UTC (rev 2845)
@@ -5,6 +5,8 @@
 import javax.swing.*;
 
 import abbot.Log;
+import abbot.WaitTimedOutException;
+
 import abbot.i18n.Strings;
 import abbot.script.ArgumentParser;
 
@@ -16,6 +18,9 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.FutureTask;
 
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
 /** Provide actions and assertions for a {@link JList} component.
     The {@link JList} substructure is a "row", and {@link JListLocation}
     provides different identifiers for a row.
@@ -158,23 +163,96 @@
                     }
 
                     public String toString() {
-                        return Strings.get("tester.Component.show_wait",
-                                           new Object[] { location.toString() });
+                        return  Strings.get("tester.JList.item_not_found", 
+                               new Object[] { location.toString(), JListTester.dumpList(list) });
                     }
                 }), delay);
 
         // Select the location
         // 
 
-        int index = location.getIndex(list);
-        if (index < 0 || index >= list.getModel().getSize()) {
+        final int targetIndex = location.getIndex(list);
+        if (targetIndex < 0 || targetIndex >= list.getModel().getSize()) {
             String msg = Strings.get("tester.JList.invalid_index",
-                                     new Object[] { new Integer(index) });
+                                     new Object[] { new Integer(targetIndex) });
             throw new ActionFailedException(msg);
         }
-        if (list.getSelectedIndex() != index) {
-            Log.debug("Click on index=" + index);
-            super.actionClick(c, location);
+        if (list.getSelectedIndex() != targetIndex) {
+            Log.debug("Click on index=" + targetIndex);
+            
+            final TemporarySelectionListener tsl = new TemporarySelectionListener(targetIndex);
+
+            invokeAndWait(list, new Runnable()
+            {
+                @Override
+                public void run() {
+                    list.addListSelectionListener(tsl);
+                }
+            });
+
+            try {            
+                super.actionClick(c, location);
+
+                // Wait for the selection to have been made, other stuff might happen
+                // after that so all we can say for sure is that for one moment that
+                // the list held that selection, so polling the selected value might
+                // not be enough as the model might be altered by the time we get
+                // to look at it
+                //
+
+                final Robot.ConditionEDTDecorator condition = new Robot.ConditionEDTDecorator(c, new Condition() {
+                    public boolean test() {
+                        return tsl.matched;
+                    }
+    
+                    public String toString() {
+                        return Strings.get("tester.JList.item_not_selected", new Object[] { location.toString(), JListTester.dumpList(list),
+                        list.getSelectedIndex() });
+                    }
+                });
+                try {
+                    wait(condition, delay/4);
+                }
+                catch (WaitTimedOutException we) {
+                    
+                    Log.warn("Problem selecting item in a list, going to retry then throw original exception");
+                    
+                    // We are seeing some intermitttent failures since JDK6u35 so if the selection 
+                    // didn't work try again
+                    super.actionClick(c, location);
+                    try {
+                        wait(condition,delay/4);
+                    }
+                    catch (WaitTimedOutException we2) {
+    
+                        Log.warn("Problem selecting item in a list, going to retry for a second time then throw original exception");
+                        
+                        // We are seeing some intermitttent failures since JDK6u35 so if the selection 
+                        // didn't work try again
+                        super.actionClick(c, location);
+                        try {
+                            wait(condition,delay/4);
+                        }
+                        catch (WaitTimedOutException we3) {
+                            throw we;
+                        }
+                    }
+                }
+                
+            }
+            finally {
+
+                // Make sure we remove the temporary listener
+                invokeAndWait(list, new Runnable()
+                {
+                    @Override
+                    public void run() {
+                        list.removeListSelectionListener(tsl);
+                    }
+                });
+            }
+            
+            
         }
     }
 
@@ -197,5 +275,42 @@
             return new JListLocation(index);
         }
         return new JListLocation(p);
+    } 
+    
+    
+    public static String dumpList(final JList list) {
+        String mid = "[";
+        StringBuffer contents = new StringBuffer();
+        ListModel lm = list.getModel();
+
+        for (int i=0;i < lm.getSize();i++) {
+
+            contents.append(mid);
+            contents.append(
+                valueToString(list, i));
+            mid = ", ";
+        }
+        contents.append("]");
+        return contents.toString();
     }
+
+
+
+    private static class TemporarySelectionListener implements ListSelectionListener {
+        
+        private volatile boolean matched = false;
+        private int targetIndex;
+            
+        public TemporarySelectionListener(int targetIndex) {
+            this.targetIndex = targetIndex;
+        }
+        
+        @Override
+        public void valueChanged(ListSelectionEvent e) {
+            if (e.getFirstIndex() <= targetIndex && targetIndex <= e.getLastIndex()) {
+                matched = true;
+            }
+        }
+    }
+    
 }

Modified: abbot/trunk/test/abbot/tester/JComboBoxTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JComboBoxTesterTest.java	2012-11-05 11:50:17 UTC (rev 2844)
+++ abbot/trunk/test/abbot/tester/JComboBoxTesterTest.java	2012-11-08 17:09:52 UTC (rev 2845)
@@ -212,7 +212,7 @@
         assertTrue("Wrong end", result.endsWith(", item 96, item 97, item 98, item 99]"));
     }
 
-//    public static void main(String[] args) {
-//        RepeatHelper.runTests(args, JComboBoxTesterTest.class);
-//    }
+    public static void main(String[] args) {
+        RepeatHelper.runTests(args, JComboBoxTesterTest.class);
+    }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2846
          http://abbot.svn.sourceforge.net/abbot/?rev=2846&view=rev
Author:   gdavison
Date:     2012-11-12 14:35:49 +0000 (Mon, 12 Nov 2012)
Log Message:
-----------
2012-11-12  Gerard Davison
        * Interim checkin for test stability (To be revised as I work with the JDK team)
        * increase SLEEP_INTERVAL to 100 to reduce intermittent ButtonTest failures
        * ConditionalEDT wrapper now does toString on the event queue.

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/projects/jdeveloper/Tests/Tests.jpr
    abbot/trunk/src/abbot/tester/Robot.java
    abbot/trunk/src/abbot/util/AWTFixtureHelper.java
    abbot/trunk/test/abbot/tester/AbstractButtonTesterTest.java
    abbot/trunk/test/abbot/tester/ButtonTesterTest.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-11-08 17:09:52 UTC (rev 2845)
+++ abbot/trunk/ChangeLog	2012-11-12 14:35:49 UTC (rev 2846)
@@ -1,3 +1,8 @@
+2012-11-12  Gerard Davison
+        * Interim checkin for test stability (To be revised as I work with the JDK team)
+        * increase SLEEP_INTERVAL to 100 to reduce intermittent ButtonTest failures
+        * ConditionalEDT wrapper now does toString on the event queue.
+
 2012-11-07  Gerard Davison
         * ActionClick make sure component is enabeld before we try to click on it, with a wait
         * Some more waits to make JComboBox more reliable

Modified: abbot/trunk/projects/jdeveloper/Tests/Tests.jpr
===================================================================
--- abbot/trunk/projects/jdeveloper/Tests/Tests.jpr	2012-11-08 17:09:52 UTC (rev 2845)
+++ abbot/trunk/projects/jdeveloper/Tests/Tests.jpr	2012-11-12 14:35:49 UTC (rev 2846)
@@ -131,7 +131,7 @@
          </hash>
          <hash n="200 reps">
             <value n="custom" v="false"/>
-            <value n="javaOptions" v=""/>
+            <value n="javaOptions" v="-Dabbot.robot.need_jitter=true"/>
             <value n="name" v="200 reps"/>
             <hash n="oracle.jdevimpl.runner.debug.DebugConfiguration">
                <value n="tracingExclude" v="sun;sunw"/>
@@ -162,6 +162,17 @@
             <url n="runDirectoryURL" path="../../../"/>
             <url n="targetURL" path="../../../test/abbot/script/ComponentReferenceTest.java"/>
          </hash>
+         <hash n="800 reps">
+            <value n="custom" v="false"/>
+            <value n="javaOptions" v="-Dxxabbot.robot.need_jitter=true"/>
+            <value n="name" v="800 reps"/>
+            <hash n="oracle.jdevimpl.runner.debug.DebugConfiguration">
+               <value n="tracingExclude" v="sun;sunw"/>
+            </hash>
+            <value n="programArguments" v="800"/>
+            <url n="runDirectoryURL" path="../../../"/>
+            <url n="targetURL" path="../../../test/abbot/script/ComponentReferenceTest.java"/>
+         </hash>
          <hash n="Default">
             <value n="custom" v="false"/>
             <value n="javaOptions" v=""/>
@@ -180,6 +191,7 @@
          <string v="200 reps"/>
          <string v="200 reps of testSelectFirstValue"/>
          <string v="40 Reps"/>
+         <string v="800 reps"/>
          <string v="Default"/>
       </list>
    </hash>

Modified: abbot/trunk/src/abbot/tester/Robot.java
===================================================================
--- abbot/trunk/src/abbot/tester/Robot.java	2012-11-08 17:09:52 UTC (rev 2845)
+++ abbot/trunk/src/abbot/tester/Robot.java	2012-11-12 14:35:49 UTC (rev 2846)
@@ -216,7 +216,8 @@
      * threshold.<p>  
     */
     private static final int DEFAULT_DELAY = getPreferredRobotAutoDelay();
-    private static final int SLEEP_INTERVAL = 10;
+    private static final int SLEEP_INTERVAL =         
+        Properties.getProperty("abbot.robot.wait_sleep_interval", 100, 10, 1000);
 
     private static int autoDelay = DEFAULT_DELAY;
     public static int getAutoDelay() { return autoDelay; }
@@ -1301,6 +1302,7 @@
         setAutoDelay(oldDelay);
         mouseRelease(mask);
         setModifiers(keyModifiers, false);
+
     }
 
     /** @deprecated Renamed to {@link #selectAWTMenuItem(Frame,String)}. */
@@ -2483,7 +2485,13 @@
         }
         
         public String toString() {
-            return "EDT Decorator:\n " + condition.toString();
+            
+            return "EDT Decorator:\n " + callAndWait(component, new Callable<String>() {
+                @Override
+                public String call() throws Exception {
+                    return condition.toString();
+                }
+            });
         }
     }
     

Modified: abbot/trunk/src/abbot/util/AWTFixtureHelper.java
===================================================================
--- abbot/trunk/src/abbot/util/AWTFixtureHelper.java	2012-11-08 17:09:52 UTC (rev 2845)
+++ abbot/trunk/src/abbot/util/AWTFixtureHelper.java	2012-11-12 14:35:49 UTC (rev 2846)
@@ -278,6 +278,8 @@
                                            + " (" + elapsed + "ms)");
             getRobot().sleep();
         }
+        
+        getRobot().waitForIdle();
     }
     
     /** Synchronous, safe hide of a window.  The window is ensured to be

Modified: abbot/trunk/test/abbot/tester/AbstractButtonTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/AbstractButtonTesterTest.java	2012-11-08 17:09:52 UTC (rev 2845)
+++ abbot/trunk/test/abbot/tester/AbstractButtonTesterTest.java	2012-11-12 14:35:49 UTC (rev 2846)
@@ -3,6 +3,8 @@
 import java.awt.*;
 import java.awt.event.*;
 
+import java.util.concurrent.Callable;
+
 import javax.swing.*;
 
 import junit.extensions.abbot.*;
@@ -67,7 +69,7 @@
     }
 
     private class ButtonWatcher implements ActionListener {
-        public boolean gotAction = false;
+        public volatile boolean gotAction = false;
         public void actionPerformed(ActionEvent ev) {
             gotAction = true;
         }
@@ -76,7 +78,7 @@
         final JButton button = new JButton("Hit me");
         String[] values = { "one", "two", "three" };
         final JList list = new JList(values);
-        ButtonWatcher bw = new ButtonWatcher() {
+        final ButtonWatcher bw = new ButtonWatcher() {
             public void actionPerformed(ActionEvent ev) {
                 super.actionPerformed(ev);
                 JOptionPane.showInputDialog(button, list);
@@ -85,27 +87,44 @@
         button.addActionListener(bw);
         showFrame(button);
         tester.actionClick(button);
-        assertTrue("Button not pressed", bw.gotAction);
-        Timer timer = new Timer();
-        while (!isShowing("Input")) {
-            if (timer.elapsed() > EVENT_GENERATION_DELAY)
-                fail("Timed out waiting for input dialog");
-            tester.sleep();
-        }
+        assertTrueEventually("Button not pressed", 
+                             new Callable<Boolean>() {
+                                public Boolean call() {
+                                    return bw.gotAction;
+                                }
+                             });
+
+        assertTrueEventually("Timed out waiting for input dialog", 
+                             new Callable<Boolean>() {
+                                public Boolean call() {
+                                    return isShowing("Input");
+                                }
+                             });
+        
+        
         tester.actionClick(list);
         tester.reset();
         JButton ok = findButton("OK");
         assertNotNull("Couldn't find OK button", ok);
-        ButtonWatcher bw2 = new ButtonWatcher();
+        final ButtonWatcher bw2 = new ButtonWatcher();
         ok.addActionListener(bw2);
         tester.actionClick(ok);
-        timer.reset();
-        while (isShowing("Input")) {
-            if (timer.elapsed() > EVENT_GENERATION_DELAY)
-                fail("Timed out waiting for dialog to close");
-            tester.sleep();
-        }
-        assertTrue("OK button not pressed", bw2.gotAction);
+//        timer.reset();
+
+        assertTrueEventually("Timed out waiting for dialog to close", 
+                             new Callable<Boolean>() {
+                                public Boolean call() {
+                                    return !isShowing("Input");
+                                }
+                             });
+
+
+        assertTrueEventually("OK button not pressed", 
+                             new Callable<Boolean>() {
+                                public Boolean call() {
+                                    return bw2.gotAction;
+                                }
+                             });
     }
     
     

Modified: abbot/trunk/test/abbot/tester/ButtonTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/ButtonTesterTest.java	2012-11-08 17:09:52 UTC (rev 2845)
+++ abbot/trunk/test/abbot/tester/ButtonTesterTest.java	2012-11-12 14:35:49 UTC (rev 2846)
@@ -3,6 +3,8 @@
 import java.awt.*;
 import java.awt.event.*;
 
+import java.util.concurrent.Callable;
+
 import junit.extensions.abbot.*;
 
 public class ButtonTesterTest extends ComponentTestFixture {
@@ -17,7 +19,11 @@
         });
         ButtonTester tester = new ButtonTester();
         tester.actionClick(b);
-        assertEquals("Button not clicked", expected, b.getLabel());
+        assertEqualsEventually("Button not clicked", expected, new Callable<String>() {
+            public String call() {
+                return b.getLabel();
+            }
+        });
     }
 
     public void testAWTModeButtonClick() {
@@ -36,6 +42,13 @@
             getRobot().waitForIdle();
             assertTrue("Expect Button to not be clickable in AWT mode",
                        !expected.equals(b.getLabel()));
+
+            assertTrueEventually("Expect Button to not be clickable in AWT mode", new Callable<Boolean>() {
+                public Boolean call() {
+                    return !expected.equals(b.getLabel());
+                }
+            });
+
         }
         finally {
             Robot.setEventMode(lastMode);
@@ -45,7 +58,7 @@
     public ButtonTesterTest(String name) { super(name); }
 
     public static void main(String[] args) {
-        TestHelper.runTests(args, ButtonTesterTest.class);
+        RepeatHelper.runTests(args, ButtonTesterTest.class);
     }
 
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2848
          http://abbot.svn.sourceforge.net/abbot/?rev=2848&view=rev
Author:   gdavison
Date:     2012-11-27 17:18:15 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
2012-11-27  Gerard Davison 
        * EDT violations in Focus code
        * EDT violations in tests
        * Use of SunToolkit.realSync to deal with intermittent failures and improved
          waitForIdle reliability
        * RawTestButtonTesterTest as test case for working with the JDK team.
        * Reducd SLEEP_INTERVAL back to a much lower value
        * If a FailedTest is a cause for another then the SystemState is copied over

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/build.xml
    abbot/trunk/projects/jdeveloper/Library/Library.jpr
    abbot/trunk/projects/jdeveloper/Tests/Tests.jpr
    abbot/trunk/src/abbot/tester/FailedException.java
    abbot/trunk/src/abbot/tester/JListTester.java
    abbot/trunk/src/abbot/tester/Robot.java
    abbot/trunk/src/abbot/util/AWTFixtureHelper.java
    abbot/trunk/src/junit/extensions/abbot/ComponentTestFixture.java
    abbot/trunk/test/abbot/editor/widgets/AbstractComponentDecoratorTest.java
    abbot/trunk/test/abbot/tester/ComponentTesterTest.java
    abbot/trunk/test/abbot/util/BugsTest.java

Added Paths:
-----------
    abbot/trunk/src/abbot/tester/keymaps/en_GB-x11.map
    abbot/trunk/test/abbot/AAEnv.java
    abbot/trunk/test/abbot/tester/RawButtonTesterTest.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-11-12 15:35:14 UTC (rev 2847)
+++ abbot/trunk/ChangeLog	2012-11-27 17:18:15 UTC (rev 2848)
@@ -1,3 +1,12 @@
+2012-11-27  Gerard Davison 
+        * EDT violations in Focus code
+        * EDT violations in tests
+        * Use of SunToolkit.realSync to deal with intermittent failures and improved
+          waitForIdle reliability
+        * RawTestButtonTesterTest as test case for working with the JDK team.
+        * Reducd SLEEP_INTERVAL back to a much lower value
+        * If a FailedTest is a cause for another then the SystemState is copied over
+
 2012-11-12  Gerard Davison
         * Interim checkin for test stability (To be revised as I work with the JDK team)
         * increase SLEEP_INTERVAL to 100 to reduce intermittent ButtonTest failures

Modified: abbot/trunk/build.xml
===================================================================
--- abbot/trunk/build.xml	2012-11-12 15:35:14 UTC (rev 2847)
+++ abbot/trunk/build.xml	2012-11-27 17:18:15 UTC (rev 2848)
@@ -326,6 +326,9 @@
              Recorder, script, editor tests (depend on testers)
         -->
         <fileset dir="${test.src}"
+                 includes="abbot/*Env.java"
+                 excludes="${ext.exclude}"/>
+        <fileset dir="${test.src}"
                  includes="abbot/*Test.java,abbot/i18n/*Test.java"
                  excludes="${ext.exclude}"/>
         <fileset dir="${test.src}"
@@ -371,13 +374,18 @@
       <classpath refid="test.classpath"/>
     </java>
 
-    <java fork="${test.fork}" classname="abbot.tester.JListTesterTest">
+    <java fork="${test.fork}" classname="abbot.tester.RawButtonTesterTest">
       <arg value="800" />
       <classpath refid="test.classpath"/>
     </java>
 
+    <java fork="${test.fork}" classname="abbot.tester.JListTesterTest">
+      <arg value="200" />
+      <classpath refid="test.classpath"/>
+    </java>
+
     <java fork="${test.fork}" classname="abbot.tester.JComboBoxTesterTest">
-      <arg value="800" />
+      <arg value="200" />
       <classpath refid="test.classpath"/>
     </java>
 

Modified: abbot/trunk/projects/jdeveloper/Library/Library.jpr
===================================================================
--- abbot/trunk/projects/jdeveloper/Library/Library.jpr	2012-11-12 15:35:14 UTC (rev 2847)
+++ abbot/trunk/projects/jdeveloper/Library/Library.jpr	2012-11-27 17:18:15 UTC (rev 2848)
@@ -193,7 +193,7 @@
          </list>
       </hash>
       <hash n="jdkReference">
-         <url n="id" path="../../../../../dev_tools/jdev_user_home/system12.1.2.0.40.64.84/o.jdeveloper/1.6.0_35.jdk"/>
+         <url n="id" path="../../../../../dev_tools/jdev_user_home/system12.1.2.0.40.64.84/o.jdeveloper/1.6.0_35 scratch.jdk"/>
          <value n="isJDK" v="true"/>
          <value n="jdkVersion" v="1.6.0_35"/>
       </hash>

Modified: abbot/trunk/projects/jdeveloper/Tests/Tests.jpr
===================================================================
--- abbot/trunk/projects/jdeveloper/Tests/Tests.jpr	2012-11-12 15:35:14 UTC (rev 2847)
+++ abbot/trunk/projects/jdeveloper/Tests/Tests.jpr	2012-11-27 17:18:15 UTC (rev 2848)
@@ -197,7 +197,7 @@
    </hash>
    <hash n="oracle.jdevimpl.config.JProjectLibraries">
       <hash n="jdkReference">
-         <url n="id" path="../../../../../dev_tools/jdev_user_home/system12.1.2.0.40.64.84/o.jdeveloper/1.6.0_35.jdk"/>
+         <url n="id" path="../../../../../dev_tools/jdev_user_home/system12.1.2.0.40.64.84/o.jdeveloper/1.6.0_35 scratch.jdk"/>
          <value n="isJDK" v="true"/>
          <value n="jdkVersion" v="1.6.0_35"/>
       </hash>

Modified: abbot/trunk/src/abbot/tester/FailedException.java
===================================================================
--- abbot/trunk/src/abbot/tester/FailedException.java	2012-11-12 15:35:14 UTC (rev 2847)
+++ abbot/trunk/src/abbot/tester/FailedException.java	2012-11-27 17:18:15 UTC (rev 2848)
@@ -27,7 +27,14 @@
    
     public FailedException(String msg, Throwable cause) {
         super(msg, cause);
-        systemState = dumpSystemState();
+        if (cause instanceof FailedException) {
+            // Don't make a copy of the system state use the one in cause
+            // as that will be closer to where it happened
+            systemState = ((FailedException)cause).getSystemState();            
+        }
+        else {
+            systemState = dumpSystemState();
+        }
     }
 
     public FailedException(String msg) {

Modified: abbot/trunk/src/abbot/tester/JListTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JListTester.java	2012-11-12 15:35:14 UTC (rev 2847)
+++ abbot/trunk/src/abbot/tester/JListTester.java	2012-11-27 17:18:15 UTC (rev 2848)
@@ -215,28 +215,30 @@
                 }
                 catch (WaitTimedOutException we) {
                     
-                    Log.warn("Problem selecting item in a list, going to retry then throw original exception");
+                    // Now we have a solution for the mouse click issue...
                     
-                    // We are seeing some intermitttent failures since JDK6u35 so if the selection 
-                    // didn't work try again
-                    super.actionClick(c, location);
-                    try {
-                        wait(condition,delay/4);
-                    }
-                    catch (WaitTimedOutException we2) {
-    
-                        Log.warn("Problem selecting item in a list, going to retry for a second time then throw original exception");
-                        
-                        // We are seeing some intermitttent failures since JDK6u35 so if the selection 
-                        // didn't work try again
-                        super.actionClick(c, location);
-                        try {
-                            wait(condition,delay/4);
-                        }
-                        catch (WaitTimedOutException we3) {
+//                    Log.warn("Problem selecting item in a list, going to retry then throw original exception");
+//                    
+//                    // We are seeing some intermitttent failures since JDK6u35 so if the selection 
+//                    // didn't work try again
+//                    super.actionClick(c, location);
+//                    try {
+//                        wait(condition,delay/4);
+//                    }
+//                    catch (WaitTimedOutException we2) {
+//    
+//                        Log.warn("Problem selecting item in a list, going to retry for a second time then throw original exception");
+//                        
+//                        // We are seeing some intermitttent failures since JDK6u35 so if the selection 
+//                        // didn't work try again
+//                        super.actionClick(c, location);
+//                        try {
+//                            wait(condition,delay/4);
+//                        }
+//                        catch (WaitTimedOutException we3) {
                             throw we;
-                        }
-                    }
+//                        }
+//                    }
                 }
                 
             }

Modified: abbot/trunk/src/abbot/tester/Robot.java
===================================================================
--- abbot/trunk/src/abbot/tester/Robot.java	2012-11-12 15:35:14 UTC (rev 2847)
+++ abbot/trunk/src/abbot/tester/Robot.java	2012-11-27 17:18:15 UTC (rev 2848)
@@ -1,7 +1,25 @@
 package abbot.tester;
 
+import abbot.Log;
+import abbot.Platform;
+import abbot.WaitTimedOutException;
+
+import abbot.finder.BasicFinder;
 import abbot.finder.ComponentFinder;
+import abbot.finder.ComponentNotFoundException;
+import abbot.finder.Matcher;
+import abbot.finder.MultipleComponentsFoundException;
+import abbot.finder.matchers.JMenuItemMatcher;
+import abbot.finder.matchers.JMenuMatcher;
 
+import abbot.i18n.Strings;
+
+import abbot.util.AWT;
+import abbot.util.Bugs;
+import abbot.util.Condition;
+import abbot.util.Properties;
+import abbot.util.Reflector;
+
 import java.awt.AWTEvent;
 import java.awt.AWTException;
 import java.awt.Button;
@@ -41,10 +59,19 @@
 
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 import javax.accessibility.AccessibleAction;
 import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleIcon;
+
 import javax.swing.AbstractButton;
 import javax.swing.JComponent;
 import javax.swing.JInternalFrame;
@@ -60,30 +87,10 @@
 import javax.swing.border.CompoundBorder;
 import javax.swing.border.TitledBorder;
 
-import abbot.Log;
-import abbot.Platform;
-import abbot.WaitTimedOutException;
-import abbot.finder.BasicFinder;
-import abbot.finder.ComponentNotFoundException;
-import abbot.finder.Matcher;
-import abbot.finder.MultipleComponentsFoundException;
-import abbot.finder.matchers.JMenuItemMatcher;
-import abbot.finder.matchers.JMenuMatcher;
-import abbot.i18n.Strings;
-import abbot.util.AWT;
-import abbot.util.Bugs;
-import abbot.util.Condition;
-import abbot.util.Properties;
-import abbot.util.Reflector;
+import javax.xml.ws.Holder;
 
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import sun.awt.SunToolkit;
 
-import javax.xml.ws.Holder;
-
 /** Provide a higher level of abstraction for user input (A Better Robot).
     The Robot's operation may be affected by the following properties:<br>
     <pre><code>abbot.robot.auto_delay</code></pre><br>
@@ -126,6 +133,8 @@
  */
 
 public class Robot implements AWTConstants {
+    
+    
     /** Use java.awt.Robot to generate events. */
     public static int EM_ROBOT = 0;
     /** Post events to the AWT event queue. */
@@ -217,10 +226,13 @@
     */
     private static final int DEFAULT_DELAY = getPreferredRobotAutoDelay();
     private static final int SLEEP_INTERVAL =         
-        Properties.getProperty("abbot.robot.wait_sleep_interval", 100, 10, 1000);
+        Properties.getProperty("abbot.robot.wait_sleep_interval", 50, 10, 1000);
 
     private static int autoDelay = DEFAULT_DELAY;
     public static int getAutoDelay() { return autoDelay; }
+
+
+
     /** Returns a functioning instance of java.awt.Robot. If this method
      * returns null, it should be assumed that java.awt.Robot is unavailable
      * or non-functional on the current system.  
@@ -411,7 +423,6 @@
     private class FocusWatcher extends FocusAdapter {
         public volatile boolean focused = false;
         public FocusWatcher(Component c) {
-            c.addFocusListener(this);
             focused = AWT.getFocusOwner() == c;
         }
         public void focusGained(FocusEvent f) {
@@ -429,42 +440,72 @@
             return;
         }
         Log.debug("Focus change");
-        FocusWatcher fw = new FocusWatcher(comp);
-        // for pointer focus
-        mouseMove(comp, comp.getWidth()/2, comp.getHeight()/2); 
-        waitForIdle();
-        // Make sure the correct window is in front
-        Window w1 = currentOwner != null 
-            ? AWT.getWindow(currentOwner) : null;
-        Window w2 = AWT.getWindow(comp);
-        if (w1 != w2) {
-            activate(w2);
+
+        final FocusWatcher fw = new FocusWatcher(comp);
+
+        try {
+            
+            // Register a focus watcher on this component
+            invokeAndWait(comp, new Runnable() {
+
+                @Override
+                public void run() {
+                    comp.addFocusListener(fw);
+                }
+            });
+            // for pointer focus
+            mouseMove(comp, comp.getWidth()/2, comp.getHeight()/2); 
             waitForIdle();
-        }
-        // NOTE: while it would be nice to have a robot method instead of
-        // requesting focus, clicking to change focus may have 
-        // side effects 
-        invokeAndWait(comp, new Runnable() {
-            public void run() {
-                comp.requestFocus();
+            // Make sure the correct window is in front
+            Window w1 = currentOwner != null 
+                ? AWT.getWindow(currentOwner) : null;
+            Window w2 = AWT.getWindow(comp);
+            if (w1 != w2) {
+                activate(w2);
+                waitForIdle();
             }
-        });
-        try {
+            // NOTE: while it would be nice to have a robot method instead of
+            // requesting focus, clicking to change focus may have 
+            // side effects 
+            invokeAndWait(comp, new Runnable() {
+                public void run() {
+                    comp.requestFocus();
+                }
+            });
+            
+            //
+            
+            waitForIdle();
+            
+            //
+
             if (wait) {
-                long start = System.currentTimeMillis();
-                while (!fw.focused) {
-                    if (System.currentTimeMillis() - start > componentDelay) {
-                        String msg =
-                            Strings.get("tester.Robot.focus_failed",
-                                        new Object[] { toString(comp) });
-                        throw new ActionFailedException(msg);
-                    }
-                    sleep();
+                
+                try {
+                    wait(new ConditionEDTDecorator(comp, new Condition(){
+    
+                        @Override
+                        public boolean test() {
+                            return fw.focused;
+                        }
+                    }),componentDelay);
                 }
+                catch (WaitTimedOutException wte) {
+                    String msg =
+                        Strings.get("tester.Robot.focus_failed",
+                                    new Object[] { toString(comp) });
+                    throw new ActionFailedException(msg, wte);
+                }
             }
         }
         finally {
-            comp.removeFocusListener(fw);
+            invokeAndWait(comp, new Runnable() {
+
+                @Override
+                public void run() {
+                    comp.removeFocusListener(fw);
+                }
+            });
         }
         
         // Wait for idle so we can ignore any side effects
@@ -680,10 +721,74 @@
         return false;
     }
 
+    private static volatile boolean HAS_SUN_TOOLKIT = true;
+    private static ExecutorService REAL_SYNC_POOL = Executors.newFixedThreadPool(1);
+
     private  boolean waitForIdle(EventQueue eq) {
         if (EventQueue.isDispatchThread())
             throw new IllegalThreadStateException("Cannot call method from the event dispatcher thread");
 
+        // Synchronize with the platform event queue
+        //
+        
+        if (HAS_SUN_TOOLKIT) {
+            try {
+                
+                Future f = REAL_SYNC_POOL.submit(new Runnable() {
+                    public void run() {
+                        ((SunToolkit)toolkit).realSync();
+                    }
+                });
+                
+                // We are going to wait for a minute, and if it hasn't returned then
+                // give it a poke
+                
+                try {
+                    f.get(IDLE_TIMEOUT, TimeUnit.MILLISECONDS);
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                } catch (ExecutionException e) {
+                    // Replace when we move to JDK 7
+                    Thread.currentThread().stop(e.getCause());
+                } catch (TimeoutException e) {
+                    
+                    Log.warn("Timeout waiting for SunToolkit.realSync method to return", e);
+                    
+                    // We think that the realSync method is stuck because
+                    // a timeout happened posting the events to the event queue
+                    // due to bug xxxxx, so we are going to use reflection to
+                    // try to get hold of the lock object and notify on it
+                    
+                    try {
+                        
+                        Field $waitLock = SunToolkit.class.getDeclaredField("waitLock");
+                        $waitLock.setAccessible(true);
+                        Object waitLock = $waitLock.get(toolkit);
+                        
+                        synchronized (waitLock) {
+                            waitLock.notifyAll();
+                        }
+                        
+                        
+                    } catch (Throwable th) {
+                        Log.warn("Problem trying to poke the SunToolkit.realSync method back into life", th);
+                    }
+                }
+            
+            }
+            catch (sun.awt.SunToolkit.OperationTimedOut oto) {
+                Log.warn("Timeout trying to sync with event queue, going to sleep for a little bit");
+                try {
+                    TimeUnit.MILLISECONDS.sleep(100);
+                } catch (InterruptedException e) {
+                }
+            }
+            catch (NoClassDefFoundError nodef) {
+                Log.warn("Not using the sun toolkit, test likely to be less reliable", nodef);
+                HAS_SUN_TOOLKIT = false;
+            }
+        }
+
         // NOTE: as of Java 1.3.1, robot.waitForIdle only waits for the
         // last event on the queue at the time of this invocation to be
         // processed.  We need better than that.  Make sure the given event
@@ -775,6 +880,9 @@
     public Color sample(int x, int y) {
         // Service mode always returns black when sampled
         if (robot != null && !serviceMode) {
+            // Make sure we sync the graphics
+            Toolkit.getDefaultToolkit().sync();
+            //
             return robot.getPixelColor(x, y);
         }
         String msg = Strings.get("tester.Robot.no_sample");
@@ -2458,22 +2566,21 @@
             throw new FailedException("Failure to run process on event queue", e);
         }
         
-    }  
-    
-    
-    /**
-     * Helper class that invokes a conditions on the EDT
-     */
-    
-    public class ConditionEDTDecorator implements Condition {
+    }
 
+
+        /**
+         * Helper class that invokes a conditions on the EDT
+         */
+        public static class ConditionEDTDecorator implements Condition {
+
         private Condition condition;
         private Component component;
 
         public ConditionEDTDecorator(Component context, Condition condition) {
             super();
             this.condition = condition;
-            this.component = component;
+            this.component = context;
         }
 
         public boolean test() {

Added: abbot/trunk/src/abbot/tester/keymaps/en_GB-x11.map
===================================================================
--- abbot/trunk/src/abbot/tester/keymaps/en_GB-x11.map	                        (rev 0)
+++ abbot/trunk/src/abbot/tester/keymaps/en_GB-x11.map	2012-11-27 17:18:15 UTC (rev 2848)
@@ -0,0 +1,746 @@
+#Key mappings for locale=en_GB (os=Linux, 2.6.18-238.0.0.0.1.el5xen)
+#Thu Nov 22 18:10:28 GMT 2012
+NUMPAD0.20=30
+COMPOSE.8=system
+COMPOSE.4=system
+COMPOSE.2=system
+COMPOSE.1=system
+COMPOSE.0=system
+E.20=a4
+RIGHT_PARENTHESIS.8=30
+RIGHT_PARENTHESIS.4=30
+PERIOD.20=system
+RIGHT_PARENTHESIS.2=30
+RIGHT_PARENTHESIS.1=29
+RIGHT_PARENTHESIS.0=30
+HELP.20=system
+FINAL.20=system
+SEPARATER.8=system
+CIRCUMFLEX.8=system
+SEPARATER.4=system
+SEPARATER.2=system
+SEPARATER.1=system
+CIRCUMFLEX.4=36
+SEPARATER.0=system
+CIRCUMFLEX.2=36
+NUMBER_SIGN.8=33
+CIRCUMFLEX.1=5e
+CIRCUMFLEX.0=36
+NUMBER_SIGN.4=33
+NUMBER_SIGN.2=33
+NUMBER_SIGN.1=23
+NUMBER_SIGN.0=33
+S.8=73
+KP_LEFT.20=system
+S.4=73
+S.2=13
+S.1=53
+S.0=73
+K.8=6b
+K.4=6b
+K.2=b
+K.1=4b
+K.0=6b
+V.20=76
+C.8=system
+C.4=63
+C.2=3
+C.1=43
+C.0=63
+RIGHT.20=untyped
+BRACERIGHT.8=system
+3.8=system
+BRACERIGHT.4=5d
+3.4=33
+BRACERIGHT.2=1d
+PRINTSCREEN.8=system
+BRACERIGHT.1=7d
+3.2=33
+BRACERIGHT.0=5d
+CANCEL.20=system
+3.1=23
+3.0=33
+PRINTSCREEN.4=system
+PRINTSCREEN.2=untyped
+PRINTSCREEN.1=untyped
+PRINTSCREEN.0=system
+NUMPAD8.8=38
+WINDOWS.20=system
+SPACE.20=20
+NUMPAD8.4=38
+NUMPAD8.2=38
+NUMPAD8.1=38
+NUMPAD8.0=38
+NUMPAD0.8=30
+Q.20=71
+NUMPAD0.4=30
+NUMPAD0.2=30
+NUMPAD0.1=30
+NUMPAD0.0=30
+6.20=system
+PERIOD.8=system
+PERIOD.4=system
+PERIOD.2=2e
+PERIOD.1=3e
+PERIOD.0=2e
+AT.20=40
+NUMPAD7.20=37
+CUT.20=untyped
+PAGE_DOWN.8=untyped
+EURO_SIGN.20=system
+PAGE_DOWN.4=untyped
+PAGE_DOWN.2=untyped
+PAGE_DOWN.1=untyped
+PAGE_DOWN.0=untyped
+MULTIPLY.20=2a
+L.20=6c
+STOP.8=system
+STOP.4=system
+STOP.2=untyped
+STOP.1=untyped
+STOP.0=untyped
+OPEN_BRACKET.8=5b
+1.20=system
+OPEN_BRACKET.4=5b
+OPEN_BRACKET.2=1b
+OPEN_BRACKET.1=7b
+OPEN_BRACKET.0=5b
+NUMPAD2.20=32
+V.8=system
+V.4=system
+V.2=16
+V.1=56
+V.0=76
+N.8=6e
+N.4=6e
+MULTIPLY.8=2a
+G.20=67
+N.2=e
+N.1=4e
+N.0=6e
+MULTIPLY.4=2a
+MULTIPLY.2=2a
+MULTIPLY.1=2a
+MULTIPLY.0=2a
+F.8=66
+F.4=66
+BEGIN.20=system
+F.2=6
+F.1=46
+F.0=66
+6.8=system
+6.4=36
+6.2=36
+6.1=5e
+6.0=36
+B.20=62
+NUMPAD3.8=33
+TAB.8=system
+NUMPAD3.4=33
+NUMPAD3.2=33
+NUMPAD3.1=33
+TAB.4=system
+NUMPAD3.0=33
+TAB.2=system
+TAB.1=9
+TAB.0=9
+X.20=78
+DIVIDE.20=2f
+COLON.20=3b
+AGAIN.20=system
+UP.8=system
+UP.4=system
+UP.2=untyped
+UP.1=untyped
+UP.0=untyped
+DOLLAR.20=24
+CONTEXT_MENU.8=system
+CONTEXT_MENU.4=system
+CONTEXT_MENU.2=system
+INVERTED_EXCLAMATION_MARK.20=system
+CONTEXT_MENU.1=system
+CONTEXT_MENU.0=system
+UNDO.8=system
+S.20=73
+UNDO.4=system
+UNDO.2=system
+UNDO.1=system
+Y.8=system
+UNDO.0=system
+Y.4=system
+Y.2=19
+Y.1=59
+Y.0=79
+8.20=system
+Q.8=71
+Q.4=71
+Q.2=11
+Q.1=51
+Q.0=71
+END.8=untyped
+I.8=69
+END.4=untyped
+I.4=69
+END.2=untyped
+END.1=untyped
+I.2=9
+PASTE.8=system
+END.0=untyped
+ASTERISK.8=system
+I.1=49
+NUMPAD9.20=39
+I.0=69
+PASTE.4=system
+ASTERISK.4=38
+PASTE.2=untyped
+ASTERISK.2=38
+A.8=system
+PASTE.1=untyped
+ASTERISK.1=2a
+PASTE.0=untyped
+ASTERISK.0=38
+BACK_SPACE.8=system
+A.4=61
+A.2=1
+CANCEL.8=system
+BACK_SPACE.4=8
+A.1=41
+A.0=61
+BACK_SPACE.2=8
+BACK_SPACE.1=7f
+CANCEL.4=system
+BACK_SPACE.0=8
+CANCEL.2=system
+END.20=untyped
+9.8=system
+CANCEL.1=system
+CANCEL.0=system
+N.20=6e
+9.4=39
+9.2=39
+9.1=28
+9.0=39
+UNDERSCORE.8=system
+1.8=system
+UNDERSCORE.4=system
+LEFT.8=untyped
+1.4=31
+UNDERSCORE.2=2d
+UNDERSCORE.1=5f
+1.2=31
+3.20=system
+UNDERSCORE.0=2d
+LEFT.4=untyped
+1.1=21
+1.0=31
+LEFT.2=untyped
+LEFT.1=untyped
+LEFT.0=untyped
+NUMPAD6.8=36
+NUMPAD6.4=36
+NUMPAD6.2=36
+NUMPAD6.1=36
+PROPS.20=untyped
+NUMPAD6.0=36
+NUMPAD4.20=34
+KP_DOWN.20=system
+COMPOSE.20=system
+LEFT.20=untyped
+I.20=69
+WINDOWS.8=system
+CONVERT.20=system
+WINDOWS.4=system
+WINDOWS.2=system
+WINDOWS.1=system
+WINDOWS.0=system
+PAGE_UP.20=untyped
+PROPS.8=untyped
+KP_UP.20=system
+PROPS.4=untyped
+PROPS.2=untyped
+PROPS.1=untyped
+LEFT_PARENTHESIS.20=5d
+PROPS.0=untyped
+QUOTEDBL.8=27
+QUOTEDBL.4=27
+QUOTEDBL.2=27
+SEPARATOR.20=system
+QUOTEDBL.1=22
+QUOTEDBL.0=27
+PAGE_DOWN.20=untyped
+ADD.20=2b
+BACK_SPACE.20=8
+D.20=64
+EXCLAMATION_MARK.20=31
+FIND.20=untyped
+BACK_QUOTE.8=system
+LESS.20=7c
+BACK_QUOTE.4=60
+BACK_QUOTE.2=60
+ENTER.8=a
+UNDO.20=system
+T.8=system
+BACK_QUOTE.1=7e
+BACK_QUOTE.0=60
+ENTER.4=a
+T.4=system
+ENTER.2=a
+T.2=14
+ENTER.1=a
+T.1=54
+ENTER.0=a
+T.0=74
+OPEN_BRACKET.20=5b
+L.8=6c
+Z.20=7a
+L.4=6c
+L.2=c
+L.1=4c
+L.0=6c
+PAUSE.8=system
+SUBTRACT.8=system
+PAUSE.4=system
+SUBTRACT.4=system
+D.8=64
+PAUSE.2=system
+SUBTRACT.2=2d
+PAUSE.1=system
+SUBTRACT.1=2d
+PAUSE.0=system
+SUBTRACT.0=2d
+D.4=64
+D.2=4
+D.1=44
+D.0=64
+4.8=system
+BRACERIGHT.20=7e
+4.4=34
+4.2=34
+4.1=24
+4.0=34
+NUMPAD9.8=39
+NUMPAD9.4=39
+KP_DOWN.8=system
+KP_RIGHT.8=system
+UNDERSCORE.20=5c
+NUMPAD9.2=39
+NUMPAD9.1=39
+U.20=75
+NUMPAD9.0=39
+KP_DOWN.4=system
+KP_RIGHT.4=system
+SLASH.20=2f
+KP_DOWN.2=system
+KP_RIGHT.2=system
+KP_DOWN.1=system
+KP_RIGHT.1=system
+KP_DOWN.0=system
+KP_RIGHT.0=system
+NUMPAD1.8=31
+NUMPAD1.4=31
+PRINTSCREEN.20=system
+NUMPAD1.2=31
+NUMPAD1.1=31
+NUMPAD1.0=31
+QUOTE.8=27
+QUOTE.4=27
+QUOTE.2=27
+QUOTE.1=22
+ASTERISK.20=5b
+QUOTE.0=27
+ACCEPT.8=system
+ACCEPT.4=system
+ACCEPT.2=untyped
+ACCEPT.1=untyped
+ACCEPT.0=system
+QUOTEDBL.20=27
+P.20=70
+SUBTRACT.20=2d
+COLON.8=system
+COLON.4=3b
+COLON.2=3b
+COLON.1=3a
+CLOSE_BRACKET.8=system
+COLON.0=3b
+CLOSE_BRACKET.4=5d
+CLOSE_BRACKET.2=1d
+CLOSE_BRACKET.1=7d
+CLOSE_BRACKET.0=5d
+5.20=system
+SPACE.8=system
+ENTER.20=a
+SPACE.4=system
+SPACE.2=20
+NUMPAD6.20=36
+SPACE.1=20
+LEFT_PARENTHESIS.8=39
+SPACE.0=20
+LEFT_PARENTHESIS.4=39
+LEFT_PARENTHESIS.2=39
+LEFT_PARENTHESIS.1=28
+LEFT_PARENTHESIS.0=39
+W.8=system
+EURO_SIGN.8=system
+W.4=system
+EURO_SIGN.4=system
+W.2=17
+W.1=57
+EURO_SIGN.2=system
+W.0=77
+EURO_SIGN.1=system
+EURO_SIGN.0=system
+K.20=6b
+O.8=6f
+O.4=6f
+O.2=f
+O.1=4f
+O.0=6f
+G.8=67
+0.20=system
+G.4=67
+G.2=7
+G.1=47
+G.0=67
+BACK_SLASH.8=system
+BACK_SLASH.4=5c
+BACK_SLASH.2=1c
+BACK_SLASH.1=7c
+BACK_SLASH.0=5c
+AMPERSAND.8=system
+NUMPAD1.20=31
+AMPERSAND.4=37
+7.8=system
+AMPERSAND.2=37
+AMPERSAND.1=26
+AMPERSAND.0=37
+QUOTE.20=27
+7.4=37
+7.2=37
+MODECHANGE.20=system
+7.1=26
+7.0=37
+CLEAR.20=system
+F.20=66
+PAGE_UP.8=untyped
+BEGIN.8=system
+PAGE_UP.4=untyped
+BEGIN.4=system
+PAGE_UP.2=untyped
+PAGE_UP.1=untyped
+BEGIN.2=system
+PAGE_UP.0=untyped
+BEGIN.1=system
+BEGIN.0=system
+NUMPAD4.8=34
+NUMPAD4.4=34
+NUMPAD4.2=34
+NUMPAD4.1=34
+NUMPAD4.0=34
+PAUSE.20=system
+A.20=system
+AMPERSAND.20=7b
+DECIMAL.8=7f
+DECIMAL.4=7f
+DECIMAL.2=7f
+DECIMAL.1=2e
+DECIMAL.0=7f
+W.20=77
+CIRCUMFLEX.20=36
+BRACELEFT.20=5b
+NONCONVERT.8=system
+LESS.8=3c
+NONCONVERT.4=system
+LESS.4=3c
+NONCONVERT.2=system
+LESS.2=3c
+NONCONVERT.1=system
+LESS.1=3e
+Z.8=system
+NONCONVERT.0=system
+LESS.0=3c
+DOWN.20=untyped
+Z.4=system
+Z.2=1a
+Z.1=5a
+Z.0=7a
+R.8=72
+R.4=72
+R.2=12
+R.1=52
+R.0=72
+J.8=6a
+J.4=6a
+J.2=a
+J.1=4a
+J.0=6a
+B.8=system
+DOLLAR.8=34
+B.4=62
+B.2=2
+DOLLAR.4=34
+R.20=72
+B.1=42
+B.0=62
+DOLLAR.2=34
+DOLLAR.1=24
+DOLLAR.0=34
+PLUS.8=3d
+PLUS.4=3d
+PLUS.2=3d
+PLUS.1=2b
+PLUS.0=3d
+7.20=system
+2.8=system
+2.4=32
+2.2=32
+2.1=40
+2.0=32
+INSERT.20=untyped
+NUMPAD7.8=37
+CUT.8=system
+NUMPAD8.20=38
+NUMPAD7.4=37
+CUT.4=system
+NUMPAD7.2=37
+NUMPAD7.1=37
+CUT.2=untyped
+NUMPAD7.0=37
+CUT.1=untyped
+CUT.0=untyped
+GREATER.20=system
+BRACELEFT.8=system
+BRACELEFT.4=5b
+BRACELEFT.2=1b
+HOME.20=untyped
+M.20=6d
+BRACELEFT.1=7b
+BRACELEFT.0=5b
+2.20=system
+NUMPAD3.20=33
+CONTEXT_MENU.20=system
+AGAIN.8=system
+KP_LEFT.8=system
+AGAIN.4=system
+COPY.8=system
+AGAIN.2=system
+KP_LEFT.4=system
+AGAIN.1=system
+AGAIN.0=system
+KP_LEFT.2=system
+KP_LEFT.1=system
+COPY.4=system
+KP_LEFT.0=system
+H.20=system
+COPY.2=untyped
+COPY.1=untyped
+COPY.0=untyped
+SEMICOLON.8=3b
+SEMICOLON.4=3b
+BACK_SLASH.20=5c
+SLASH.8=2f
+SEMICOLON.2=3b
+SEMICOLON.1=3a
+SEMICOLON.0=3b
+MINUS.20=5c
+SLASH.4=2f
+RIGHT.8=untyped
+MINUS.8=2d
+SLASH.2=2f
+SLASH.1=3f
+SLASH.0=2f
+RIGHT.4=untyped
+MINUS.4=2d
+ESCAPE.20=1b
+RIGHT.2=untyped
+MINUS.2=2d
+RIGHT.1=untyped
+MINUS.1=5f
+RIGHT.0=untyped
+MINUS.0=2d
+RIGHT_PARENTHESIS.20=7d
+PASTE.20=untyped
+U.8=system
+SEMICOLON.20=3b
+U.4=system
+U.2=15
+U.1=55
+U.0=75
+M.8=6d
+CONVERT.8=system
+M.4=6d
+CONVERT.4=system
+M.2=d
+M.1=4d
+CONVERT.2=system
+M.0=6d
+CONVERT.1=system
+CONVERT.0=system
+C.20=63
+E.8=65
+SEPARATER.20=system
+E.4=65
+EQUALS.8=3d
+E.2=5
+E.1=45
+E.0=65
+EQUALS.4=3d
+EQUALS.2=3d
+EQUALS.1=2b
+EQUALS.0=3d
+COPY.20=untyped
+COMMA.8=system
+INVERTED_EXCLAMATION_MARK.8=system
+DELETE.20=7f
+COMMA.4=2c
+COMMA.2=2c
+INVERTED_EXCLAMATION_MARK.4=system
+COMMA.1=3c
+5.8=system
+COMMA.0=2c
+INVERTED_EXCLAMATION_MARK.2=system
+INVERTED_EXCLAMATION_MARK.1=system
+INVERTED_EXCLAMATION_MARK.0=system
+5.4=35
+5.2=35
+5.1=25
+5.0=35
+ACCEPT.20=untyped
+Y.20=79
+FIND.8=untyped
+NUMPAD2.8=32
+FIND.4=untyped
+NUMPAD2.4=32
+FIND.2=untyped
+NUMPAD2.2=32
+FIND.1=untyped
+NUMPAD2.1=32
+FIND.0=untyped
+NUMPAD2.0=32
+PLUS.20=system
+GREATER.8=2e
+DIVIDE.8=2f
+INSERT.8=untyped
+GREATER.4=2e
+DIVIDE.4=2f
+GREATER.2=2e
+INSERT.4=untyped
+GREATER.1=3e
+DIVIDE.2=2f
+GREATER.0=2e
+INSERT.2=untyped
+DIVIDE.1=2f
+INSERT.1=untyped
+DIVIDE.0=2f
+INSERT.0=untyped
+T.20=74
+EXCLAMATION_MARK.8=31
+EXCLAMATION_MARK.4=31
+EXCLAMATION_MARK.2=31
+EXCLAMATION_MARK.1=21
+EXCLAMATION_MARK.0=31
+BACK_QUOTE.20=60
+DOWN.8=untyped
+9.20=system
+DOWN.4=untyped
+DOWN.2=untyped
+DOWN.1=untyped
+DOWN.0=untyped
+MODECHANGE.8=system
+HELP.8=system
+MODECHANGE.4=system
+HELP.4=system
+MODECHANGE.2=system
+HELP.2=system
+MODECHANGE.1=system
+HELP.1=system
+MODECHANGE.0=system
+EQUALS.20=3d
+HELP.0=system
+STOP.20=untyped
+UP.20=untyped
+AT.8=system
+AT.4=32
+X.8=system
+AT.2=32
+AT.1=40
+O.20=6f
+KP_RIGHT.20=system
+AT.0=32
+X.4=system
+X.2=18
+X.1=58
+X.0=78
+DELETE.8=7f
+COMMA.20=2c
+DELETE.4=7f
+P.8=70
+DELETE.2=7f
+DELETE.1=7f
+DELETE.0=7f
+P.4=70
+P.2=10
+4.20=system
+P.1=50
+P.0=70
+FINAL.8=system
+H.8=68
+FINAL.4=system
+FINAL.2=system
+H.4=68
+FINAL.1=system
+FINAL.0=system
+H.2=8
+ESCAPE.8=system
+H.1=48
+H.0=68
+KP_UP.8=system
+ESCAPE.4=system
+KP_UP.4=system
+ESCAPE.2=1b
+ESCAPE.1=1b
+KP_UP.2=system
+ESCAPE.0=1b
+NUMPAD5.20=35
+KP_UP.1=system
+KP_UP.0=system
+NONCONVERT.20=system
+DECIMAL.20=7f
+NUMBER_SIGN.20=33
+CLOSE_BRACKET.20=7e
+TAB.20=9
+HOME.8=untyped
+8.8=system
+CLEAR.8=system
+HOME.4=untyped
+8.4=38
+CLEAR.4=system
+ADD.8=system
+HOME.2=untyped
+8.2=38
+HOME.1=untyped
+8.1=2a
+CLEAR.2=system
+HOME.0=untyped
+SEPARATOR.8=system
+8.0=38
+CLEAR.1=system
+CLEAR.0=system
+ADD.4=2b
+J.20=6a
+ADD.2=2b
+SEPARATOR.4=system
+ADD.1=2b
+0.8=system
+ADD.0=2b
+SEPARATOR.2=system
+SEPARATOR.1=system
+SEPARATOR.0=system
+0.4=30
+0.2=30
+0.1=29
+0.0=30
+NUMPAD5.8=35
+NUMPAD5.4=35
+NUMPAD5.2=35
+NUMPAD5.1=35
+NUMPAD5.0=35

Modified: abbot/trunk/src/abbot/util/AWTFixtureHelper.java
===================================================================
--- abbot/trunk/src/abbot/util/AWTFixtureHelper.java	2012-11-12 15:35:14 UTC (rev 2847)
+++ abbot/trunk/src/abbot/util/AWTFixtureHelper.java	2012-11-27 17:18:15 UTC (rev 2848)
@@ -29,13 +29,16 @@
 import abbot.tester.Robot;
 import abbot.tester.WindowTracker;
 
+import java.awt.Color;
+import java.awt.Toolkit;
+
 /** Provides various facilities for setting up, using, and tearing down
  * a test involving UI components.
  * Handles standardized AWTEvent logging and catching exceptions on the
  * AWT event dispatch thread (EDT).
  * This class should be used at setup and teardown of your chosen fixture.
  * @see junit.extensions.abbot.ComponentTestFixture
- * @see abbot.script.StepRunner  
+ * @see abbot.script.StepRunner
  */
 
 public class AWTFixtureHelper {

Modified: abbot/trunk/src/junit/extensions/abbot/ComponentTestFixture.java
===================================================================
--- abbot/trunk/src/junit/extensions/abbot/ComponentTestFixture.java	2012-11-12 15:35:14 UTC (rev 2847)
+++ abbot/trunk/src/junit/extensions/abbot/ComponentTestFixture.java	2012-11-27 17:18:15 UTC (rev 2848)
@@ -1,5 +1,7 @@
 package junit.extensions.abbot;
 
+import abbot.tester.Robot;
+
 import java.awt.*;
 import java.awt.event.*;
 import java.io.*;
@@ -113,23 +115,23 @@
      */
     public static <T> void assertEqualsEventually(final String message, final T expectedValue, final Callable<T> eventualValue) {
         try {
-            Robot.wait(
-                new Condition()
-                {
-                    @Override
-                    public boolean test() {
-                        try {
-                            Assert.assertEquals(
-                                message,
-                                expectedValue,
-                                eventualValue.call());
-                            return true;
-                        } catch (Throwable e) {
-                            return false;
+            abbot.tester.Robot.wait(
+                new abbot.tester.Robot.ConditionEDTDecorator(null,
+                    new Condition()
+                    {
+                        @Override
+                        public boolean test() {
+                            try {
+                                Assert.assertEquals(
+                                    message,
+                                    expectedValue,
+                                    eventualValue.call());
+                                return true;
+                            } catch (Throwable e) {
+                                return false;
+                            }
                         }
-                    }
-                });
-                
+                    }));
         } 
         catch (WaitTimedOutException wtoe) {
             try {

Added: abbot/trunk/test/abbot/AAEnv.java
===================================================================
--- abbot/trunk/test/abbot/AAEnv.java	                        (rev 0)
+++ abbot/trunk/test/abbot/AAEnv.java	2012-11-27 17:18:15 UTC (rev 2848)
@@ -0,0 +1,59 @@
+package abbot;
+
+import abbot.tester.Robot;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Toolkit;
+
+import java.util.concurrent.Callable;
+
+import junit.framework.TestCase;
+
+
+/**
+ * This might be best done with a fixture but it would mean modifying all the tests
+ * but this basically forces a window to be open during all of the tests to prevent
+ * the X11 disconnect errors we sometimes seem when running lots of tests
+ */
+public class AAEnv extends TestCase {
+
+
+    public void testTicker() {
+
+        if (Platform.isX11()) {
+
+            // When running a load of tests on X11 Java sometimes get stopps being able
+            // to reconnect between windows, so this code just displays a simple window that
+            // keeps the connection to X11 going
+
+            class RobotWindow extends Frame {
+                public RobotWindow() {
+                    super("RobotX11Tickler");
+                    setBackground(Color.RED);
+                    setSize(10, 10);
+                }
+            }
+
+            final Frame window = new RobotWindow();
+            Robot.callAndWait(window, new Callable<Void>() {
+
+                @Override
+                public Void call() throws Exception {
+
+                    Dimension dim = Toolkit.getDefaultToolkit().getScreenSize();
+                    window.setLocation(dim.width - 10, 0);
+
+                    window.setVisible(true);
+                    window.setFocusable(false);
+                    window.setState(Frame.ICONIFIED);
+
+                    return null;
+                }
+            });
+        }
+
+
+    }
+}

Modified: abbot/trunk/test/abbot/editor/widgets/AbstractComponentDecoratorTest.java
===================================================================
--- abbot/trunk/test/abbot/editor/widgets/AbstractComponentDecoratorTest.java	2012-11-12 15:35:14 UTC (rev 2847)
+++ abbot/trunk/test/abbot/editor/widgets/AbstractComponentDecoratorTest.java	2012-11-27 17:18:15 UTC (rev 2848)
@@ -73,6 +73,7 @@
             new Point(comp.getWidth()-1, 0),
         };
         wait(comp, CORNERS[0].x, CORNERS[0].y, expected);
+        
         for (int i=0;i < CORNERS.length;i++) {
             Color actual = getRobot().sample(comp, CORNERS[i].x, CORNERS[i].y);
             assertEquals(message + "@" + CORNERS[i], expected, actual);
@@ -88,6 +89,25 @@
             }
         }
     }
+
+
+    /**
+     * It turns out due to anti-aliasing the sample colour around the
+     * text can be out a little so this is a bit of a hack to ignore these
+     * differences.
+     * @param message
+     * @param expected
+     * @param actual
+     */
+    private static void assertEquals(String message, Color expected, Color actual) {
+        
+        int difference = Math.abs(expected.getBlue() - actual.getBlue())
+            + Math.abs(expected.getGreen() - actual.getGreen())
+            + Math.abs(expected.getRed() - actual.getRed());
+        
+        assertTrue(message, difference < 12);
+    }
+
     private class Decorator extends AbstractComponentDecorator {
         public boolean bicolor;
         public Decorator(JComponent c) { this(c, 1); }

Modified: abbot/trunk/test/abbot/tester/ComponentTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/ComponentTesterTest.java	2012-11-12 15:35:14 UTC (rev 2847)
+++ abbot/trunk/test/abbot/tester/ComponentTesterTest.java	2012-11-27 17:18:15 UTC (rev 2848)
@@ -12,6 +12,7 @@
 import abbot.util.*;
 import abbot.util.Bugs;
 
+import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 
 /** Unit test to verify the base ComponentTester class.<p>
@@ -233,15 +234,15 @@
     /** Ensure that we can send clicks close enough together to register as a
         double click. */
     public void testTwoClicks() {
-        MouseWatcher mw = new MouseWatcher();
+        final MouseWatcher mw = new MouseWatcher();
         JTextField tf = new JTextField("SelectMe");
         tf.addMouseListener(mw);
         showFrame(tf);
         tester.actionFocus(tf);
         tester.actionClick(tf);
         tester.actionClick(tf);
-        assertEquals("Two clicks should make a double click",
-                     2, mw.clickCount);
+        assertEqualsEventually("Two clicks should make a double click",
+                               2, new Callable<Integer>() { public Integer call()  {return mw.clickCount;}});
     }
 
     /** 

Added: abbot/trunk/test/abbot/tester/RawButtonTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/RawButtonTesterTest.java	                        (rev 0)
+++ abbot/trunk/test/abbot/tester/RawButtonTesterTest.java	2012-11-27 17:18:15 UTC (rev 2848)
@@ -0,0 +1,298 @@
+package abbot.tester;
+
+
+import java.awt.AWTException;
+import java.awt.Button;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Point;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.InputEvent;
+
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowListener;
+
+import java.lang.reflect.InvocationTargetException;
+
+import java.util.ArrayList;
+import java.util.concurrent.Callable;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.border.EmptyBorder;
+
+import junit.extensions.RepeatedTest;
+import junit.extensions.abbot.TestHelper;
+
+import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import sun.awt.SunToolkit;
+
+
+/**
+ * This is a test that just uses awt.Robot directly to press
+ * a button on a dialog, use as a test case to interact with the
+ * JDK.
+ */
+public class RawButtonTesterTest extends TestCase {
+    
+    static java.awt.Robot robot;
+        static {
+        try {
+            robot = new java.awt.Robot();
+        } catch (AWTException e) {
+        }
+    }
+
+    
+    
+    public void testClickButton() throws InterruptedException, InvocationTargetException {
+        final Button b = new Button("Some Button Name");
+        final String expected = "button clicked";
+        
+        final JFrame frame = new JFrame("Some title");
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        JPanel pane = (JPanel)frame.getContentPane();
+        pane.setBorder(new EmptyBorder(10, 10, 10, 10));
+        pane.add(b);
+
+        try
+        {
+            
+            EventQueue.invokeAndWait(new Runnable() {
+                public void run() {
+                    
+                    frame.pack();
+                    // Make sure the window is positioned away from
+                    // any toolbars around the display borders
+                    frame.setLocation(100, 100);
+                    frame.setVisible(true);
+
+
+                    b.addActionListener(new ActionListener() {
+                        public void actionPerformed(ActionEvent e) {
+                            b.setLabel(expected);
+                        }
+                    });
+                }
+            });
+           
+            //
+            
+            robot.delay(100);
+            robot.setAutoDelay(10);
+            
+          //  ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+            
+            //
+    
+            // Risk non-thread safe version
+//            Point point = AWT.getLocationOnScreen(b);
+            Point point = new Point(b.getLocationOnScreen());
+
+
+            Dimension dim = b.getSize();
+            point.translate(dim.width/2, dim.height/2);
+    
+            robot.mouseMove(point.x, point.y);
+            robot.mousePress(InputEvent.BUTTON1_MASK);
+            robot.mouseRelease(InputEvent.BUTTON1_MASK);
+    
+    
+//            robot.delay(100);
+            
+            //
+            
+            ((SunToolkit)Toolkit.getDefaultToolkit()).realSync();
+    
+            EventQueue.invokeAndWait(new Runnable() {
+                @Override
+                public void run() {
+
+                    assertEqualsEventually("Button not clicked", expected, new Callable<String>() {
+                        public String call() {
+                            return b.getLabel();
+                        }
+                    });
+                }
+            });
+    
+    
+//            assertEqualsEventually("Button not clicked", expected, new Callable<String>() {
+//                public String call() {
+//
+//                    FutureTask<String> isOpen = new FutureTask<String>(
+//                            new Callable<String>() {
+//
+//                                @Override
+//                                public String call() throws Exception {
+//                                    return b.getLabel();
+//                                }
+//                            });
+//                    EventQueue.invokeLater(isOpen);
+//
+//                    try {
+//                        return isOpen.get();
+//                    } catch (Exception e) {
+//                        return "Nothing";
+//                    } 
+//                }
+//            });
+        }
+        finally {
+            
+            EventQueue.invokeAndWait(new Runnable()
+                                     {
+                @Override
+                public void run() {
+                    frame.setVisible(false);
+                    frame.dispose();
+                }
+            });
+                
+        }
+    }
+
+
+    public RawButtonTesterTest(String name) {
+        super(name);
+    }
+
+    public static void main(String[] args) {
+        RepeatHelper.runTests(args, RawButtonTesterTest.class);
+    }
+    
+    
+    // assertTrueEventually
+    
+
+    /**
+     * Waits until a value equals to the value produced by the closure
+     * @param message The message is display if we fail
+     * @param expectedValue The expected value
+     * @param eventualValue The closure that fetched the value we are testing against
+     */
+    public static <T> void assertEqualsEventually(final String message, final T expectedValue, final Callable<T> eventualValue) {
+        try {
+            Condition condition = new Condition() {
+                @Override
+                public boolean test() {
+                    try {
+                        Assert.assertEquals(message, expectedValue, eventualValue.call());
+                        return true;
+                    } catch (Throwable e) {
+                        return false;
+                    }
+                }
+            };
+
+            wait(condition);
+
+        } 
+        catch (WaitTimedOutException wtoe) {
+            try {
+                Assert.assertEquals(
+                    message,
+                    expectedValue,
+                    eventualValue.call());
+            } catch (Exception e) {
+                AssertionFailedError ae = new AssertionFailedError("Failure to process assertion");
+                ae.initCause(e);
+                throw ae;
+            }
+        }
+    }
+
+    private static void wait(Condition condition) {
+        long start = System.currentTimeMillis();
+        while (!condition.test()) {
+            if (System.currentTimeMillis() - start > 30000) {
+                String msg = "Timed out waiting for " + condition;
+                throw new WaitTimedOutException(msg);
+            }
+            robot.delay(10);
+        }
+    }
+    
+    
+    
+    //
+    
+
+    /** Abstract a condition test. */
+    public interface Condition {
+        /** Return the condition state. */
+        boolean test();
+        /** Return a description of what the condition is testing. */
+        String toString();
+    }
+    
+    
+    public static class WaitTimedOutException extends RuntimeException {
+    //    public WaitTimedOutError() {  }
+        public WaitTimedOutException(String msg) { super(msg); }
+    }
+    
+    // Run the tests lots of times
+    //
+    
+    public static class RepeatHelper extends TestHelper {
+
+        private static int repeatCount = 1;
+
+        // no instantiations
+        protected RepeatHelper() { }
+
+        protected static String[] parseArgs(String[] args) {
+            ArrayList list = new ArrayList();
+            for (int i=0;i < args.length;i++) {
+                try {
+                    repeatCount = Integer.parseInt(args[i]);
+                }
+                catch(NumberFormatException e) {
+                    list.add(args[i]);
+                }
+            }
+            return (String[])list.toArray(new String[list.size()]);
+        }
+
+        public static void runTests(String[] args, Class testClass) {
+            //args = Log.init(args);
+            args = parseArgs(args);
+            args = TestHelper.parseArgs(args);
+            try {
+                junit.framework.Test test = collectTests(args, testClass);
+                if (repeatCount > 1)
+                    test = new RepeatedTest(test, repeatCount);
+                runTest(test);
+            }
+            catch(Exception e) {
+                System.err.println(e.getMessage());
+                System.exit(-2);
+            }
+        }
+    }    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    ///
+  
+}

Modified: abbot/trunk/test/abbot/util/BugsTest.java
===================================================================
--- abbot/trunk/test/abbot/util/BugsTest.java	2012-11-12 15:35:14 UTC (rev 2847)
+++ abbot/trunk/test/abbot/util/BugsTest.java	2012-11-27 17:18:15 UTC (rev 2848)
@@ -16,10 +16,12 @@
 import abbot.tester.ComponentTester;
 import abbot.Platform;
 
+import java.util.concurrent.Callable;
+
 /**
  Provides platform bugs detection.  Also serves as a repository of tests for
  all VM or OS-related bugs which affect Abbot operation.  A boolean test for
- each of these may appear in <code>abbot.util.Bugs</code>. <p> 
+ each of these may appear in <code>abbot.util.Bugs</code>. <p>
  Add tests that show the bug, then disable them only for the specific
  platform/VM versions that are known to display the bug (i.e. use
  Bugs.hasXXX() to avoid running the test).  This ensures that the bug
@@ -257,7 +259,7 @@
             "SCROLL",
             "KANA",
         };
-        int[] CODES = { 
+        final int[] CODES = { 
             KeyEvent.VK_CAPS_LOCK,
             KeyEvent.VK_NUM_LOCK,
             KeyEvent.VK_SCROLL_LOCK,
@@ -266,18 +268,26 @@
 	ComponentTester tester = new ComponentTester();
         for (int i=0;i < CODES.length;i++) {
             try {
+                final int nextKey = CODES[i];
                 boolean state = Toolkit.getDefaultToolkit().
-                    getLockingKeyState(CODES[i]);
+                    getLockingKeyState(nextKey);
                 try {
-                    tester.actionKeyStroke(CODES[i]);
-                    boolean state2 = Toolkit.getDefaultToolkit().
-                        getLockingKeyState(CODES[i]);
-                    assertEquals("Reported state of locking key '" + KEYS[i]
+                    tester.actionKeyStroke(nextKey);
+                    
+                    ComponentTestFixture.assertEqualsEventually("Reported state of locking key '" + KEYS[i]
                                  + "' did not change",
-                                 !state, state2);
+                                 !state, new Callable<Boolean>() {
+
+                            @Override
+                            public Boolean call() throws Exception {
+                                return Toolkit.getDefaultToolkit().
+                                    getLockingKeyState(nextKey);
+                            }
+                        });
+
                 }
                 finally {
-                    tester.actionKeyStroke(CODES[i]);
+                    tester.actionKeyStroke(nextKey);
                 }
             }
             catch(UnsupportedOperationException e) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2849
          http://abbot.svn.sourceforge.net/abbot/?rev=2849&view=rev
Author:   gdavison
Date:     2012-11-28 11:01:39 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
2012-11-28  Gerard Davison 
        * Catch infinite loop from SunToolkit.realSync

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/src/abbot/tester/Robot.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-11-27 17:18:15 UTC (rev 2848)
+++ abbot/trunk/ChangeLog	2012-11-28 11:01:39 UTC (rev 2849)
@@ -1,3 +1,6 @@
+2012-11-28  Gerard Davison 
+        * Catch infinite loop from SunToolkit.realSync
+
 2012-11-27  Gerard Davison 
         * EDT violations in Focus code
         * EDT violations in tests

Modified: abbot/trunk/src/abbot/tester/Robot.java
===================================================================
--- abbot/trunk/src/abbot/tester/Robot.java	2012-11-27 17:18:15 UTC (rev 2848)
+++ abbot/trunk/src/abbot/tester/Robot.java	2012-11-28 11:01:39 UTC (rev 2849)
@@ -783,6 +783,13 @@
                 } catch (InterruptedException e) {
                 }
             }
+            catch (sun.awt.SunToolkit.InfiniteLoop oto) {
+                Log.warn("Inifinte loop trying to sync with event queue, going to sleep for a little bit");
+                try {
+                    TimeUnit.MILLISECONDS.sleep(100);
+                } catch (InterruptedException e) {
+                }
+            }
             catch (NoClassDefFoundError nodef) {
                 Log.warn("Not using the sun toolkit, test likely to be less reliable", nodef);
                 HAS_SUN_TOOLKIT = false;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2850
          http://abbot.svn.sourceforge.net/abbot/?rev=2850&view=rev
Author:   gdavison
Date:     2012-11-28 17:27:02 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
Better defaulting for the realSync time out, along with a new swing soak target

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/build.xml
    abbot/trunk/src/abbot/tester/Robot.java
    abbot/trunk/test/abbot/tester/JTreeTesterTest.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-11-28 11:01:39 UTC (rev 2849)
+++ abbot/trunk/ChangeLog	2012-11-28 17:27:02 UTC (rev 2850)
@@ -1,5 +1,6 @@
 2012-11-28  Gerard Davison 
         * Catch infinite loop from SunToolkit.realSync
+        * Increase timeout and allow some configuration
 
 2012-11-27  Gerard Davison 
         * EDT violations in Focus code

Modified: abbot/trunk/build.xml
===================================================================
--- abbot/trunk/build.xml	2012-11-28 11:01:39 UTC (rev 2849)
+++ abbot/trunk/build.xml	2012-11-28 17:27:02 UTC (rev 2850)
@@ -391,7 +391,23 @@
 
   </target>
 
+  <!-- Run so particular swing tests multiple times -->
+  <target name="soak-test-swing" depends="compile-tests"
+          description="Soak some commonly malfucntioning tests">
+    <property name="unit.test" value="abbot.UnitTestSuite"/>
 
+    <java fork="${test.fork}" classname="abbot.tester.JTreeTesterTest">
+      <arg value="400" />
+      <classpath refid="test.classpath"/>
+    </java>
+
+    <java fork="${test.fork}" classname="abbot.tester.JTableTesterTest">
+      <arg value="400" />
+      <classpath refid="test.classpath"/>
+    </java>
+
+  </target>
+
   <target name="functional-tests" depends="compile-tests">
     <junit printsummary="on" fork="${test.fork}" showoutput="yes">
       <sysproperty key="abbot.robot.mode" value="${abbot.robot.mode}"/>

Modified: abbot/trunk/src/abbot/tester/Robot.java
===================================================================
--- abbot/trunk/src/abbot/tester/Robot.java	2012-11-28 11:01:39 UTC (rev 2849)
+++ abbot/trunk/src/abbot/tester/Robot.java	2012-11-28 17:27:02 UTC (rev 2850)
@@ -173,6 +173,36 @@
     protected static long IDLE_TIMEOUT =
         Integer.getInteger("abbot.robot.idle_timeout", 10000).intValue();
 
+    protected static int REALSYNC_IDLE_TIMEOUT_DEFAULT = 200000;
+    static {
+        try {
+            String fieldName;
+            if (Platform.is7OrAfter()) {
+                fieldName = "DEFAULT_WAIT_TIME";
+            }
+            else {
+                fieldName = "WAIT_TIME";
+            }
+            
+            Field $WAITTIME = SunToolkit.class.getDeclaredField(fieldName);
+            $WAITTIME.setAccessible(true);
+            int timeout = $WAITTIME.getInt(SunToolkit.class);
+
+            Field $MAX_ITERS = SunToolkit.class.getDeclaredField("MAX_ITERS");
+            $MAX_ITERS.setAccessible(true);
+            int max_inters = $MAX_ITERS.getInt(SunToolkit.class);
+            // Assume time out should be just a couple of more interations than
+            // the timeout we might see if everything has gone wrong
+            REALSYNC_IDLE_TIMEOUT_DEFAULT = 
+                timeout * (max_inters + 2);
+        } catch (Exception e) {
+            Log.warn("Problem defaulting idle time", e);
+        }
+    }
+
+    protected static long REALSYNC_IDLE_TIMEOUT =
+        Integer.getInteger("abbot.robot.realsync_idle_timeout", REALSYNC_IDLE_TIMEOUT_DEFAULT).intValue();
+
     /** Delay before failing to find a popup menu that should appear. */
     protected static int popupDelay =
         Properties.getProperty("abbot.robot.popup_delay",
@@ -740,11 +770,11 @@
                     }
                 });
                 
-                // We are going to wait for a minute, and if it hasn't returned then
+                // We are going to wait for minute or two, and if it hasn't returned then
                 // give it a poke
                 
                 try {
-                    f.get(IDLE_TIMEOUT, TimeUnit.MILLISECONDS);
+                    f.get(REALSYNC_IDLE_TIMEOUT, TimeUnit.MILLISECONDS);
                 } catch (InterruptedException e) {
                     Thread.currentThread().interrupt();
                 } catch (ExecutionException e) {
@@ -779,15 +809,17 @@
             catch (sun.awt.SunToolkit.OperationTimedOut oto) {
                 Log.warn("Timeout trying to sync with event queue, going to sleep for a little bit");
                 try {
-                    TimeUnit.MILLISECONDS.sleep(100);
+                    TimeUnit.MILLISECONDS.sleep(500);
                 } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
                 }
             }
             catch (sun.awt.SunToolkit.InfiniteLoop oto) {
                 Log.warn("Inifinte loop trying to sync with event queue, going to sleep for a little bit");
                 try {
-                    TimeUnit.MILLISECONDS.sleep(100);
+                    TimeUnit.MILLISECONDS.sleep(500);
                 } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
                 }
             }
             catch (NoClassDefFoundError nodef) {

Modified: abbot/trunk/test/abbot/tester/JTreeTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JTreeTesterTest.java	2012-11-28 11:01:39 UTC (rev 2849)
+++ abbot/trunk/test/abbot/tester/JTreeTesterTest.java	2012-11-28 17:27:02 UTC (rev 2850)
@@ -548,7 +548,7 @@
     public void testDumpTree() {
         
         String tree = JTreeTester.dumpTree(this.tree);
-        System.out.println(tree);
+//        System.out.println(tree);
 
         String[] split = tree.split("\n");
         int count = split.length;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2851
          http://abbot.svn.sourceforge.net/abbot/?rev=2851&view=rev
Author:   gdavison
Date:     2012-12-05 10:24:21 +0000 (Wed, 05 Dec 2012)
Log Message:
-----------
2012-12-04  Gerard Davison 
        * Better waitForIdle failure characteristics
        * Comprehensive swing soak target
        * Fixed problem with JInternalFrameTesterTest when running multiple test reps

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/build.xml
    abbot/trunk/src/abbot/tester/Robot.java
    abbot/trunk/src/abbot/util/EDTExceptionCatcher.java
    abbot/trunk/src/junit/extensions/abbot/RepeatHelper.java
    abbot/trunk/test/abbot/tester/JInternalFrameTesterTest.java
    abbot/trunk/test/abbot/tester/JListLocationTest.java
    abbot/trunk/test/abbot/tester/JToolBarTesterTest.java

Added Paths:
-----------
    abbot/trunk/src/abbot/util/NamedThreadFactory.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-11-28 17:27:02 UTC (rev 2850)
+++ abbot/trunk/ChangeLog	2012-12-05 10:24:21 UTC (rev 2851)
@@ -1,3 +1,8 @@
+2012-12-04  Gerard Davison 
+        * Better waitForIdle failure characteristics
+        * Comprehensive swing soak target
+        * Fixed problem with JInternalFrameTesterTest when running multiple test reps
+
 2012-11-28  Gerard Davison 
         * Catch infinite loop from SunToolkit.realSync
         * Increase timeout and allow some configuration

Modified: abbot/trunk/build.xml
===================================================================
--- abbot/trunk/build.xml	2012-11-28 17:27:02 UTC (rev 2850)
+++ abbot/trunk/build.xml	2012-12-05 10:24:21 UTC (rev 2851)
@@ -368,44 +368,115 @@
   <!-- Run the particular test many times -->
   <target name="soak-test" depends="compile-tests"
           description="Soak some commonly malfucntioning tests">
-    <property name="unit.test" value="abbot.UnitTestSuite"/>
+    <property name="soak.repeat" value="400"/>
+
     <java fork="${test.fork}" classname="abbot.tester.ButtonTesterTest">
-      <arg value="800" />
+      <arg value="${soak.repeat}" />
       <classpath refid="test.classpath"/>
     </java>
 
     <java fork="${test.fork}" classname="abbot.tester.RawButtonTesterTest">
-      <arg value="800" />
+      <arg value="${soak.repeat}" />
       <classpath refid="test.classpath"/>
     </java>
 
-    <java fork="${test.fork}" classname="abbot.tester.JListTesterTest">
-      <arg value="200" />
+    <java fork="${test.fork}" classname="abbot.tester.ComponentTesterTest">
+      <arg value="${soak.repeat}" />
       <classpath refid="test.classpath"/>
     </java>
 
-    <java fork="${test.fork}" classname="abbot.tester.JComboBoxTesterTest">
-      <arg value="200" />
+    <java fork="${test.fork}" classname="abbot.tester.RobotTest">
+      <arg value="${soak.repeat}" />
       <classpath refid="test.classpath"/>
     </java>
 
+    <java fork="${test.fork}" classname="abbot.tester.WindowTrackerTest">
+      <arg value="${soak.repeat}" />
+      <classpath refid="test.classpath"/>
+    </java>
+
+
   </target>
 
   <!-- Run so particular swing tests multiple times -->
   <target name="soak-test-swing" depends="compile-tests"
           description="Soak some commonly malfucntioning tests">
-    <property name="unit.test" value="abbot.UnitTestSuite"/>
+    <property name="soak.repeat" value="200"/>
 
-    <java fork="${test.fork}" classname="abbot.tester.JTreeTesterTest">
-      <arg value="400" />
+    <java fork="${test.fork}" classname="abbot.tester.JComboBoxTesterTest">
+      <arg value="${soak.repeat}" />
       <classpath refid="test.classpath"/>
     </java>
 
+    <java fork="${test.fork}" classname="abbot.tester.JComponentTesterTest">
+      <arg value="${soak.repeat}" />
+      <classpath refid="test.classpath"/>
+    </java>
+
+    <java fork="${test.fork}" classname="abbot.tester.JFileChooserTesterTest">
+      <arg value="${soak.repeat}" />
+      <classpath refid="test.classpath"/>
+    </java>
+
+    <java fork="${test.fork}" classname="abbot.tester.JInternalFrameTesterTest">
+      <arg value="${soak.repeat}" />
+      <classpath refid="test.classpath"/>
+    </java>
+
+    <java fork="${test.fork}" classname="abbot.tester.JListTesterTest">
+      <arg value="${soak.repeat}" />
+      <classpath refid="test.classpath"/>
+    </java>
+
+    <java fork="${test.fork}" classname="abbot.tester.JScrollBarTesterTest">
+      <arg value="${soak.repeat}" />
+      <classpath refid="test.classpath"/>
+    </java>
+
+    <java fork="${test.fork}" classname="abbot.tester.JSliderTesterTest">
+      <arg value="${soak.repeat}" />
+      <classpath refid="test.classpath"/>
+    </java>
+
+    <java fork="${test.fork}" classname="abbot.tester.JSpinnerTesterTest">
+      <arg value="${soak.repeat}" />
+      <classpath refid="test.classpath"/>
+    </java>
+
+
+    <java fork="${test.fork}" classname="abbot.tester.JSplitPaneTesterTest">
+      <arg value="${soak.repeat}" />
+      <classpath refid="test.classpath"/>
+    </java>
+
     <java fork="${test.fork}" classname="abbot.tester.JTableTesterTest">
-      <arg value="400" />
+      <arg value="${soak.repeat}" />
       <classpath refid="test.classpath"/>
     </java>
 
+
+    <java fork="${test.fork}" classname="abbot.tester.JTextComponentTesterTest">
+      <arg value="${soak.repeat}" />
+      <classpath refid="test.classpath"/>
+    </java>
+
+    <java fork="${test.fork}" classname="abbot.tester.JTextFieldTesterTest">
+      <arg value="${soak.repeat}" />
+      <classpath refid="test.classpath"/>
+    </java>
+
+    <java fork="${test.fork}" classname="abbot.tester.JToolBarTesterTest">
+      <arg value="${soak.repeat}" />
+      <classpath refid="test.classpath"/>
+    </java>
+    
+    <java fork="${test.fork}" classname="abbot.tester.JTreeTesterTest">
+      <arg value="${soak.repeat}" />
+      <classpath refid="test.classpath"/>
+    </java>
+
+
+
   </target>
 
   <target name="functional-tests" depends="compile-tests">

Modified: abbot/trunk/src/abbot/tester/Robot.java
===================================================================
--- abbot/trunk/src/abbot/tester/Robot.java	2012-11-28 17:27:02 UTC (rev 2850)
+++ abbot/trunk/src/abbot/tester/Robot.java	2012-12-05 10:24:21 UTC (rev 2851)
@@ -17,6 +17,7 @@
 import abbot.util.AWT;
 import abbot.util.Bugs;
 import abbot.util.Condition;
+import abbot.util.NamedThreadFactory;
 import abbot.util.Properties;
 import abbot.util.Reflector;
 
@@ -62,9 +63,10 @@
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
@@ -173,33 +175,35 @@
     protected static long IDLE_TIMEOUT =
         Integer.getInteger("abbot.robot.idle_timeout", 10000).intValue();
 
-    protected static int REALSYNC_IDLE_TIMEOUT_DEFAULT = 200000;
-    static {
-        try {
-            String fieldName;
-            if (Platform.is7OrAfter()) {
-                fieldName = "DEFAULT_WAIT_TIME";
-            }
-            else {
-                fieldName = "WAIT_TIME";
-            }
-            
-            Field $WAITTIME = SunToolkit.class.getDeclaredField(fieldName);
-            $WAITTIME.setAccessible(true);
-            int timeout = $WAITTIME.getInt(SunToolkit.class);
+    protected static int REALSYNC_IDLE_TIMEOUT_DEFAULT = 22000;
+// This code was generating timeout that were far too long for practical use
+// so I am going to try with a hardcoded default of 22 seconds
+//    static {
+//        try {
+//            String fieldName;
+//            if (Platform.is7OrAfter()) {
+//                fieldName = "DEFAULT_WAIT_TIME";
+//            }
+//            else {
+//                fieldName = "WAIT_TIME";
+//            }
+//            
+//            Field $WAITTIME = SunToolkit.class.getDeclaredField(fieldName);
+//            $WAITTIME.setAccessible(true);
+//            int timeout = $WAITTIME.getInt(SunToolkit.class);
+//
+//            Field $MAX_ITERS = SunToolkit.class.getDeclaredField("MAX_ITERS");
+//            $MAX_ITERS.setAccessible(true);
+//            int max_inters = $MAX_ITERS.getInt(SunToolkit.class);
+//            // Assume time out should be just a couple of more interations than
+//            // the timeout we might see if everything has gone wrong
+//            REALSYNC_IDLE_TIMEOUT_DEFAULT = 
+//                timeout * (max_inters + 2);
+//        } catch (Exception e) {
+//            Log.warn("Problem defaulting idle time", e);
+//        }
+//    }
 
-            Field $MAX_ITERS = SunToolkit.class.getDeclaredField("MAX_ITERS");
-            $MAX_ITERS.setAccessible(true);
-            int max_inters = $MAX_ITERS.getInt(SunToolkit.class);
-            // Assume time out should be just a couple of more interations than
-            // the timeout we might see if everything has gone wrong
-            REALSYNC_IDLE_TIMEOUT_DEFAULT = 
-                timeout * (max_inters + 2);
-        } catch (Exception e) {
-            Log.warn("Problem defaulting idle time", e);
-        }
-    }
-
     protected static long REALSYNC_IDLE_TIMEOUT =
         Integer.getInteger("abbot.robot.realsync_idle_timeout", REALSYNC_IDLE_TIMEOUT_DEFAULT).intValue();
 
@@ -752,7 +756,11 @@
     }
 
     private static volatile boolean HAS_SUN_TOOLKIT = true;
-    private static ExecutorService REAL_SYNC_POOL = Executors.newFixedThreadPool(1);
+    private static ExecutorService REAL_SYNC_POOL = new ThreadPoolExecutor(0, 10,
+                                      60L, TimeUnit.SECONDS,
+                                      new SynchronousQueue<Runnable>(),
+                                      new NamedThreadFactory("SunToolkit.realSync"));
+                                                                
 
     private  boolean waitForIdle(EventQueue eq) {
         if (EventQueue.isDispatchThread())
@@ -784,6 +792,21 @@
                     
                     Log.warn("Timeout waiting for SunToolkit.realSync method to return", e);
                     
+                    // Interrupt the future so we have some chance of recovering
+                    // look at the SunToolkit code this should interrupt this lock
+                    // in waitForIdle if things goes wrong
+                    //
+                    // try {
+                    //   while (!eventDispatched) {
+                    //     waitLock.wait();
+                    //   }
+                    // } catch (InterruptedException ie) {
+                    //   return false;
+                    // }
+                    
+                    f.cancel(true);
+
+                    
                     // We think that the realSync method is stuck because
                     // a timeout happened posting the events to the event queue
                     // due to bug xxxxx, so we are going to use reflection to

Modified: abbot/trunk/src/abbot/util/EDTExceptionCatcher.java
===================================================================
--- abbot/trunk/src/abbot/util/EDTExceptionCatcher.java	2012-11-28 17:27:02 UTC (rev 2850)
+++ abbot/trunk/src/abbot/util/EDTExceptionCatcher.java	2012-12-05 10:24:21 UTC (rev 2851)
@@ -61,6 +61,12 @@
      */
     protected void exceptionCaught(Throwable thr) {
         if (!(thr instanceof ExitException)) {
+            
+            if (thr.getClass().getName().startsWith("sun.awt.SunToolkit")) {
+                Log.warn("Ignoring an exception from the sun toolkit as likely an artifact of a realSyncFailure", thr);
+                return;
+            }
+            
             if (System.getProperty("java.class.path").indexOf("eclipse") != -1) {
                 Log.warn("An exception was thrown on the EDT: " + thr, thr);
             }

Added: abbot/trunk/src/abbot/util/NamedThreadFactory.java
===================================================================
--- abbot/trunk/src/abbot/util/NamedThreadFactory.java	                        (rev 0)
+++ abbot/trunk/src/abbot/util/NamedThreadFactory.java	2012-12-05 10:24:21 UTC (rev 2851)
@@ -0,0 +1,25 @@
+package abbot.util;
+
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * A simple thread factory to make the management of executor groups easier
+ */
+public class NamedThreadFactory implements ThreadFactory {
+    
+    private final AtomicInteger count = new AtomicInteger(1);
+    private final String prefix;
+    private final ThreadGroup group;
+
+    public NamedThreadFactory(String name) {
+        SecurityManager s = System.getSecurityManager();
+        group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup();
+        prefix = name  + "-thread-"; 
+    }
+
+    public Thread newThread(Runnable r) {
+        Thread t = new Thread(group, r, prefix + count.getAndIncrement());
+        return t;
+    }
+}

Modified: abbot/trunk/src/junit/extensions/abbot/RepeatHelper.java
===================================================================
--- abbot/trunk/src/junit/extensions/abbot/RepeatHelper.java	2012-11-28 17:27:02 UTC (rev 2850)
+++ abbot/trunk/src/junit/extensions/abbot/RepeatHelper.java	2012-12-05 10:24:21 UTC (rev 2851)
@@ -37,6 +37,7 @@
         args = parseArgs(args);
         args = TestHelper.parseArgs(args);
         try {
+            System.err.printf("\nRunning %s, %d times\n", testClass.getName(), repeatCount);
             Test test = collectTests(args, testClass);
             if (repeatCount > 1)
                 test = new RepeatedTest(test, repeatCount);

Modified: abbot/trunk/test/abbot/tester/JInternalFrameTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JInternalFrameTesterTest.java	2012-11-28 17:27:02 UTC (rev 2850)
+++ abbot/trunk/test/abbot/tester/JInternalFrameTesterTest.java	2012-12-05 10:24:21 UTC (rev 2851)
@@ -11,8 +11,12 @@
 
 public class JInternalFrameTesterTest extends ComponentTestFixture {
 
-    private JInternalFrameTester tester = new JInternalFrameTester();
+    private JInternalFrameTester tester;
     private JInternalFrame frame;
+    
+    
+    
+    
 
     public void testNormalizeIcon() {
         tester.actionIconify(frame);
@@ -74,6 +78,9 @@
     }
 
     protected void setUp() throws Exception {
+        
+        tester = new JInternalFrameTester();
+        
         JDesktopPane dtpane = new JDesktopPane();
         frame = new JInternalFrame(getName(), true, true, true, true);
         frame.getContentPane().add(new JLabel(getName()));

Modified: abbot/trunk/test/abbot/tester/JListLocationTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JListLocationTest.java	2012-11-28 17:27:02 UTC (rev 2850)
+++ abbot/trunk/test/abbot/tester/JListLocationTest.java	2012-12-05 10:24:21 UTC (rev 2851)
@@ -2,7 +2,8 @@
 
 import java.awt.Point;
 
-import junit.extensions.abbot.TestHelper;
+import junit.extensions.abbot.RepeatHelper;
+
 import junit.framework.TestCase;
 
 public class JListLocationTest extends TestCase {
@@ -38,6 +39,6 @@
     public JListLocationTest(String name) { super(name); }
 
     public static void main(String[] args) {
-        TestHelper.runTests(args, JListLocationTest.class);
+        RepeatHelper.runTests(args, JListLocationTest.class);
     }
 }

Modified: abbot/trunk/test/abbot/tester/JToolBarTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JToolBarTesterTest.java	2012-11-28 17:27:02 UTC (rev 2850)
+++ abbot/trunk/test/abbot/tester/JToolBarTesterTest.java	2012-12-05 10:24:21 UTC (rev 2851)
@@ -89,4 +89,7 @@
                    bar.getX() > contents.getX());
     
     }
+    
+    
+    
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2852
          http://abbot.svn.sourceforge.net/abbot/?rev=2852&view=rev
Author:   gdavison
Date:     2012-12-11 17:22:06 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Update version number to 1.3.0RC2

Modified Paths:
--------------
    abbot/trunk/build.xml
    abbot/trunk/doc/FAQ.shtml
    abbot/trunk/doc/Tutorial-1.shtml
    abbot/trunk/doc/Tutorial-2.shtml
    abbot/trunk/doc/Tutorial-3.shtml
    abbot/trunk/doc/download.shtml
    abbot/trunk/doc/examples.shtml
    abbot/trunk/doc/help.shtml
    abbot/trunk/doc/news.shtml
    abbot/trunk/doc/overview.shtml
    abbot/trunk/doc/quick-start.shtml
    abbot/trunk/doc/tutorials.shtml
    abbot/trunk/doc/user-guide.shtml
    abbot/trunk/src/abbot/Version.java
    abbot/trunk/src/abbot/overview.html

Modified: abbot/trunk/build.xml
===================================================================
--- abbot/trunk/build.xml	2012-12-05 10:24:21 UTC (rev 2851)
+++ abbot/trunk/build.xml	2012-12-11 17:22:06 UTC (rev 2852)
@@ -11,7 +11,7 @@
   </description>
   <!-- global properties -->
   <!-- This is the master version number.  Changes here affect everything. -->
-  <property name="abbot.version" value="1.3.0RC1"/>
+  <property name="abbot.version" value="1.3.0RC2"/>
   <property name="copyright"
     value="Copyright &#169; 2002-2012 Timothy Wall. All Rights Reserved."/>
   <property name="company.full" value="Abbot Framework"/>

Modified: abbot/trunk/doc/FAQ.shtml
===================================================================
--- abbot/trunk/doc/FAQ.shtml	2012-12-05 10:24:21 UTC (rev 2851)
+++ abbot/trunk/doc/FAQ.shtml	2012-12-11 17:22:06 UTC (rev 2852)
@@ -18,7 +18,7 @@
 All materials Copyright &#169; 2002-2011
 <a href=mailto:twall_AT_users.sf.net>Timothy Wall</a>,
 All Rights Reserved<br><p>
-This version 1.3.0RC1<br>
+This version 1.3.0RC2<br>
 </center> 
 
 <h1>FAQ:

Modified: abbot/trunk/doc/Tutorial-1.shtml
===================================================================
--- abbot/trunk/doc/Tutorial-1.shtml	2012-12-05 10:24:21 UTC (rev 2851)
+++ abbot/trunk/doc/Tutorial-1.shtml	2012-12-11 17:22:06 UTC (rev 2852)
@@ -16,7 +16,7 @@
 <font color="#00CC00">A</font><font color="#FF0000">b</font><font color="#00CC00">b</font>ot framework for testing Java GUI components and programs</i><br> 
 All materials Copyright &#169 2002-2011 All Rights Reserved
 <a href=mailto:twall_AT_users.sourceforge.net>Timothy Wall</a><br><p>
-This version 1.3.0RC1-RC2
+This version 1.3.0RC2-RC2
 </center> 
 
 <h1>Tutorial 1: Unit Testing A Single GUI Component</h1>

Modified: abbot/trunk/doc/Tutorial-2.shtml
===================================================================
--- abbot/trunk/doc/Tutorial-2.shtml	2012-12-05 10:24:21 UTC (rev 2851)
+++ abbot/trunk/doc/Tutorial-2.shtml	2012-12-11 17:22:06 UTC (rev 2852)
@@ -16,7 +16,7 @@
 <font color="#00CC00">A</font><font color="#FF0000">b</font><font color="#00CC00">b</font>ot framework for testing Java GUI components and programs</i><br> 
 All materials Copyright &#169; 2002-2011 All Rights Reserved
 <a href=mailto:twall_AT_users.sourceforge.net>Timothy Wall</a><br><p>
-This version 1.3.0RC1-RC2
+This version 1.3.0RC2-RC2
 </center> 
 
 <h1>Tutorial 2: Testing A Group of Components (Part I)</h1>

Modified: abbot/trunk/doc/Tutorial-3.shtml
===================================================================
--- abbot/trunk/doc/Tutorial-3.shtml	2012-12-05 10:24:21 UTC (rev 2851)
+++ abbot/trunk/doc/Tutorial-3.shtml	2012-12-11 17:22:06 UTC (rev 2852)
@@ -16,7 +16,7 @@
 <font color="#00CC00">A</font><font color="#FF0000">b</font><font color="#00CC00">b</font>ot framework for testing Java GUI components and programs</i><br> 
 All materials Copyright &#169; 2002-2011 All Rights Reserved
 <a href=mailto:twall_AT_users.sourceforge.net>Timothy Wall</a><br><p>
-This version 1.3.0RC1
+This version 1.3.0RC2
 </center> 
 
 <h1>Tutorial 3: Testing A Group of Components (Part II)</h1>

Modified: abbot/trunk/doc/download.shtml
===================================================================
--- abbot/trunk/doc/download.shtml	2012-12-05 10:24:21 UTC (rev 2851)
+++ abbot/trunk/doc/download.shtml	2012-12-11 17:22:06 UTC (rev 2852)
@@ -25,14 +25,14 @@
 All materials Copyright \xA9 2002-2011 <a href="mailto:twall_AT_users.sf.net">Timothy
 Wall</a>, All Rights Reserved</p>
 
-<p align=center style='text-align:center'>This version 1.3.0RC1 </p>
+<p align=center style='text-align:center'>This version 1.3.0RC2 </p>
 
 <h2>Download</h2>
 
 <p>The latest abbot package is available in [<a
-href="http://prdownloads.sf.net/abbot/abbot-1.3.0RC1.tgz?download"><span
+href="http://prdownloads.sf.net/abbot/abbot-1.3.0RC2.tgz?download"><span
 style='color:black'>tgz</span></a>] [<a
-href="http://prdownloads.sf.net/abbot/abbot-1.3.0RC1.zip?download"><span
+href="http://prdownloads.sf.net/abbot/abbot-1.3.0RC2.zip?download"><span
 style='color:black'>zip</span></a>] formats, which includes source. You can
 also browse the files available at <a
 href="http://sourceforge.net/project/showfiles.php?group_id=50939">SourceForge</a>,

Modified: abbot/trunk/doc/examples.shtml
===================================================================
--- abbot/trunk/doc/examples.shtml	2012-12-05 10:24:21 UTC (rev 2851)
+++ abbot/trunk/doc/examples.shtml	2012-12-11 17:22:06 UTC (rev 2852)
@@ -29,7 +29,7 @@
 All materials Copyright \xA9 2002-2011 <a href="mailto:twall_AT_users.sf.net">Timothy
 Wall</a>, All Rights Reserved</p>
 
-<p align=center style='text-align:center'>This version 1.3.0RC1-RC2</p>
+<p align=center style='text-align:center'>This version 1.3.0RC2-RC2</p>
 
 <h3>Examples</h3>
 

Modified: abbot/trunk/doc/help.shtml
===================================================================
--- abbot/trunk/doc/help.shtml	2012-12-05 10:24:21 UTC (rev 2851)
+++ abbot/trunk/doc/help.shtml	2012-12-11 17:22:06 UTC (rev 2852)
@@ -29,7 +29,7 @@
 All materials Copyright \xA9 2002-2011 <a href="mailto:twall_AT_users.sf.net">Timothy
 Wall</a>, All Rights Reserved</p>
 
-<p align=center style='text-align:center'>This version 1.3.0RC1</p>
+<p align=center style='text-align:center'>This version 1.3.0RC2</p>
 
 <h3><a name=Support></a>Questions, Help, Support and Contributions</h3>
 

Modified: abbot/trunk/doc/news.shtml
===================================================================
--- abbot/trunk/doc/news.shtml	2012-12-05 10:24:21 UTC (rev 2851)
+++ abbot/trunk/doc/news.shtml	2012-12-11 17:22:06 UTC (rev 2852)
@@ -16,7 +16,7 @@
 <div class=Section1> 
   <p class=MsoNormal align=center style='text-align:center'><i><span style='color:lime'>A</span></i><i><span style='color:red'>b</span></i><i><span style='color:lime'>b</span>ot framework for automated testing of Java GUI components and programs</i><br> 
     All materials Copyright &#169; 2002-2011 <a href="mailto:twall_AT_users.sf.net">Timothy Wall</a>, All Rights Reserved</p> 
-  <p align=center style='text-align:center'>This version 1.3.0RC1-RC2 (111118)</p> 
+  <p align=center style='text-align:center'>This version 1.3.0RC2-RC2 (111118)</p> 
   <h2>NEWS</h2> 
   <ul>
     <li><b>12/2011</b> 1.2 Released

Modified: abbot/trunk/doc/overview.shtml
===================================================================
--- abbot/trunk/doc/overview.shtml	2012-12-05 10:24:21 UTC (rev 2851)
+++ abbot/trunk/doc/overview.shtml	2012-12-11 17:22:06 UTC (rev 2852)
@@ -19,7 +19,7 @@
 style='color:#00CC00'>A</span></i><i><span style='color:red'>b</span></i><i><span
 style='color:#00CC00'>b</span>ot framework for automated testing of Java GUI components and programs</i><br> 
     All materials Copyright \xA9 2002-2011 <a href="mailto:twall_AT_users.sf.net">Timothy Wall</a>, All Rights Reserved</p> 
-  <p align=center style='text-align:center'>This version 1.3.0RC1</p> 
+  <p align=center style='text-align:center'>This version 1.3.0RC2</p> 
   <h1 align=center style='text-align:center'>Getting Started with the Abbot Java GUI Test Framework</h1> 
   <h2 align=center style='text-align:center'><i>Building unit tests and functional tests (AWTUnit/SwingUnit)</i></h2> 
   <p class=MsoBodyText>Abbot helps you test your Java UI. It comprises Abbot, which lets you programmatically drive UI components, and Costello (built on Abbot) which allows you to easily launch, explore and control an application. The framework may be used with both scripts and compiled code.</p> 

Modified: abbot/trunk/doc/quick-start.shtml
===================================================================
--- abbot/trunk/doc/quick-start.shtml	2012-12-05 10:24:21 UTC (rev 2851)
+++ abbot/trunk/doc/quick-start.shtml	2012-12-11 17:22:06 UTC (rev 2852)
@@ -25,7 +25,7 @@
 All materials Copyright \xA9 2002-2011 <a href="mailto:twall_AT_users.sf.net">Timothy
 Wall</a>, All Rights Reserved</p>
 
-<p align=center style='text-align:center'>This version 1.3.0RC1</p>
+<p align=center style='text-align:center'>This version 1.3.0RC2</p>
 
 <h2>Quick Start</h2>
 

Modified: abbot/trunk/doc/tutorials.shtml
===================================================================
--- abbot/trunk/doc/tutorials.shtml	2012-12-05 10:24:21 UTC (rev 2851)
+++ abbot/trunk/doc/tutorials.shtml	2012-12-11 17:22:06 UTC (rev 2852)
@@ -25,7 +25,7 @@
 All materials Copyright \xA9 2002-2011 <a href="mailto:twall_AT_users.sf.net">Timothy
 Wall</a>, All Rights Reserved</p>
 
-<p align=center style='text-align:center'>This version 1.3.0RC1 </p>
+<p align=center style='text-align:center'>This version 1.3.0RC2 </p>
 
 <h3><a name=QuickStart></a>Tutorials</h3>
 

Modified: abbot/trunk/doc/user-guide.shtml
===================================================================
--- abbot/trunk/doc/user-guide.shtml	2012-12-05 10:24:21 UTC (rev 2851)
+++ abbot/trunk/doc/user-guide.shtml	2012-12-11 17:22:06 UTC (rev 2852)
@@ -16,7 +16,7 @@
 All materials Copyright &#169; 2002-2011
 <a href=mailto:twall_AT_users.sf.net>Timothy Wall</a>,
 All Rights Reserved<br><p>
-This version 1.3.0RC1<br>
+This version 1.3.0RC2<br>
 </center> 
 
 <center><h1>Getting Started with Costello</h1></center>

Modified: abbot/trunk/src/abbot/Version.java
===================================================================
--- abbot/trunk/src/abbot/Version.java	2012-12-05 10:24:21 UTC (rev 2851)
+++ abbot/trunk/src/abbot/Version.java	2012-12-11 17:22:06 UTC (rev 2852)
@@ -3,7 +3,7 @@
 /** Current version of the framework. */
 
 public interface Version {
-    String VERSION = "1.3.0RC1";
+    String VERSION = "1.3.0RC2";
 }
 
 

Modified: abbot/trunk/src/abbot/overview.html
===================================================================
--- abbot/trunk/src/abbot/overview.html	2012-12-05 10:24:21 UTC (rev 2851)
+++ abbot/trunk/src/abbot/overview.html	2012-12-11 17:22:06 UTC (rev 2852)
@@ -9,7 +9,7 @@
 <!-- FIXME not sure how to get a title into the summary... -->
 <HR>
 <CENTER>
-<H2>Abbot Automated GUI Testing Framework, version 1.3.0RC1-RC2</H2>
+<H2>Abbot Automated GUI Testing Framework, version 1.3.0RC2-RC2</H2>
 </CENTER>
 <body bgcolor="white">
 This document is the API specification for the

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2854
          http://abbot.svn.sourceforge.net/abbot/?rev=2854&view=rev
Author:   gdavison
Date:     2013-01-30 13:42:50 +0000 (Wed, 30 Jan 2013)
Log Message:
-----------
2012-01-28  Gerard Davison 
        * Check that the row was actually selected in JTreeTester, add unit test to make sure it fails properly
          in this case
        * Change the select/create reference key accelerator to a double tap on the CTRL key as it was getting
          increasingly hard to find an accelerator that works accross all windows managers / platforms.

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/build.xml
    abbot/trunk/projects/jdeveloper/Abbot.jws
    abbot/trunk/projects/jdeveloper/Library/Library.jpr
    abbot/trunk/projects/jdeveloper/Tests/Tests.jpr
    abbot/trunk/src/abbot/editor/ComponentBrowser.java
    abbot/trunk/src/abbot/editor/ScriptEditor.java
    abbot/trunk/src/abbot/editor/i18n/costello.properties
    abbot/trunk/src/abbot/i18n/abbot.properties
    abbot/trunk/src/abbot/tester/JTreeTester.java
    abbot/trunk/test/abbot/tester/JTreeTesterTest.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2012-12-12 17:17:40 UTC (rev 2853)
+++ abbot/trunk/ChangeLog	2013-01-30 13:42:50 UTC (rev 2854)
@@ -1,3 +1,9 @@
+2012-01-28  Gerard Davison 
+        * Check that the row was actually selected in JTreeTester, add unit test to make sure it fails properly
+          in this case
+        * Change the select/create reference key accelerator to a double tap on the CTRL key as it was getting
+          increasingly hard to find an accelerator that works accross all windows managers / platforms.
+
 2012-12-04  Gerard Davison 
         * Better waitForIdle failure characteristics
         * Comprehensive swing soak target

Modified: abbot/trunk/build.xml
===================================================================
--- abbot/trunk/build.xml	2012-12-12 17:17:40 UTC (rev 2853)
+++ abbot/trunk/build.xml	2013-01-30 13:42:50 UTC (rev 2854)
@@ -176,47 +176,51 @@
   <target name="resources" depends="compile">
     <copy todir="${classes}">
       <fileset dir="${src}">
-        <patternset id="resources">
-          <include name="**/*.gif"/>
-          <include name="**/*.map"/>
-          <include name="**/*.bsh"/>
-          <include name="**/*.groovy"/>
-        </patternset>
       </fileset>
     </copy>
     <copy file="${src}/abbot/abbot.xsd" todir="${classes}/abbot"/>
   </target>
 
+  <!-- Extracted pattners others would fail in lastest Ant -->
+  <patternset id="resources">
+    <include name="**/*.gif"/>
+    <include name="**/*.map"/>
+    <include name="**/*.bsh"/>
+    <include name="**/*.groovy"/>
+  </patternset>
+  
+  <patternset id="core-contents">
+    <patternset refid="resources"/>
+    <include name="sun/**"/>
+    <include name="abbot/*"/>
+    <exclude name="abbot/abbot.xsd"/>
+    <include name="abbot/finder/**"/>
+    <include name="abbot/i18n/**"/>
+    <include name="abbot/util/**"/>
+    <include name="abbot/tester/**"/>
+    <exclude name="abbot/tester/MapGenerator*"/>
+    <include name="junit/extensions/abbot/**"/>
+    <exclude name="junit/extensions/abbot/Resolver*"/>
+    <exclude name="junit/extensions/abbot/Script*"/>
+    <exclude name="abbot/tester/extensions/**"/>
+  </patternset>
+  <patternset id="scripting-contents">
+    <include name="abbot/abbot.xsd"/>
+    <include name="abbot/tester/MapGenerator*"/>
+    <include name="abbot/script/**"/>
+    <include name="abbot/editor/**"/>
+    <include name="junit/extensions/abbot/Resolver*"/>
+    <include name="junit/extensions/abbot/Script*"/>
+  </patternset>
+  <patternset id="example-contents">
+    <include name="example/**"/>
+    <include name="abbot/tester/extensions/**"/>
+  </patternset>
+
+
   <target name=":jar" depends="props">
     <uptodate property="-jar" targetfile="${build}/abbot.jar">
       <srcfiles dir="${classes}">
-        <patternset id="core-contents">
-          <patternset refid="resources"/>
-          <include name="sun/**"/>
-          <include name="abbot/*"/>
-          <exclude name="abbot/abbot.xsd"/>
-          <include name="abbot/finder/**"/>
-          <include name="abbot/i18n/**"/>
-          <include name="abbot/util/**"/>
-          <include name="abbot/tester/**"/>
-          <exclude name="abbot/tester/MapGenerator*"/>
-          <include name="junit/extensions/abbot/**"/>
-          <exclude name="junit/extensions/abbot/Resolver*"/>
-          <exclude name="junit/extensions/abbot/Script*"/>
-          <exclude name="abbot/tester/extensions/**"/>
-        </patternset>
-        <patternset id="scripting-contents">
-          <include name="abbot/abbot.xsd"/>
-          <include name="abbot/tester/MapGenerator*"/>
-          <include name="abbot/script/**"/>
-          <include name="abbot/editor/**"/>
-          <include name="junit/extensions/abbot/Resolver*"/>
-          <include name="junit/extensions/abbot/Script*"/>
-        </patternset>
-        <patternset id="example-contents">
-          <include name="example/**"/>
-          <include name="abbot/tester/extensions/**"/>
-        </patternset>
       </srcfiles>
     </uptodate>
   </target>

Modified: abbot/trunk/projects/jdeveloper/Abbot.jws
===================================================================
--- abbot/trunk/projects/jdeveloper/Abbot.jws	2012-12-12 17:17:40 UTC (rev 2853)
+++ abbot/trunk/projects/jdeveloper/Abbot.jws	2013-01-30 13:42:50 UTC (rev 2854)
@@ -1,5 +1,8 @@
 <?xml version = '1.0' encoding = 'UTF-8'?>
 <jws:workspace xmlns:jws="http://xmlns.oracle.com/ide/project">
+   <hash n="adrs-workspace-properties">
+      <value n="adrs-instance-binding" v="DefaultServer"/>
+   </hash>
    <value n="appTemplateId" v="javaAppTemplate"/>
    <hash n="component-versions">
       <value n="oracle.adf.share.dt.migration.jps.JaznCredStoreMigratorHelper" v="11.1.1.1.0"/>
@@ -20,6 +23,7 @@
       <string v="oracle.jdeveloper.model.PathsConfiguration/ADFContentSet"/>
       <string v="oracle.jdeveloper.model.PathsConfiguration/ApplicationSrcContentSet"/>
       <string v="oracle.jdeveloper.model.PathsConfiguration/MobileResourcesContentSet"/>
+      <string v="oracle.jdeveloper.model.PathsConfiguration/ApplicationBuildToolContentSet"/>
    </list>
    <list n="listOfChildren">
       <hash><url n="URL" path="Library/Library.jpr"/></hash>

Modified: abbot/trunk/projects/jdeveloper/Library/Library.jpr
===================================================================
--- abbot/trunk/projects/jdeveloper/Library/Library.jpr	2012-12-12 17:17:40 UTC (rev 2853)
+++ abbot/trunk/projects/jdeveloper/Library/Library.jpr	2013-01-30 13:42:50 UTC (rev 2854)
@@ -192,11 +192,6 @@
             </hash>
          </list>
       </hash>
-      <hash n="jdkReference">
-         <url n="id" path="../../../../../dev_tools/jdev_user_home/system12.1.2.0.40.64.84/o.jdeveloper/1.6.0_35 scratch.jdk"/>
-         <value n="isJDK" v="true"/>
-         <value n="jdkVersion" v="1.6.0_35"/>
-      </hash>
       <list n="libraryReferences">
          <hash>
             <value n="id" v="Abbot Dependencies"/>

Modified: abbot/trunk/projects/jdeveloper/Tests/Tests.jpr
===================================================================
--- abbot/trunk/projects/jdeveloper/Tests/Tests.jpr	2012-12-12 17:17:40 UTC (rev 2853)
+++ abbot/trunk/projects/jdeveloper/Tests/Tests.jpr	2013-01-30 13:42:50 UTC (rev 2854)
@@ -195,13 +195,7 @@
          <string v="Default"/>
       </list>
    </hash>
-   <hash n="oracle.jdevimpl.config.JProjectLibraries">
-      <hash n="jdkReference">
-         <url n="id" path="../../../../../dev_tools/jdev_user_home/system12.1.2.0.40.64.84/o.jdeveloper/1.6.0_35 scratch.jdk"/>
-         <value n="isJDK" v="true"/>
-         <value n="jdkVersion" v="1.6.0_35"/>
-      </hash>
-   </hash>
+   <hash n="oracle.jdevimpl.config.JProjectLibraries"/>
    <hash n="oracle.jdevimpl.config.JProjectPaths">
       <url n="outputDirectory" path="../../../build/test-classes/"/>
    </hash>

Modified: abbot/trunk/src/abbot/editor/ComponentBrowser.java
===================================================================
--- abbot/trunk/src/abbot/editor/ComponentBrowser.java	2012-12-12 17:17:40 UTC (rev 2853)
+++ abbot/trunk/src/abbot/editor/ComponentBrowser.java	2013-01-30 13:42:50 UTC (rev 2854)
@@ -27,6 +27,7 @@
 public class ComponentBrowser
     extends JPanel implements ActionListener {
     private int TAB_HIERARCHY = 0;
+    private int TAB_REFERENCE = 1;
 
     private JButton refreshButton;
     private JCheckBox filterButton;
@@ -290,8 +291,14 @@
                                             }));
     }
 
+
     /** Select the given reference in the current view. */
     public void setSelectedReference(ComponentReference ref) {
+        setSelectedReferenceImpl(ref, true);
+    }
+    
+    /** Select the given reference in the current view. */
+    public void setSelectedReferenceImpl(ComponentReference ref, boolean selectTab) {
         if (ref != selectedReference) {
             selectedReference = ref;
             updateReferenceSelection(ref);
@@ -303,6 +310,12 @@
             }
             fireSelectionChanged();
         }
+        
+        // Display the page if required
+        if (selectTab && ref != null && showingHierarchy()) {
+            tabs.setSelectedIndex(TAB_REFERENCE);
+        }
+        
     }
 
     /** Select the given component (and make it visible) in the current
@@ -320,7 +333,7 @@
             selectedReference = ref;
             updateReferenceSelection(ref);
         }
-        if (ref == null && !showingHierarchy()) {
+        if (!showingHierarchy()) {
             tabs.setSelectedIndex(TAB_HIERARCHY);
         }
         updateComponentSelection(comp);
@@ -570,7 +583,7 @@
         property list changes. */
     public void referenceListSelectionChanged(ListSelectionEvent e) {
         if (!ignoreReferenceChange) {
-            setSelectedReference(getSelectedReferenceFromList());
+            setSelectedReferenceImpl(getSelectedReferenceFromList(), false);
         }
     }
 
@@ -679,7 +692,7 @@
                 messaging = true; 
                 ComponentReference ref = selectedReference;
                 refModel.fireTableDataChanged();
-                setSelectedReference(ref);
+                setSelectedReferenceImpl(ref, false);
                 messaging = false;
             }
         }

Modified: abbot/trunk/src/abbot/editor/ScriptEditor.java
===================================================================
--- abbot/trunk/src/abbot/editor/ScriptEditor.java	2012-12-12 17:17:40 UTC (rev 2853)
+++ abbot/trunk/src/abbot/editor/ScriptEditor.java	2013-01-30 13:42:50 UTC (rev 2854)
@@ -69,7 +69,7 @@
         catch(Exception e) {
             // Ignore for now
         }
-        String key = System.getProperty("abbot.editor.select_key", "F1");
+        String key = System.getProperty("abbot.editor.select_key", "CONTROL");
         selectKey = KeyStroke.getKeyStroke(key).getKeyCode();
         key = System.getProperty("abbot.editor.capture_key", "F2");
         captureKey = KeyStroke.getKeyStroke(key).getKeyCode();
@@ -2309,23 +2309,50 @@
 
         updateComponents(event);
     }
+    
+    
+    
+    private long lastTimeCtrlPressed = 0;
+    private int lastTimeCtrlPressedModifiers = -1;
+    
 
     private boolean handleComponentSelection(AWTEvent event) {
         Component ultimateComponent = state.getUltimateMouseComponent();
         if (ultimateComponent != null
             && !hierarchy.isFiltered(ultimateComponent)) {
             
+            // We are going to  try and detect the double tap here
+            // so that we can have a key that no-one else is going
+            // to worry about
+            
+            boolean doubleTapCtrl = false;
+            if (event instanceof KeyEvent
+                && ((KeyEvent)event).getID() == KeyEvent.KEY_PRESSED
+                && ((KeyEvent)event).getKeyCode() == KeyEvent.VK_CONTROL) {
+                
+                KeyEvent ke = (KeyEvent)event;
+                long currentTimeCtrlPressed = ke.getWhen();
+                int currentModifiers = ke.getModifiers();
+                if ((currentTimeCtrlPressed-lastTimeCtrlPressed < 500) &&
+                    currentModifiers == lastTimeCtrlPressedModifiers) {
+                    doubleTapCtrl = true;
+                }
+                
+                lastTimeCtrlPressed = currentTimeCtrlPressed;
+                lastTimeCtrlPressedModifiers = currentModifiers;
+            }
+
             // This is for mouse based selections
             //
             
-            boolean keySelect =
-                isKeyPress(event, selectKey, KeyEvent.SHIFT_MASK);
+            boolean keySelect = doubleTapCtrl &&
+                isKeyPress(event, selectKey, KeyEvent.CTRL_MASK);
             boolean mouseSelect = 
                 event.getID() == MouseEvent.MOUSE_PRESSED
                 && AWT.isTertiaryButton(((MouseEvent)event).getModifiers());
-            boolean makeReference =
+            boolean makeReference = doubleTapCtrl &&
                 isKeyPress(event, selectKey,
-                           KeyEvent.SHIFT_MASK | KeyEvent.ALT_MASK);
+                           KeyEvent.CTRL_MASK | KeyEvent.ALT_MASK);
             
             if (keySelect || mouseSelect || makeReference) {
                 Component selected = event instanceof MouseEvent
@@ -2340,9 +2367,9 @@
             // rather than one the mouse is pointing at
             //
 
-            boolean keySelectFocus =
+            boolean keySelectFocus = doubleTapCtrl && 
                 isKeyPress(event, selectKey, KeyEvent.SHIFT_MASK | KeyEvent.CTRL_MASK);
-            boolean makeReferenceFocus =
+            boolean makeReferenceFocus = doubleTapCtrl && 
                 isKeyPress(event, selectKey,
                            KeyEvent.SHIFT_MASK | KeyEvent.ALT_MASK | KeyEvent.CTRL_MASK);
             
@@ -2486,12 +2513,20 @@
         if (c != null
             && (c.getParent() instanceof JComboBox)) 
             c = c.getParent();
+        
+        ComponentReference newReference = null;
         if (makeReference && getResolverContext() != null) {
-            getResolverContext().addComponent(c);
+            newReference = getResolverContext().addComponent(c);
             // FIXME tell the reference browser that the list of references
             // has changed. 
         }
         view.getComponentBrowser().setSelectedComponent(c);
+        
+        // Select the new reference
+        //
+        if (newReference!=null) {
+            view.getComponentBrowser().setSelectedReference(newReference);
+        }
     }
 
     private void imageCaptureStart(Component ultimateComponent) {
@@ -3532,8 +3567,8 @@
     private class SelectComponentAction extends EditorAction {
         public SelectComponentAction() {
             super(ACTION_SELECT_COMPONENT);
-            putValue(ACCELERATOR_KEY, 
-                     KeyStroke.getKeyStroke(selectKey, InputEvent.SHIFT_MASK));
+//            putValue(ACCELERATOR_KEY, 
+//                     KeyStroke.getKeyStroke(selectKey, InputEvent.CTRL_MASK));
         }
         public void actionPerformed(ActionEvent e) {
             // This is really only for documentation purposes; there is
@@ -3546,10 +3581,9 @@
     private class CaptureComponentAction extends EditorAction {
         public CaptureComponentAction() {
             super(ACTION_CAPTURE_COMPONENT);
-            putValue(ACCELERATOR_KEY, 
-                     KeyStroke.getKeyStroke(selectKey,
-                                            InputEvent.SHIFT_MASK
-                                            |InputEvent.ALT_MASK));
+//            putValue(ACCELERATOR_KEY, 
+//                     KeyStroke.getKeyStroke(selectKey,
+//                                            InputEvent.CTRL_MASK | InputEvent.ALT_MASK));
         }
         public void actionPerformed(ActionEvent e) {
             // This is really only for documentation purposes; there is
@@ -3563,8 +3597,8 @@
     private class SelectFocusedComponentAction extends EditorAction {
         public SelectFocusedComponentAction() {
             super(ACTION_SELECT_FOCUSED_COMPONENT);
-            putValue(ACCELERATOR_KEY, 
-                     KeyStroke.getKeyStroke(selectKey, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK));
+//            putValue(ACCELERATOR_KEY, 
+//                     KeyStroke.getKeyStroke(selectKey, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK));
         }
         public void actionPerformed(ActionEvent e) {
             // This is really only for documentation purposes; there is
@@ -3577,11 +3611,11 @@
     private class CaptureFocusedComponentAction extends EditorAction {
         public CaptureFocusedComponentAction() {
             super(ACTION_CAPTURE_FOCUSED_COMPONENT);
-            putValue(ACCELERATOR_KEY, 
-                     KeyStroke.getKeyStroke(selectKey,
-                                            InputEvent.SHIFT_MASK
-                                            |InputEvent.ALT_MASK
-                                            |InputEvent.CTRL_MASK));
+//            putValue(ACCELERATOR_KEY, 
+//                     KeyStroke.getKeyStroke(selectKey,
+//                                            InputEvent.SHIFT_MASK
+//                                            |InputEvent.ALT_MASK
+//                                            |InputEvent.CTRL_MASK));
         }
         public void actionPerformed(ActionEvent e) {
             // This is really only for documentation purposes; there is

Modified: abbot/trunk/src/abbot/editor/i18n/costello.properties
===================================================================
--- abbot/trunk/src/abbot/editor/i18n/costello.properties	2012-12-12 17:17:40 UTC (rev 2853)
+++ abbot/trunk/src/abbot/editor/i18n/costello.properties	2013-01-30 13:42:50 UTC (rev 2854)
@@ -552,19 +552,19 @@
 actions.capture-image.desc=Move the mouse pointer over a component in your application under test, then press the keystroke shortcut for this action to begin the image capture of that component
 # Menu item for creating a component reference
 actions.capture-component=Component &Reference
-actions.capture-component.desc=Move the mouse pointer over a component in your application under test, then press the keystroke shortcut for this action to obtain a reference to that component, using an existing one if possible
+actions.capture-component.desc=Move the mouse pointer over a component in your application under test, then double tap the ctrl key whilst holding alt to obtain a reference to that component, using an existing one if possible
 # Menu item for creating a component reference
 actions.capture-focused-component=&Focused Component Reference
-actions.capture-focused-component.desc=Apply focus to a component in your application under test, then press the keystroke shortcut for this action to obtain a reference to that component, using an existing one if possible
+actions.capture-focused-component.desc=Apply focus to a component in your application under test, then double tap the ctrl key whilst holding alt and shift to obtain a reference to that component, using an existing one if possible
 #
 actions.force-capture-component=Component Reference (Force New)
 actions.force-capture-component.desc=Move the mouse pointer over a component in your application under test, then press the keystroke shortcut for this action to force a new reference to that component even if one already exists
 # Action to select a component in the hierarchy
 actions.select-component=&Select Component
-actions.select-component.desc=Move the mouse pointer over a component in your application under test, then press the keystroke shortcut for this action to select the component in the GUI hierarchy browser
+actions.select-component.desc=Move the mouse pointer over a component in your application under test, then double tap the ctrl key to select the component in the GUI hierarchy browser
 # Action to select a component in the hierarchy
 actions.select-focused-component=Select &Focused Component
-actions.select-focused-component.desc=Apply focus to a component in your application under test, then press the keystroke shortcut for this action to select the component in the GUI hierarchy browser
+actions.select-focused-component.desc=Apply focus to a component in your application under test, then double tap the ctrl key whilst holding shift to select the component in the GUI hierarchy browser
 # A key was found in default.properties but not in the default locale
 MissingTranslations=The translation is missing for the following resources:
 # A key was used but there is no value for it 

Modified: abbot/trunk/src/abbot/i18n/abbot.properties
===================================================================
--- abbot/trunk/src/abbot/i18n/abbot.properties	2012-12-12 17:17:40 UTC (rev 2853)
+++ abbot/trunk/src/abbot/i18n/abbot.properties	2013-01-30 13:42:50 UTC (rev 2854)
@@ -130,6 +130,8 @@
 tester.JTree.path_not_found=The tree path ''{0}'' was not found in tree: \n\n ''{1}''
 tester.JTree.path_not_shown=The tree path ''{0}'' was not shown in tree: \n\n ''{1}''
 tester.JTree.point_not_found=The point {0} is not within the JTree
+tester.JTree.row_not_selected=The item ''{0}'' was not selected - instead ''{2}'' in list: \n\n ''{1}''
+
 tester.JTabbedPane.invalid_index=The index ({0}) is not valid
 tester.JTabbedPane.invalid_name=The tab name ({0}) was not found
 tester.JTable.invalid_cell=The cell ({0},{1}) is not valid

Modified: abbot/trunk/src/abbot/tester/JTreeTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JTreeTester.java	2012-12-12 17:17:40 UTC (rev 2853)
+++ abbot/trunk/src/abbot/tester/JTreeTester.java	2013-01-30 13:42:50 UTC (rev 2854)
@@ -11,6 +11,7 @@
 
 import javax.swing.JLabel;
 import javax.swing.JTree;
+import javax.swing.event.TreeSelectionEvent;
 import javax.swing.tree.*;
 import javax.swing.plaf.basic.BasicTreeUI;
 
@@ -31,6 +32,7 @@
 import javax.accessibility.AccessibleText;
 
 import javax.swing.JComponent;
+import javax.swing.event.TreeSelectionListener;
 
 /** Provide operations on a JTree component.
     The JTree substructure is a "row", and JTreeLocation provides different
@@ -38,7 +40,7 @@
     <ul>
     <li>Select an item by row index
     <li>Select an item by tree path (the string representation of the full
-    path). 
+    path).
     </ul>
     @see abbot.tester.JTreeLocation
  */
@@ -365,8 +367,65 @@
             
         if (rect!=null)
         {
-            // NOTE: if there's no icon, this may start editing
-            actionClick(tree, rect.x + 1, rect.y + rect.height/2);
+            // Find out what the target row is
+            final int targetRow = ((JTreeLocation)loc).getRow(tree);
+            
+            class TemporaryTreeSelectionListener implements TreeSelectionListener {
+                
+                volatile boolean matched = false;
+                
+                @Override
+                public void valueChanged(TreeSelectionEvent e) {
+                    // If the tree matches, all well and good
+                    if (tree.getSelectionModel().isRowSelected(targetRow)) {
+                        matched = true;
+                    }
+                }
+            };
+            final TemporaryTreeSelectionListener tsl = new TemporaryTreeSelectionListener();
+            
+            
+            // Add listener, so we can wait until the tree item is checked
+            //
+            invokeAndWait(tree, new Runnable() {
+                             public void run() {
+                                 tree.getSelectionModel().addTreeSelectionListener(tsl);
+                             }
+                          });
+            try
+            {
+                // NOTE: if there's no icon, this may start editing
+                actionClick(tree, rect.x + 1, rect.y + rect.height/2);
+                
+                // Wait for the row to be selected at some point
+                //
+                
+                final Robot.ConditionEDTDecorator condition = new Robot.ConditionEDTDecorator(c, new Condition() {
+                    public boolean test() {
+                        return tsl.matched;
+                    }
+                
+                    public String toString() {
+                        return Strings.get("tester.JTree.row_not_selected", new Object[] { loc.toString(), dumpTree(tree),
+                        tree.getSelectionModel().getSelectionRows() });
+                    }
+                });
+
+
+                wait(condition, componentDelay/4);
+                
+                
+            }
+            finally {
+                // Remove listener
+                //
+                invokeAndWait(tree, new Runnable() {
+                                 public void run() {
+                                     tree.getSelectionModel().removeTreeSelectionListener(tsl);
+                                 }
+                              });
+                
+            }
         }
     }
 

Modified: abbot/trunk/test/abbot/tester/JTreeTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JTreeTesterTest.java	2012-12-12 17:17:40 UTC (rev 2853)
+++ abbot/trunk/test/abbot/tester/JTreeTesterTest.java	2013-01-30 13:42:50 UTC (rev 2854)
@@ -166,6 +166,35 @@
         assertEquals("Wrong row selected", tree.getPathForRow(row), paths[0]);
     }
 
+    public void testSelectRowGlassPane() {
+        int row = 1;
+        
+        // Set the glass pane, should make the select row fail
+        final JFrame frame = (JFrame)showFrame(scrollPane);
+        
+        getRobot().invokeAndWait(new Runnable() {
+                                     public void run() {
+                                         JPanel pane = (JPanel)frame.getGlassPane();
+                                         pane.setVisible(true);
+                                         pane.setLayout(new BorderLayout());
+                                         pane.setBackground(Color.RED);
+                                         pane.add(new JButton("Big Button"),BorderLayout.CENTER);
+                                     }
+                                 });
+            
+        try
+        {
+            tester.actionSelectRow(tree, new JTreeLocation(row));
+
+            assertTrue("Should fail as row is not selected", false);
+        }
+        catch (WaitTimedOutException wte)
+        {
+            TreePath[] paths = tree.getSelectionPaths();
+            assertTrue("Paths selected", paths == null);
+        }
+    }
+
     public void testSelectInvisibleRow() {
         showFrame(scrollPane);
         try {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2855
          http://abbot.svn.sourceforge.net/abbot/?rev=2855&view=rev
Author:   gdavison
Date:     2013-01-30 15:17:18 +0000 (Wed, 30 Jan 2013)
Log Message:
-----------
2012-01-30  Gerard Davison 
        * Improve JTreeTester with check to see if component already selected, along with matching unit test

Modified Paths:
--------------
    abbot/trunk/ChangeLog
    abbot/trunk/src/abbot/i18n/abbot.properties
    abbot/trunk/src/abbot/tester/JTreeTester.java
    abbot/trunk/test/abbot/tester/JTreeTesterTest.java

Modified: abbot/trunk/ChangeLog
===================================================================
--- abbot/trunk/ChangeLog	2013-01-30 13:42:50 UTC (rev 2854)
+++ abbot/trunk/ChangeLog	2013-01-30 15:17:18 UTC (rev 2855)
@@ -1,3 +1,6 @@
+2012-01-30  Gerard Davison 
+        * Improve JTreeTester with check to see if component already selected, along with matching unit test
+
 2012-01-28  Gerard Davison 
         * Check that the row was actually selected in JTreeTester, add unit test to make sure it fails properly
           in this case

Modified: abbot/trunk/src/abbot/i18n/abbot.properties
===================================================================
--- abbot/trunk/src/abbot/i18n/abbot.properties	2013-01-30 13:42:50 UTC (rev 2854)
+++ abbot/trunk/src/abbot/i18n/abbot.properties	2013-01-30 15:17:18 UTC (rev 2855)
@@ -131,6 +131,7 @@
 tester.JTree.path_not_shown=The tree path ''{0}'' was not shown in tree: \n\n ''{1}''
 tester.JTree.point_not_found=The point {0} is not within the JTree
 tester.JTree.row_not_selected=The item ''{0}'' was not selected - instead ''{2}'' in list: \n\n ''{1}''
+tester.JTree.row_not_selected_location=The item ''{0}'' was not selected as location on screen not found - instead ''{2}'' in list: \n\n ''{1}''
 
 tester.JTabbedPane.invalid_index=The index ({0}) is not valid
 tester.JTabbedPane.invalid_name=The tab name ({0}) was not found

Modified: abbot/trunk/src/abbot/tester/JTreeTester.java
===================================================================
--- abbot/trunk/src/abbot/tester/JTreeTester.java	2013-01-30 13:42:50 UTC (rev 2854)
+++ abbot/trunk/src/abbot/tester/JTreeTester.java	2013-01-30 15:17:18 UTC (rev 2855)
@@ -24,6 +24,7 @@
 
 import java.lang.reflect.Method;
 
+import java.util.Arrays;
 import java.util.concurrent.Callable;
 import java.util.concurrent.FutureTask;
 
@@ -351,6 +352,24 @@
         
         final Point where = whereF[0];
         
+        // Find out what the target row is
+        //
+        final int targetRow = ((JTreeLocation)loc).getRow(tree);
+        
+        // Check, if it is already selected then we can bail, always best to do this after
+        // we have made sure it is visible etc above.
+        //
+        if (Robot.callAndWait(tree, new Callable<Boolean>() {
+            @Override
+            public Boolean call() throws Exception {
+                return tree.isRowSelected(targetRow);
+            }
+        })) {
+            // We can just return as the row is already selected
+            return;
+        }
+        
+        
         Rectangle rect = Robot.callAndWait(tree, new Callable<Rectangle>() {
                 public Rectangle call() {
                     int row = tree.getRowForLocation(where.x, where.y);
@@ -367,8 +386,7 @@
             
         if (rect!=null)
         {
-            // Find out what the target row is
-            final int targetRow = ((JTreeLocation)loc).getRow(tree);
+            // Create a listener so we can monitor the selection
             
             class TemporaryTreeSelectionListener implements TreeSelectionListener {
                 
@@ -407,12 +425,17 @@
                 
                     public String toString() {
                         return Strings.get("tester.JTree.row_not_selected", new Object[] { loc.toString(), dumpTree(tree),
-                        tree.getSelectionModel().getSelectionRows() });
+                         Arrays.toString(tree.getSelectionModel().getSelectionRows()) });
                     }
                 });
 
 
-                wait(condition, componentDelay/4);
+                try {
+                    wait(condition, componentDelay/4);
+                }
+                catch (WaitTimedOutException wte) {
+                    throw wte;               
+                }
                 
                 
             }
@@ -427,6 +450,11 @@
                 
             }
         }
+        else {
+            
+            throw new ActionFailedException(Strings.get("tester.JTree.row_not_selected_location", new Object[] { loc.toString(), dumpTree(tree),
+                         Arrays.toString(tree.getSelectionModel().getSelectionRows()) }));
+        }
     }
 
     /** Select the given row.  If the row is already selected, does nothing.

Modified: abbot/trunk/test/abbot/tester/JTreeTesterTest.java
===================================================================
--- abbot/trunk/test/abbot/tester/JTreeTesterTest.java	2013-01-30 13:42:50 UTC (rev 2854)
+++ abbot/trunk/test/abbot/tester/JTreeTesterTest.java	2013-01-30 15:17:18 UTC (rev 2855)
@@ -166,6 +166,21 @@
         assertEquals("Wrong row selected", tree.getPathForRow(row), paths[0]);
     }
 
+    /**
+     * Check that the second select row is a no-op
+     */
+    public void testSelectRowTwice() {
+        int row = 1;
+        showFrame(scrollPane);
+        tester.actionSelectRow(tree, new JTreeLocation(row));
+        tester.actionSelectRow(tree, new JTreeLocation(row));
+        TreePath[] paths = tree.getSelectionPaths();
+        assertTrue("No paths selected", paths != null);
+        assertEquals("Wrong row count selected", 1, paths.length);
+        assertEquals("Wrong row selected", tree.getPathForRow(row), paths[0]);
+    }
+
+
     public void testSelectRowGlassPane() {
         int row = 1;
         

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.