Skip to content

Commit

Permalink
8316240: Open source several add/remove MenuBar manual tests
Browse files Browse the repository at this point in the history
Reviewed-by: honkar, psadhukhan
  • Loading branch information
Alexander Zvegintsev committed Sep 21, 2023
1 parent 38bf119 commit 3809d69
Show file tree
Hide file tree
Showing 4 changed files with 514 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
/*
* Copyright (c) 1998, 2023, 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.
*/

import java.awt.Frame;
import java.awt.Menu;
import java.awt.MenuBar;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.SwingUtilities;

/*
* @test
* @bug 4028130
* @summary Test dynamically adding and removing a menu bar
* @library /java/awt/regtesthelpers
* @build PassFailJFrame
* @run main/manual AddRemoveMenuBarTest_1
*/

public class AddRemoveMenuBarTest_1 {

private static final String INSTRUCTIONS = """
An initially empty frame should appear.
Click anywhere in the frame to add a menu bar at the top of the frame.
Click again to replace the menu bar with another menu bar.
Each menu bar has one (empty) menu, labelled with the
number of the menu bar appearing.
After a menubar is added, the frame should not be resized nor repositioned
on the screen;
it should have the same size and position.
Upon test completion, click Pass or Fail appropriately.
""";

public static void main(String[] args) throws Exception {
PassFailJFrame passFailJFrame = new PassFailJFrame.Builder()
.title("AddRemoveMenuBarTest_1 Instructions")
.instructions(INSTRUCTIONS)
.testTimeOut(5)
.rows(18)
.columns(45)
.build();

SwingUtilities.invokeAndWait(() -> {
AddRemoveMenuBar_1 frame = new AddRemoveMenuBar_1();

PassFailJFrame.addTestWindow(frame);
PassFailJFrame.positionTestWindow(frame,
PassFailJFrame.Position.HORIZONTAL);

frame.setVisible(true);
});

passFailJFrame.awaitAndCheck();
}
}

class AddRemoveMenuBar_1 extends Frame {
int menuCount;

AddRemoveMenuBar_1() {
super("AddRemoveMenuBar_1");
setSize(200, 200);
menuCount = 0;

addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
setMenuBar();
}
});
}

void setMenuBar() {
MenuBar bar = new MenuBar();
bar.add(new Menu(Integer.toString(menuCount++)));
setMenuBar(bar);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
/*
* Copyright (c) 1998, 2023, 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.
*/

import java.awt.Frame;
import java.awt.Menu;
import java.awt.MenuBar;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.SwingUtilities;

/*
* @test
* @bug 4028130
* @key headful
* @summary Test dynamically adding and removing a menu bar
* @library /java/awt/regtesthelpers
* @build PassFailJFrame
* @run main/manual AddRemoveMenuBarTest_2
*/

public class AddRemoveMenuBarTest_2 {
private static final String INSTRUCTIONS = """
A frame with a menu bar appears.
Click anywhere in the frame to replace the menu bar with
another one.
Each menu bar has one (empty) menu, 'foo'.
After the menu bar replacement, the containing frame
should not be resized nor repositioned on the screen.
Upon test completion, click Pass or Fail appropriately.
""";

public static void main(String[] args) throws Exception {
PassFailJFrame passFailJFrame = new PassFailJFrame.Builder()
.title("AddRemoveMenuBarTest_2 Instructions")
.instructions(INSTRUCTIONS)
.testTimeOut(5)
.rows(15)
.columns(45)
.build();

SwingUtilities.invokeAndWait(() -> {
AddRemoveMenuBar_2 frame = new AddRemoveMenuBar_2();

PassFailJFrame.addTestWindow(frame);
PassFailJFrame.positionTestWindow(frame,
PassFailJFrame.Position.HORIZONTAL);

frame.setVisible(true);
});

passFailJFrame.awaitAndCheck();
}
}

class AddRemoveMenuBar_2 extends Frame {
AddRemoveMenuBar_2() {
super("AddRemoveMenuBar_2");
setSize(200, 200);
setMenuBar();
addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
setMenuBar();
}
});
}

int count = 0;

void setMenuBar() {
MenuBar bar = new MenuBar();
bar.add(new Menu("foo " + count++));
super.setMenuBar(bar);
}
}

1 comment on commit 3809d69

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.