Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8255241: [TestBug] Re-enable few ignored tests in javafx.controls module that pass with latest code #331

Closed

Conversation

aghaisas
Copy link
Collaborator

@aghaisas aghaisas commented Oct 22, 2020

Some of the ignored unit tests in javafx.controls module pass with latest code.
This bug is to address -

  • removal of ignored tag
  • fixing the test if fix is minor

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8255241: [TestBug] Re-enable few ignored tests in javafx.controls module that pass with latest code

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jfx pull/331/head:pull/331
$ git checkout pull/331

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 22, 2020

👋 Welcome back aghaisas! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Ready for review label Oct 22, 2020
@mlbridge
Copy link

mlbridge bot commented Oct 22, 2020

Webrevs

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Choose a reason for hiding this comment

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

It works for me on Windows. Have you run it on more than one platform?

I left one suggestion for you regarding the constants in TableColumnShim.

@@ -30,5 +30,9 @@ public static void setTableView(TableColumn tc, TableView tv) {
tc.setTableView(tv);
}

// NOTE: These constants are direct copy of TableColumnBase
public static final double DEFAULT_WIDTH = 80.0F;
Copy link
Member

Choose a reason for hiding this comment

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

Can you define these to reference those constants rather than copying them, like this?

     public static final double DEFAULT_WIDTH = TableColumnBase.DEFAULT_WIDTH ;

If so, you can remove the comments about needing to keep them in sync.

@@ -117,7 +117,8 @@ public void setWidth(TableColumnBase tableColumnBase, double width) {
* *
**************************************************************************/

// NOTE: If these numbers change, update the copy of this value in TableColumnHeader
// NOTE: If these numbers change, update the copy of this value in
// TableColumnHeader and in TableColumnShim
Copy link
Member

Choose a reason for hiding this comment

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

I think you can revert this change.

@aghaisas
Copy link
Collaborator Author

It works for me on Windows. Have you run it on more than one platform?

I have run it on macOS and Windows.

I left one suggestion for you regarding the constants in TableColumnShim.

Thanks for this. That's a cleaner way instead of copying constants. I will make this change soon.

@openjdk
Copy link

openjdk bot commented Oct 23, 2020

@aghaisas This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8255241: [TestBug] Re-enable few ignored tests in javafx.controls module that pass with latest code

Reviewed-by: kcr

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 3 new commits pushed to the master branch:

  • 4e5f0e6: 8252596: [TESTBUG] WebPageShim::paint is not thread-safe
  • a5a71d1: 8247494: Test failure in ImageRaceTest on some systems
  • 16b697c: 8254100: FX: Update copyright year in docs, readme files to 2021

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Ready to be integrated label Oct 23, 2020
@aghaisas
Copy link
Collaborator Author

/integrate

@openjdk openjdk bot closed this Oct 23, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Ready to be integrated rfr Ready for review labels Oct 23, 2020
@openjdk
Copy link

openjdk bot commented Oct 23, 2020

@aghaisas Since your change was applied there have been 3 commits pushed to the master branch:

  • 4e5f0e6: 8252596: [TESTBUG] WebPageShim::paint is not thread-safe
  • a5a71d1: 8247494: Test failure in ImageRaceTest on some systems
  • 16b697c: 8254100: FX: Update copyright year in docs, readme files to 2021

Your commit was automatically rebased without conflicts.

Pushed as commit 243b1a5.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@aghaisas aghaisas deleted the JDK-8255241-enable-ignored-tests branch July 19, 2021 05:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
2 participants