Skip to content

Commit

Permalink
8320342: Use PassFailJFrame for TruncatedPopupMenuTest.java
Browse files Browse the repository at this point in the history
Reviewed-by: honkar, aivanov
  • Loading branch information
rajamah authored and aivanov-jdk committed Jan 31, 2024
1 parent 2cd1ba6 commit 1f2922a
Showing 1 changed file with 93 additions and 0 deletions.
93 changes: 93 additions & 0 deletions test/jdk/java/awt/PopupMenu/TruncatedPopupMenuTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
/*
* Copyright (c) 2004, 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.
*/

import java.awt.Frame;
import java.awt.Menu;
import java.awt.MenuItem;
import java.awt.PopupMenu;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;

/*
* @test
* @bug 5090643
* @key headful
* @library /java/awt/regtesthelpers
* @build PassFailJFrame
* @summary Menus added to the popup menu are truncated on XToolkit
* @run main/manual TruncatedPopupMenuTest
*/

public class TruncatedPopupMenuTest {
private static final String INSTRUCTIONS =
"1. Right-click on the Test Window.\n\n" +
"2. Look at the appeared popup menu.\n\n" +
"3. It should consist of one menu item (\"First simple menu item\")\n" +
"and one submenu (\"Just simple menu for the test\").\n\n" +
"4. The submenu should not be truncated. The submenu title text should\n" +
"be followed by a triangle. On the whole, menu should be good-looking.\n\n" +
"5. Left-click on the submenu (\"Just simple menu for the test\").\n" +
"After this operation, a submenu should popup. It should consist of\n"+
"one menu item (\"Second simple menu item \") and one submenu (\"Other Menu\").\n\n" +
"6. The submenu should not be truncated. The \"Other Menu\" text should be followed by\n" +
"a triangle.\n\n" +
"On the whole, menu should be good-looking.\n";

public static void main(String[] args) throws Exception {
PassFailJFrame.builder()
.instructions(INSTRUCTIONS)
.rows(20)
.columns(55)
.testUI(TruncatedPopupMenuTest::createTestUI)
.build()
.awaitAndCheck();
}

private static Frame createTestUI() {
Menu subMenu = new Menu("Just simple menu for the test");
subMenu.add(new MenuItem("Second simple menu item"));
subMenu.add(new Menu("Other Menu"));

PopupMenu popup = new PopupMenu();
popup.add(new MenuItem("First simple menu item"));
popup.add(subMenu);

Frame testUI = new Frame("TruncatedPopupMenuTest");
testUI.add(popup);
testUI.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent me) {
if (me.isPopupTrigger()) {
popup.show(me.getComponent(), me.getX(), me.getY());
}
}
public void mouseReleased(MouseEvent me) {
if (me.isPopupTrigger()) {
popup.show(me.getComponent(), me.getX(), me.getY());
}
}
});

testUI.setSize(400, 400);
return testUI;
}
}

7 comments on commit 1f2922a

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@luchenlin
Copy link

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 1f2922a Feb 26, 2024

Choose a reason for hiding this comment

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

@luchenlin the backport was successfully created on the branch backport-luchenlin-1f2922ad in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 1f2922ad from the openjdk/jdk repository.

The commit being backported was authored by Rajat Mahajan on 31 Jan 2024 and was reviewed by Harshitha Onkar and Alexey Ivanov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:

$ git fetch https://github.com/openjdk-bots/jdk21u-dev.git backport-luchenlin-1f2922ad:backport-luchenlin-1f2922ad
$ git checkout backport-luchenlin-1f2922ad
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u-dev.git backport-luchenlin-1f2922ad

@luchenlin
Copy link

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 1f2922a Feb 26, 2024

Choose a reason for hiding this comment

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

@luchenlin the backport was successfully created on the branch backport-luchenlin-1f2922ad in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 1f2922ad from the openjdk/jdk repository.

The commit being backported was authored by Rajat Mahajan on 31 Jan 2024 and was reviewed by Harshitha Onkar and Alexey Ivanov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git backport-luchenlin-1f2922ad:backport-luchenlin-1f2922ad
$ git checkout backport-luchenlin-1f2922ad
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git backport-luchenlin-1f2922ad

@luchenlin
Copy link

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 1f2922a Feb 26, 2024

Choose a reason for hiding this comment

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

@luchenlin the backport was successfully created on the branch backport-luchenlin-1f2922ad in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 1f2922ad from the openjdk/jdk repository.

The commit being backported was authored by Rajat Mahajan on 31 Jan 2024 and was reviewed by Harshitha Onkar and Alexey Ivanov.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev.git backport-luchenlin-1f2922ad:backport-luchenlin-1f2922ad
$ git checkout backport-luchenlin-1f2922ad
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev.git backport-luchenlin-1f2922ad

Please sign in to comment.