--- a/test/jdk/java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java Wed Mar 07 16:52:19 2018 +0530
+++ b/test/jdk/java/awt/Frame/MaximizedToIconified/MaximizedToIconified.java Wed Mar 07 17:05:28 2018 +0530
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,17 +22,14 @@
*/
/*
- @test
- @key headful
- @bug 4977491
- @summary State changes should always be reported as events
- @author anthony.petrov@...: area=awt.toplevel
- @library ../../regtesthelpers
- @build Util
- @run main MaximizedToIconified
-*/
+ * @test
+ * @key headful
+ * @bug 4977491 8160767
+ * @summary State changes should always be reported as events
+ * @run main MaximizedToIconified
+ */
-/**
+/*
* MaximizedToIconified.java
*
* summary: Invoking setExtendedState(ICONIFIED) on a maximized
@@ -40,395 +37,92 @@
* states in the newState of the state change event.
*/
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
-import test.java.awt.regtesthelpers.Util;
-
+import java.awt.Frame;
+import java.awt.Robot;
+import java.awt.Toolkit;
+import java.awt.event.WindowEvent;
+import java.awt.event.WindowStateListener;
public class MaximizedToIconified
{
static volatile int lastFrameState = Frame.NORMAL;
static volatile boolean failed = false;
static volatile Toolkit myKit;
+ private static Robot robot;
- private static void checkState(Frame f, int state) {
- f.setExtendedState(state);
- Util.waitForIdle(null);
+ private static void checkState(Frame frame, int state) {
+ frame.setExtendedState(state);
+ robot.waitForIdle();
+ robot.delay(100);
- System.out.println("state = " + state + "; getExtendedState() = " + f.getExtendedState());
+ System.out.println("state = " + state + "; getExtendedState() = " + frame.getExtendedState());
if (failed) {
- MaximizedToIconified.fail("getOldState() != previous getNewState() in WINDOW_STATE_CHANGED event.");
- }
- if (lastFrameState != f.getExtendedState()) {
- MaximizedToIconified.fail("getExtendedState() != last getNewState() in WINDOW_STATE_CHANGED event.");
+ frame.dispose();
+ throw new RuntimeException("getOldState() != previous getNewState() in WINDOW_STATE_CHANGED event.");
}
- if (f.getExtendedState() != state) {
- MaximizedToIconified.fail("getExtendedState() != " + state + " as expected.");
+ if (lastFrameState != frame.getExtendedState()) {
+ frame.dispose();
+ throw new RuntimeException("getExtendedState() != last getNewState() in WINDOW_STATE_CHANGED event.");
}
- // Plain return means the check passed
+ if (frame.getExtendedState() != state) {
+ frame.dispose();
+ throw new RuntimeException("getExtendedState() != " + state + " as expected.");
+ }
}
- private static void examineStates(Frame f_arg, int states[]) {
- Frame f = f_arg;
+ private static void examineStates(int states[]) {
+
+ Frame frame = new Frame("test");
+ frame.setSize(200, 200);
+ frame.setVisible(true);
- if (f == null) {
- f = new Frame("test");
- f.setSize(200, 200);
- f.setVisible(true);
- }
+ robot.waitForIdle();
- Util.waitForIdle(null);
-
- f.addWindowStateListener(new WindowStateListener() {
+ frame.addWindowStateListener(new WindowStateListener() {
public void windowStateChanged(WindowEvent e) {
- System.out.println("last = " + lastFrameState + "; getOldState() = " + e.getOldState() + "; getNewState() = " + e.getNewState());
+ System.out.println("last = " + lastFrameState + "; getOldState() = " + e.getOldState() +
+ "; getNewState() = " + e.getNewState());
if (e.getOldState() == lastFrameState) {
lastFrameState = e.getNewState();
} else {
- System.out.println("Wrong getOldState(): expected = " + lastFrameState + "; received = " + e.getOldState());
+ System.out.println("Wrong getOldState(): expected = " + lastFrameState + "; received = " +
+ e.getOldState());
failed = true;
}
}
});
- for (int state: states) {
+ for (int state : states) {
if (myKit.isFrameStateSupported(state)) {
- checkState(f, state);
+ checkState(frame, state);
} else {
System.out.println("Frame state = " + state + " is NOT supported by the native system. The state is skipped.");
}
}
- if (f_arg == null) {
- f.dispose();
+ if (frame != null) {
+ frame.dispose();
}
}
- private static void init()
- {
- String[] instructions =
- {
- "This is an AUTOMATIC test, simply wait until it is done.",
- "The result (passed or failed) will be shown in the",
- "message window below."
- };
- Sysout.createDialog( );
- Sysout.printInstructions( instructions );
+ private static void doTest() {
myKit = Toolkit.getDefaultToolkit();
// NOTE! Compound states (like MAXIMIZED_BOTH | ICONIFIED) CANNOT be used,
// because Toolkit.isFrameStateSupported() method reports these states
// as not supported. And such states will simply be skipped.
- examineStates(null, new int[] {Frame.MAXIMIZED_BOTH, Frame.ICONIFIED, Frame.NORMAL});
- examineStates(null, new int[] {Frame.ICONIFIED, Frame.MAXIMIZED_BOTH, Frame.NORMAL});
-
-
- MaximizedToIconified.pass();
-
- }//End init()
-
-
-
- /*****************************************************
- * Standard Test Machinery Section
- * DO NOT modify anything in this section -- it's a
- * standard chunk of code which has all of the
- * synchronisation necessary for the test harness.
- * By keeping it the same in all tests, it is easier
- * to read and understand someone else's test, as
- * well as insuring that all tests behave correctly
- * with the test harness.
- * There is a section following this for test-
- * classes
- ******************************************************/
- private static boolean theTestPassed = false;
- private static boolean testGeneratedInterrupt = false;
- private static String failureMessage = "";
-
- private static Thread mainThread = null;
-
- private static int sleepTime = 300000;
-
- // Not sure about what happens if multiple of this test are
- // instantiated in the same VM. Being static (and using
- // static vars), it aint gonna work. Not worrying about
- // it for now.
- public static void main( String args[] ) throws InterruptedException
- {
- mainThread = Thread.currentThread();
- try
- {
- init();
- }
- catch( TestPassedException e )
- {
- //The test passed, so just return from main and harness will
- // interepret this return as a pass
- return;
- }
- //At this point, neither test pass nor test fail has been
- // called -- either would have thrown an exception and ended the
- // test, so we know we have multiple threads.
+ examineStates(new int[] {Frame.MAXIMIZED_BOTH, Frame.ICONIFIED, Frame.NORMAL});
+ examineStates(new int[] {Frame.ICONIFIED, Frame.MAXIMIZED_BOTH, Frame.NORMAL});
- //Test involves other threads, so sleep and wait for them to
- // called pass() or fail()
- try
- {
- Thread.sleep( sleepTime );
- //Timed out, so fail the test
- throw new RuntimeException( "Timed out after " + sleepTime/1000 + " seconds" );
- }
- catch (InterruptedException e)
- {
- //The test harness may have interrupted the test. If so, rethrow the exception
- // so that the harness gets it and deals with it.
- if( ! testGeneratedInterrupt ) throw e;
-
- //reset flag in case hit this code more than once for some reason (just safety)
- testGeneratedInterrupt = false;
-
- if ( theTestPassed == false )
- {
- throw new RuntimeException( failureMessage );
- }
- }
-
- }//main
-
- public static synchronized void setTimeoutTo( int seconds )
- {
- sleepTime = seconds * 1000;
- }
-
- public static synchronized void pass()
- {
- Sysout.println( "The test passed." );
- Sysout.println( "The test is over, hit Ctl-C to stop Java VM" );
- //first check if this is executing in main thread
- if ( mainThread == Thread.currentThread() )
- {
- //Still in the main thread, so set the flag just for kicks,
- // and throw a test passed exception which will be caught
- // and end the test.
- theTestPassed = true;
- throw new TestPassedException();
- }
- theTestPassed = true;
- testGeneratedInterrupt = true;
- mainThread.interrupt();
- }//pass()
-
- public static synchronized void fail()
- {
- //test writer didn't specify why test failed, so give generic
- fail( "it just plain failed! :-)" );
}
- public static synchronized void fail( String whyFailed )
+ public static void main( String args[] ) throws Exception
{
- Sysout.println( "The test failed: " + whyFailed );
- Sysout.println( "The test is over, hit Ctl-C to stop Java VM" );
- //check if this called from main thread
- if ( mainThread == Thread.currentThread() )
- {
- //If main thread, fail now 'cause not sleeping
- throw new RuntimeException( whyFailed );
- }
- theTestPassed = false;
- testGeneratedInterrupt = true;
- failureMessage = whyFailed;
- mainThread.interrupt();
- }//fail()
-
-}// class MaximizedToIconified
-
-//This exception is used to exit from any level of call nesting
-// when it's determined that the test has passed, and immediately
-// end the test.
-class TestPassedException extends RuntimeException
-{
-}
-
-//*********** End Standard Test Machinery Section **********
-
-
-//************ Begin classes defined for the test ****************
-
-// if want to make listeners, here is the recommended place for them, then instantiate
-// them in init()
-
-/* Example of a class which may be written as part of a test
-class NewClass implements anInterface
- {
- static int newVar = 0;
-
- public void eventDispatched(AWTEvent e)
- {
- //Counting events to see if we get enough
- eventCount++;
-
- if( eventCount == 20 )
- {
- //got enough events, so pass
+ robot = new Robot();
+ doTest();
- MaximizedToIconified.pass();
- }
- else if( tries == 20 )
- {
- //tried too many times without getting enough events so fail
-
- MaximizedToIconified.fail();
- }
-
- }// eventDispatched()
-
- }// NewClass class
-
-*/
-
-
-//************** End classes defined for the test *******************
-
-
-
-
-/****************************************************
- Standard Test Machinery
- DO NOT modify anything below -- it's a standard
- chunk of code whose purpose is to make user
- interaction uniform, and thereby make it simpler
- to read and understand someone else's test.
- ****************************************************/
-
-/**
- This is part of the standard test machinery.
- It creates a dialog (with the instructions), and is the interface
- for sending text messages to the user.
- To print the instructions, send an array of strings to Sysout.createDialog
- WithInstructions method. Put one line of instructions per array entry.
- To display a message for the tester to see, simply call Sysout.println
- with the string to be displayed.
- This mimics System.out.println but works within the test harness as well
- as standalone.
- */
-
-class Sysout
-{
- private static TestDialog dialog;
-
- public static void createDialogWithInstructions( String[] instructions )
- {
- dialog = new TestDialog( new Frame(), "Instructions" );
- dialog.printInstructions( instructions );
- dialog.setVisible(true);
- println( "Any messages for the tester will display here." );
}
- public static void createDialog( )
- {
- dialog = new TestDialog( new Frame(), "Instructions" );
- String[] defInstr = { "Instructions will appear here. ", "" } ;
- dialog.printInstructions( defInstr );
- dialog.setVisible(true);
- println( "Any messages for the tester will display here." );
- }
-
-
- public static void printInstructions( String[] instructions )
- {
- dialog.printInstructions( instructions );
- }
-
-
- public static void println( String messageIn )
- {
- dialog.displayMessage( messageIn );
- System.out.println(messageIn);
- }
-
-}// Sysout class
-
-/**
- This is part of the standard test machinery. It provides a place for the
- test instructions to be displayed, and a place for interactive messages
- to the user to be displayed.
- To have the test instructions displayed, see Sysout.
- To have a message to the user be displayed, see Sysout.
- Do not call anything in this dialog directly.
- */
-class TestDialog extends Dialog
-{
-
- TextArea instructionsText;
- TextArea messageText;
- int maxStringLength = 80;
-
- //DO NOT call this directly, go through Sysout
- public TestDialog( Frame frame, String name )
- {
- super( frame, name );
- int scrollBoth = TextArea.SCROLLBARS_BOTH;
- instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth );
- add( "North", instructionsText );
-
- messageText = new TextArea( "", 5, maxStringLength, scrollBoth );
- add("Center", messageText);
-
- pack();
-
- setVisible(true);
- }// TestDialog()
-
- //DO NOT call this directly, go through Sysout
- public void printInstructions( String[] instructions )
- {
- //Clear out any current instructions
- instructionsText.setText( "" );
-
- //Go down array of instruction strings
-
- String printStr, remainingStr;
- for( int i=0; i < instructions.length; i++ )
- {
- //chop up each into pieces maxSringLength long
- remainingStr = instructions[ i ];
- while( remainingStr.length() > 0 )
- {
- //if longer than max then chop off first max chars to print
- if( remainingStr.length() >= maxStringLength )
- {
- //Try to chop on a word boundary
- int posOfSpace = remainingStr.
- lastIndexOf( ' ', maxStringLength - 1 );
-
- if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1;
-
- printStr = remainingStr.substring( 0, posOfSpace + 1 );
- remainingStr = remainingStr.substring( posOfSpace + 1 );
- }
- //else just print
- else
- {
- printStr = remainingStr;
- remainingStr = "";
- }
-
- instructionsText.append( printStr + "\n" );
-
- }// while
-
- }// for
-
- }//printInstructions()
-
- //DO NOT call this directly, go through Sysout
- public void displayMessage( String messageIn )
- {
- messageText.append( messageIn + "\n" );
- System.out.println(messageIn);
- }
-
-}// TestDialog class
+}