Skip to content

Commit

Permalink
8315883: Open source several Swing JToolbar tests
Browse files Browse the repository at this point in the history
Reviewed-by: honkar, aivanov
  • Loading branch information
Damon Nguyen committed Sep 19, 2023
1 parent 0c97246 commit 62c0a1b
Show file tree
Hide file tree
Showing 4 changed files with 199 additions and 0 deletions.
59 changes: 59 additions & 0 deletions test/jdk/javax/swing/JToolBar/bug4138694.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*
* Copyright (c) 1999, 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.
*/

/* @test
* @bug 4138694
* @summary When adding an Action object to a toolbar, the Action object's
* SHORT_DESCRIPTION property (if present) should be automatically used
* for toolTip text.
* @run main bug4138694
*/

import java.awt.event.ActionEvent;

import javax.swing.AbstractAction;
import javax.swing.Action;
import javax.swing.JComponent;
import javax.swing.JToolBar;
import javax.swing.SwingUtilities;

public class bug4138694 {
public static final String actionName = "Action";

private static class MyAction extends AbstractAction {
public void actionPerformed(ActionEvent e) {}
}

public static void main(String[] args) throws Exception {
SwingUtilities.invokeAndWait(() -> {
JToolBar jtb = new JToolBar();
MyAction aa = new MyAction();
aa.putValue(Action.SHORT_DESCRIPTION, actionName);
jtb.add(aa);
JComponent c = (JComponent)jtb.getComponentAtIndex(0);
if (!c.getToolTipText().equals(actionName)) {
throw new RuntimeException("ToolTip not set automatically...");
}
});
}
}
42 changes: 42 additions & 0 deletions test/jdk/javax/swing/JToolBar/bug4140421.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
/*
* Copyright (c) 1999, 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.
*/

/* @test
* @bug 4140421
* @summary Tests JToolBar set title correctly
* @run main bug4140421
*/

import javax.swing.JToolBar;
import javax.swing.SwingUtilities;

public class bug4140421 {
public static void main(String[] args) throws Exception {
SwingUtilities.invokeAndWait(() -> {
JToolBar tb = new JToolBar("MyToolBar");
if (!tb.getName().equals("MyToolBar")) {
throw new RuntimeException("Title of JToolBar set incorrectly...");
}
});
}
}
48 changes: 48 additions & 0 deletions test/jdk/javax/swing/JToolBar/bug4196662.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
* Copyright (c) 1999, 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.
*/

/* @test
* @bug 4196662
* @summary JToolBar has remove(int) method.
* @run main bug4196662
*/

import javax.swing.JButton;
import javax.swing.JToolBar;
import javax.swing.SwingUtilities;

public class bug4196662 {
public static void main(String[] args) throws Exception {
SwingUtilities.invokeAndWait(() -> {
JToolBar tb = new JToolBar();
tb.add(new JButton("Button1"));
JButton bt2 = new JButton("Button2");
tb.add(bt2);
tb.add(new JButton("Button3"));
tb.remove(1);
if (tb.getComponentCount() != 2 || tb.getComponent(1) == bt2) {
throw new RuntimeException("Component wasn't removed...");
}
});
}
}
50 changes: 50 additions & 0 deletions test/jdk/javax/swing/JToolBar/bug4243930.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* Copyright (c) 1999, 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.
*/

/* @test
* @bug 4243930
* @summary Tests that JToolBar.remove() does not throw StackOverflowError
* @run main bug4243930
*/

import java.awt.event.ActionEvent;

import javax.swing.AbstractAction;
import javax.swing.JButton;
import javax.swing.JToolBar;
import javax.swing.SwingUtilities;

public class bug4243930 {

private static class NullAction extends AbstractAction {
public void actionPerformed(ActionEvent e){}
}

public static void main(String[] args) throws Exception {
SwingUtilities.invokeAndWait(() -> {
JToolBar tb = new JToolBar();
JButton test = tb.add(new NullAction());
tb.remove(test);
});
}
}

5 comments on commit 62c0a1b

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 62c0a1b Dec 20, 2024

Choose a reason for hiding this comment

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

/backport jdk21u-dev

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 62c0a1b Dec 20, 2024

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 62c0a1b Dec 20, 2024

Choose a reason for hiding this comment

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

@GoeLin the backport was successfully created on the branch backport-GoeLin-62c0a1b9-master 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 62c0a1b9 from the openjdk/jdk repository.

The commit being backported was authored by Damon Nguyen on 19 Sep 2023 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-GoeLin-62c0a1b9-master:backport-GoeLin-62c0a1b9-master
$ git checkout backport-GoeLin-62c0a1b9-master
# 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-GoeLin-62c0a1b9-master

@openjdk
Copy link

@openjdk openjdk bot commented on 62c0a1b Dec 20, 2024

Choose a reason for hiding this comment

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

@GoeLin the backport was successfully created on the branch backport-GoeLin-62c0a1b9-master 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 62c0a1b9 from the openjdk/jdk repository.

The commit being backported was authored by Damon Nguyen on 19 Sep 2023 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-GoeLin-62c0a1b9-master:backport-GoeLin-62c0a1b9-master
$ git checkout backport-GoeLin-62c0a1b9-master
# 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-GoeLin-62c0a1b9-master

Please sign in to comment.