src/org/netbeans/jemmy/operators/FrameOperator.java

@@ -28,11 +28,10 @@
 import java.awt.MenuBar;
 import java.util.Hashtable;
 
 import org.netbeans.jemmy.ComponentChooser;
 import org.netbeans.jemmy.FrameWaiter;
-import org.netbeans.jemmy.JemmyException;
 import org.netbeans.jemmy.JemmyProperties;
 import org.netbeans.jemmy.Outputable;
 import org.netbeans.jemmy.TestOut;
 import org.netbeans.jemmy.TimeoutExpiredException;
 import org.netbeans.jemmy.Timeouts;

@@ -273,11 +272,11 @@
     public void maximize() {
         output.printLine("Maximizing frame\n    " + toStringSource());
         output.printGolden("Maximizing frame");
         driver.maximize(this);
         if (getVerification()) {
-            waitState(Frame.NORMAL);
+            waitState(Frame.MAXIMIZED_BOTH);
         }
     }
 
     /**
      * Demaximizes the frame.

@@ -305,11 +304,11 @@
                 + Integer.toString(state)
                 + " state");
         waitState(new ComponentChooser() {
             @Override
             public boolean checkComponent(Component comp) {
-                return ((Frame) comp).getState() == state;
+                return ((Frame) comp).getExtendedState() == state;
             }
 
             @Override
             public String getDescription() {
                 return Integer.toString(state) + " state";

@@ -375,10 +374,23 @@
             }
         }));
     }
 
     /**
+     * Maps {@code Frame.getExtendedState()} through queue
+     * @return the state of the frame
+     */
+    public int getExtendedState() {
+        return (runMapping(new MapAction<Integer>("getExtendedState") {
+            @Override
+            public Integer map() {
+                return ((Frame) getSource()).getExtendedState();
+            }
+        }));
+    }
+
+    /**
      * Maps {@code Frame.getTitle()} through queue
      */
     public String getTitle() {
         return (runMapping(new MapAction<String>("getTitle") {
             @Override

@@ -447,10 +459,25 @@
             }
         });
     }
 
     /**
+     * Maps {@code Frame.setExtendedState(int)} through queue
+     * @param state of the frame
+     */
+    public void setExtendedState(final int state) {
+        runMapping(new MapAction<Void>("setExtendedState") {
+            @Override
+            public Void map() {
+                ((Frame) getSource()).setExtendedState(state);
+                return null;
+            }
+        });
+
+    }
+
+    /**
      * Maps {@code Frame.setTitle(String)} through queue
      */
     public void setTitle(final String string) {
         runMapping(new MapVoidAction("setTitle") {
             @Override

@@ -479,11 +506,12 @@
             FrameWaiter waiter = new FrameWaiter();
             waiter.setTimeouts(timeouts);
             waiter.setOutput(output);
             return waiter.waitFrame(new FrameFinder(chooser), index);
         } catch (InterruptedException e) {
-            throw new JemmyException("Interrupted while waiting for a frame with " + chooser + " and index = " + index, e);
+            output.printStackTrace(e);
+            return null;
         }
     }
 
     /**
      * Checks component type.