Skip to content

Commit

Permalink
8285373: Create an automated test for JDK-4702233
Browse files Browse the repository at this point in the history 
Reviewed-by: serb
  • Loading branch information
@mrserb
Srinivas Mandalika authored and mrserb committed Jun 3, 2022
1 parent a7e07fd commit 6f526e1
Show file tree
Hide file tree
Showing 6 changed files with 415 additions and 0 deletions.
44 changes: 44 additions & 0 deletions test/jdk/javax/accessibility/4702233/AccessibleActionConstants.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
* Copyright (c) 2010, 2022, 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.
*/

/*
* @summary Constant for testing public fields in AccessibleAction.
*/

public interface AccessibleActionConstants {

String CLASS_NAME = "javax.accessibility.AccessibleAction";

/**
* Public fields values in AccessibleAction class.
*/
String[][] FIELDS =
new String[][] { { "CLICK", "click" }, { "DECREMENT", "decrement" },
{ "INCREMENT", "increment" }, { "TOGGLE_EXPAND", "toggleexpand" },
{ "TOGGLE_POPUP", "toggle popup" } };
/**
* Old(removed) fields in AccessibleAction class.
*/
String[] OLD_FIELDS = new String[] {};
}

71 changes: 71 additions & 0 deletions test/jdk/javax/accessibility/4702233/AccessibleContextConstants.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/*
* Copyright (c) 2010, 2022, 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.
*/

/*
* @summary Constant for testing public fields in AccessibleContext.
*/

public interface AccessibleContextConstants {

String CLASS_NAME = "javax.accessibility.AccessibleContext";

/**
* Public fields values in AccessibleContext class.
*/
String[][] FIELDS = new String[][] {
{ "ACCESSIBLE_NAME_PROPERTY", "AccessibleName" },
{ "ACCESSIBLE_DESCRIPTION_PROPERTY", "AccessibleDescription" },
{ "ACCESSIBLE_STATE_PROPERTY", "AccessibleState" },
{ "ACCESSIBLE_VALUE_PROPERTY", "AccessibleValue" },
{ "ACCESSIBLE_SELECTION_PROPERTY", "AccessibleSelection" },
{ "ACCESSIBLE_CARET_PROPERTY", "AccessibleCaret" },
{ "ACCESSIBLE_VISIBLE_DATA_PROPERTY", "AccessibleVisibleData" },
{ "ACCESSIBLE_CHILD_PROPERTY", "AccessibleChild" },
{ "ACCESSIBLE_ACTIVE_DESCENDANT_PROPERTY",
"AccessibleActiveDescendant" },
{ "ACCESSIBLE_TABLE_CAPTION_CHANGED", "accessibleTableCaptionChanged" },
{ "ACCESSIBLE_TABLE_SUMMARY_CHANGED", "accessibleTableSummaryChanged" },
{ "ACCESSIBLE_TABLE_MODEL_CHANGED", "accessibleTableModelChanged" },
{ "ACCESSIBLE_TABLE_ROW_HEADER_CHANGED",
"accessibleTableRowHeaderChanged" },
{ "ACCESSIBLE_TABLE_ROW_DESCRIPTION_CHANGED",
"accessibleTableRowDescriptionChanged" },
{ "ACCESSIBLE_TABLE_COLUMN_HEADER_CHANGED",
"accessibleTableColumnHeaderChanged" },
{ "ACCESSIBLE_TABLE_COLUMN_DESCRIPTION_CHANGED",
"accessibleTableColumnDescriptionChanged" },
{ "ACCESSIBLE_ACTION_PROPERTY", "accessibleActionProperty" },
{ "ACCESSIBLE_HYPERTEXT_OFFSET", "AccessibleHypertextOffset" },
{ "ACCESSIBLE_TEXT_PROPERTY", "AccessibleText" },
{ "ACCESSIBLE_INVALIDATE_CHILDREN", "accessibleInvalidateChildren" },
{ "ACCESSIBLE_TEXT_ATTRIBUTES_CHANGED",
"accessibleTextAttributesChanged" },
{ "ACCESSIBLE_COMPONENT_BOUNDS_CHANGED",
"accessibleComponentBoundsChanged" } };

/**
* Old(removed) fields in AccessibleContext class.
*/
String[] OLD_FIELDS = new String[] {};
}

96 changes: 96 additions & 0 deletions test/jdk/javax/accessibility/4702233/AccessiblePropertiesTest.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
/*
* Copyright (c) 2010, 2022, 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 4702233
* @summary Testing current and old(removed) public fields in AccessibleAction,
* AccessibleContext, AccessibleRelation, AccessibleRole and AccessibleState.
* @run main AccessiblePropertiesTest
*/

import java.lang.reflect.Field;

public class AccessiblePropertiesTest {

private static void checkFields(String className, String[][] fields,
String[] oldFields) {
try {
Class<?> klass = Class.forName(className);

if (klass.getFields().length != fields.length) {
throw new RuntimeException("Fields in " + className
+ " were changed. Test should be updated!");
}

for (int i = 0; i < fields.length; ++i) {
String key = fields[i][0];
String value = fields[i][1];
Field field = klass.getDeclaredField(key);
String current = field.get(String.class).toString();

if (!current.equals(value)) {
throw new RuntimeException(
"Field " + field.getName() + " current value=" + current
+ " , expected value=" + value);
}
}

for (int i = 0; i < oldFields.length; ++i) {
String key = oldFields[i];

try {
klass.getDeclaredField(key);

throw new RuntimeException(key + " exists in " + klass);
} catch (NoSuchFieldException ignored) {
}
}
} catch (Exception e) {
e.printStackTrace();
}
}

public static void main(String[] args) {

checkFields(AccessibleActionConstants.CLASS_NAME,
AccessibleActionConstants.FIELDS,
AccessibleActionConstants.OLD_FIELDS);

checkFields(AccessibleRelationConstants.CLASS_NAME,
AccessibleRelationConstants.FIELDS,
AccessibleRelationConstants.OLD_FIELDS);

checkFields(AccessibleRoleConstants.CLASS_NAME,
AccessibleRoleConstants.FIELDS, AccessibleRoleConstants.OLD_FIELDS);

checkFields(AccessibleStateConstants.CLASS_NAME,
AccessibleStateConstants.FIELDS,
AccessibleStateConstants.OLD_FIELDS);

checkFields(AccessibleContextConstants.CLASS_NAME,
AccessibleContextConstants.FIELDS,
AccessibleContextConstants.OLD_FIELDS);
}
}

65 changes: 65 additions & 0 deletions test/jdk/javax/accessibility/4702233/AccessibleRelationConstants.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/*
* Copyright (c) 2010, 2022, 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.
*/

/*
* @summary Constant for testing public fields in AccessibleRelation.
*/
public interface AccessibleRelationConstants {

/**
* Fully-qualified name of the class.
*/
String CLASS_NAME = "javax.accessibility.AccessibleRelation";

/**
* Public fields values in AccessibleRelation class.
*/
String[][] FIELDS = new String[][] { { "CHILD_NODE_OF", "childNodeOf" },
{ "CHILD_NODE_OF_PROPERTY", "childNodeOfProperty" },
{ "CONTROLLED_BY", "controlledBy" },
{ "CONTROLLED_BY_PROPERTY", "controlledByProperty" },
{ "CONTROLLER_FOR", "controllerFor" },
{ "CONTROLLER_FOR_PROPERTY", "controllerForProperty" },
{ "EMBEDDED_BY", "embeddedBy" },
{ "EMBEDDED_BY_PROPERTY", "embeddedByProperty" },
{ "EMBEDS", "embeds" }, { "EMBEDS_PROPERTY", "embedsProperty" },
{ "FLOWS_FROM", "flowsFrom" },
{ "FLOWS_FROM_PROPERTY", "flowsFromProperty" },
{ "FLOWS_TO", "flowsTo" }, { "FLOWS_TO_PROPERTY", "flowsToProperty" },
{ "LABELED_BY", "labeledBy" },
{ "LABELED_BY_PROPERTY", "labeledByProperty" },
{ "LABEL_FOR", "labelFor" },
{ "LABEL_FOR_PROPERTY", "labelForProperty" },
{ "MEMBER_OF", "memberOf" },
{ "MEMBER_OF_PROPERTY", "memberOfProperty" },
{ "PARENT_WINDOW_OF", "parentWindowOf" },
{ "PARENT_WINDOW_OF_PROPERTY", "parentWindowOfProperty" },
{ "SUBWINDOW_OF", "subwindowOf" },
{ "SUBWINDOW_OF_PROPERTY", "subwindowOfProperty" }, };

/**
* Old(removed) fields in AccessibleRelation class.
*/
String[] OLD_FIELDS = new String[] {};
}

77 changes: 77 additions & 0 deletions test/jdk/javax/accessibility/4702233/AccessibleRoleConstants.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
package bug4702233;

/*
* Copyright (c) 2010, 2022, 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.
*/

/*
* @summary Constant for testing public fields in AccessibleRole.
*/

public interface AccessibleRoleConstants {

/**
* Fully-qualified name of the class.
*/
String CLASS_NAME = "javax.accessibility.AccessibleRole";

/**
* Public fields values in AccessibleRole class.
*/
String[][] FIELDS = new String[][] { { "ALERT", "alert" },
{ "AWT_COMPONENT", "AWT component" }, { "CANVAS", "canvas" },
{ "CHECK_BOX", "check box" }, { "COLOR_CHOOSER", "color chooser" },
{ "COLUMN_HEADER", "column header" }, { "COMBO_BOX", "combo box" },
{ "DATE_EDITOR", "dateeditor" }, { "DESKTOP_ICON", "desktop icon" },
{ "DESKTOP_PANE", "desktop pane" }, { "DIALOG", "dialog" },
{ "DIRECTORY_PANE", "directory pane" }, { "EDITBAR", "editbar" },
{ "FILE_CHOOSER", "file chooser" }, { "FILLER", "filler" },
{ "FONT_CHOOSER", "fontchooser" }, { "FOOTER", "footer" },
{ "FRAME", "frame" }, { "GLASS_PANE", "glass pane" },
{ "GROUP_BOX", "groupbox" }, { "HEADER", "header" },
{ "HTML_CONTAINER", "HTML container" }, { "HYPERLINK", "hyperlink" },
{ "ICON", "icon" }, { "INTERNAL_FRAME", "internal frame" },
{ "LABEL", "label" }, { "LAYERED_PANE", "layered pane" },
{ "LIST", "list" }, { "LIST_ITEM", "list item" }, { "MENU", "menu" },
{ "MENU_BAR", "menu bar" }, { "MENU_ITEM", "menu item" },
{ "OPTION_PANE", "option pane" }, { "PAGE_TAB", "page tab" },
{ "PAGE_TAB_LIST", "page tab list" }, { "PANEL", "panel" },
{ "PARAGRAPH", "paragraph" }, { "PASSWORD_TEXT", "password text" },
{ "POPUP_MENU", "popup menu" }, { "PROGRESS_BAR", "progress bar" },
{ "PROGRESS_MONITOR", "progress monitor" },
{ "PUSH_BUTTON", "push JButton" }, { "RADIO_BUTTON", "radio JButton" },
{ "ROOT_PANE", "root pane" }, { "ROW_HEADER", "row header" },
{ "RULER", "ruler" }, { "SCROLL_BAR", "scroll bar" },
{ "SCROLL_PANE", "scroll pane" }, { "SEPARATOR", "separator" },
{ "SLIDER", "slider" }, { "SPIN_BOX", "spinbox" },
{ "SPLIT_PANE", "split pane" }, { "STATUS_BAR", "statusbar" },
{ "SWING_COMPONENT", "swing component" }, { "TABLE", "table" },
{ "TEXT", "text" }, { "TOGGLE_BUTTON", "toggle JButton" },
{ "TOOL_BAR", "tool bar" }, { "TOOL_TIP", "tool tip" },
{ "TREE", "tree" }, { "UNKNOWN", "unknown" },
{ "VIEWPORT", "viewport" }, { "WINDOW", "window" } };

/**
* Old(removed) fields in AccessibleRole class.
*/
String[] OLD_FIELDS = new String[] {};
}
Loading

3 comments on commit 6f526e1

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 6f526e1 Sep 26, 2022

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 6f526e1 Sep 26, 2022

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 GoeLin-backport-6f526e1b 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 6f526e1b from the openjdk/jdk repository.

The commit being backported was authored by Srinivas Mandalika on 3 Jun 2022 and was reviewed by Sergey Bylokhov.

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 GoeLin-backport-6f526e1b:GoeLin-backport-6f526e1b
$ git checkout GoeLin-backport-6f526e1b
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-6f526e1b

Please sign in to comment.