From 03c25b15eb73e594d1329be397cd34e206d2682b Mon Sep 17 00:00:00 2001 From: Alexander Zuev Date: Wed, 20 Mar 2024 13:40:57 +0000 Subject: [PATCH] 8328367: Convert java/awt/Component/UpdatingBootTime test to main Reviewed-by: dnguyen, psadhukhan --- .../java/awt/Component/UpdatingBootTime.java | 98 ++++++++ .../UpdatingBootTime/UpdatingBootTime.html | 43 ---- .../UpdatingBootTime/UpdatingBootTime.java | 222 ------------------ 3 files changed, 98 insertions(+), 265 deletions(-) create mode 100644 test/jdk/java/awt/Component/UpdatingBootTime.java delete mode 100644 test/jdk/java/awt/Component/UpdatingBootTime/UpdatingBootTime.html delete mode 100644 test/jdk/java/awt/Component/UpdatingBootTime/UpdatingBootTime.java diff --git a/test/jdk/java/awt/Component/UpdatingBootTime.java b/test/jdk/java/awt/Component/UpdatingBootTime.java new file mode 100644 index 00000000000..ee72d70e94b --- /dev/null +++ b/test/jdk/java/awt/Component/UpdatingBootTime.java @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2007, 2024, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* + * @test + * @bug 6461933 7194219 + * @summary adjust system boot time in nowMillisUTC() frequently + * @library /java/awt/regtesthelpers + * @build PassFailJFrame + * @run main/manual UpdatingBootTime + */ + +/* + * Test verifies that time updated by the system is correctly + * picked up by the Java application. + */ + +import java.awt.BorderLayout; +import java.awt.Button; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.lang.reflect.InvocationTargetException; +import java.util.Date; +import javax.swing.JFrame; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; + +public class UpdatingBootTime { + private static JFrame initialize () { + JFrame frame = new JFrame("Updating Boot Time Test Frame"); + frame.setLayout(new BorderLayout()); + JTextArea textOutput = new JTextArea("Events on the button:", 14, 40); + textOutput.setLineWrap(true); + JScrollPane textScrollPane = new JScrollPane(textOutput); + frame.add(textScrollPane, BorderLayout.CENTER); + Button b = new Button("Press me"); + frame.add(b, BorderLayout.NORTH); + b.addMouseListener(new MouseAdapter() { + public void mousePressed(MouseEvent e) { + textOutput.append("\nEvent occurred : " + e); + textOutput.append("\nThe event time is : " + (new Date(e.getWhen()))); + textOutput.append("\nThe system time is : " + (new Date())); + textOutput.append("\n------------------------------------"); + textOutput.setCaretPosition(textOutput.getText().length()); + } + }); + frame.pack(); + return frame; + } + + public static void main(String[] args) throws InterruptedException, + InvocationTargetException { + String instructions = + """ + 1) In the test window press "Press me" button. + 2) Two timestamps should be printed. + 3) Verify that they are not differ a lot: + it is okay to observe a 1 or 2 seconds difference. + 4) Change the system time significantly (by a month or a year) + by using the OS abilities. + 5) Click on the button once again. + 6) Printed times should still be the same. + Pay attention to the Month/Year if they were changed. + 7) It is okay to observe a 1 or 2 seconds difference and this is not a fail. + 8) If the difference is more then 1-2 seconds noticed press fail, + otherwise press pass. + """; + + PassFailJFrame.builder() + .title("Updating Boot Time Test Instructions") + .instructions(instructions) + .rows((int) instructions.lines().count() + 1) + .columns(40) + .testUI(UpdatingBootTime::initialize) + .build() + .awaitAndCheck(); + } +} diff --git a/test/jdk/java/awt/Component/UpdatingBootTime/UpdatingBootTime.html b/test/jdk/java/awt/Component/UpdatingBootTime/UpdatingBootTime.html deleted file mode 100644 index 56627320dbb..00000000000 --- a/test/jdk/java/awt/Component/UpdatingBootTime/UpdatingBootTime.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - UpdatingBootTime - - - -

UpdatingBootTime
Bug ID:

- -

See the dialog box (usually in upper left corner) for instructions

- - - - diff --git a/test/jdk/java/awt/Component/UpdatingBootTime/UpdatingBootTime.java b/test/jdk/java/awt/Component/UpdatingBootTime/UpdatingBootTime.java deleted file mode 100644 index 3a8479a5db7..00000000000 --- a/test/jdk/java/awt/Component/UpdatingBootTime/UpdatingBootTime.java +++ /dev/null @@ -1,222 +0,0 @@ -/* - * Copyright (c) 2007, 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 - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - test - @bug 6461933 7194219 - @summary adjust system boot time in nowMillisUTC() frequently - @author Andrei Dmitriev : area=awt.component - @run applet/manual=yesno UpdatingBootTime.html - */ - -/* - * verifies that time updated by the system is picked up by the Java App. - */ - -import java.applet.Applet; -import java.awt.*; -import java.awt.event.*; -import java.util.Date; - -public class UpdatingBootTime extends Applet -{ - //Declare things used in the test, like buttons and labels here - - public void init() - { - this.setLayout (new BorderLayout ()); - - String[] instructions = - { - "1) Press the mouse over the button.", - "2) A two timestamps would be printed.", - "3) Verify that they are not differ a lot: it is okay to observe a 1 or 2 seconds difference.", - "4) Change the system time significantly(by a month or a year) by using the OS abilities.", - "5) Click on the button once again.", - "6) Printed times should still be the same. Pay attention to the Month/Year if they were changed.", - "7) It is okay to observe a 1 or 2 seconds difference and this is not a fail.", - "8) If the difference is more then 1-2 seconds noticed then the test fail; otherwise pass." - }; - Sysout.createDialogWithInstructions( instructions ); - - }//End init() - - public void start () - { - Button b = new Button("Press me"); - b.addMouseListener(new MouseAdapter(){ - public void mousePressed(MouseEvent e){ - Sysout.println("Event occured : "+e); - Sysout.println("The event time is : "+ (new Date(e.getWhen()))); - Sysout.println("The system time is : "+ (new Date())); - } - }); - add(b); - setSize (200,200); - setVisible(true); - validate(); - }// start() -}// class UpdatingBootTime - -/* Place other classes related to the test after this line */ - - - - - -/**************************************************** - 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 ); - } - -}// 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