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

8292678 Openjfx: all projects to use JUnit5 (Eclipse) #883

Conversation

andy-goryachev-oracle
Copy link
Contributor

@andy-goryachev-oracle andy-goryachev-oracle commented Aug 23, 2022

This change affects eclipse projects only - all eclipse projects are configured to use JUnit5.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8292678: Openjfx: all projects to use JUnit5 (Eclipse)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jfx pull/883/head:pull/883
$ git checkout pull/883

Update a local copy of the PR:
$ git checkout pull/883
$ git pull https://git.openjdk.org/jfx pull/883/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 883

View PR using the GUI difftool:
$ git pr show -t 883

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/883.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 23, 2022

👋 Welcome back angorya! 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.

@andy-goryachev-oracle
Copy link
Contributor Author

@kleopatra or @nlisker - please review if you can. thanks!

@openjdk openjdk bot added the rfr Ready for review label Aug 23, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 23, 2022

Webrevs

@nlisker
Copy link
Collaborator

nlisker commented Aug 24, 2022

I don't see why the base project needs a .classpath file at all considering that it doesn't contain sources.

@andy-goryachev-oracle
Copy link
Contributor Author

I don't see why the base project needs a .classpath file at all considering that it doesn't contain sources.

'base' project does contain shims, other sources, generated sources. I think we should keep it.
are the other changes ok?

@nlisker
Copy link
Collaborator

nlisker commented Aug 24, 2022

Not the base module, the root one, called "jfx" or "rt".

@andy-goryachev-oracle
Copy link
Contributor Author

the root one, called "jfx" or "rt".

I don't know, the file was created in 2013 by a certain Kevin Rushforth for RT-30490. Who am I to criticize the wisdom of the elders?

Besides, this question is beyond the scope of this PR.

@kevinrushforth
Copy link
Member

I don't know, the file was created in 2013 by a certain Kevin Rushforth for RT-30490. Who am I to criticize the wisdom of the elders?

It was actually added a couple years earlier, by this commit:

commit bc3b2da484c5c957f557623261b279b36cc7a40d
Author: Steve Northover <snorthov@openjdk.org>
Date:   Wed Nov 30 15:57:21 2011 -0500

    Fix .classpath

I do agree that removing it would best be done in a follow-up.

@nlisker
Copy link
Collaborator

nlisker commented Aug 30, 2022

Please submit an issue for removing the root project's classpath file.

The 2 future changes to the Eclipse files should be fixing the apps and tests sub-projects.

@openjdk
Copy link

openjdk bot commented Aug 30, 2022

@andy-goryachev-oracle 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:

8292678: Openjfx: all projects to use JUnit5 (Eclipse)

Reviewed-by: nlisker

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 8 new commits pushed to the master branch:

  • f719849: 8290841: Notify menu event after a long press gesture on Android is not dispatched
  • ae9928b: 8287604: Update MarlinFX to 0.9.4.6
  • da580ba: 8292609: Cherry-pick WebKit 614.1 stabilization fixes
  • 996eb84: 8284281: [Accessibility] [Win] [Narrator] Exceptions with TextArea & TextField when deleted last char
  • f95f09f: 8289542: Update JPEG Image Decoding Software to 9e
  • 6d6726c: Merge
  • 8b96776: 8286678: Fix mistakes in FX API docs
  • 5c00783: 8291906: Bindings.createXxxBinding inherit incorrect method docs

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@nlisker) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Ready to be integrated label Aug 30, 2022
@andy-goryachev-oracle
Copy link
Contributor Author

Please submit an issue for removing the root project's classpath file.

I wouldn't do it - it is convenient for git operations via context menu and also gives access to other non-java parts (doc-files for instance).

But the main issue is that it is has a org.eclipse.buildship.core.gradleprojectnature, and gradle support in eclipse is brittle at best.

@andy-goryachev-oracle
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Ready to sponsor label Aug 30, 2022
@openjdk
Copy link

openjdk bot commented Aug 30, 2022

@andy-goryachev-oracle
Your change (at version e752e02) is now ready to be sponsored by a Committer.

@nlisker
Copy link
Collaborator

nlisker commented Aug 30, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 30, 2022

Going to push as commit eb8f2fe.
Since your change was applied there have been 8 commits pushed to the master branch:

  • f719849: 8290841: Notify menu event after a long press gesture on Android is not dispatched
  • ae9928b: 8287604: Update MarlinFX to 0.9.4.6
  • da580ba: 8292609: Cherry-pick WebKit 614.1 stabilization fixes
  • 996eb84: 8284281: [Accessibility] [Win] [Narrator] Exceptions with TextArea & TextField when deleted last char
  • f95f09f: 8289542: Update JPEG Image Decoding Software to 9e
  • 6d6726c: Merge
  • 8b96776: 8286678: Fix mistakes in FX API docs
  • 5c00783: 8291906: Bindings.createXxxBinding inherit incorrect method docs

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 30, 2022
@openjdk openjdk bot closed this Aug 30, 2022
@openjdk openjdk bot removed ready Ready to be integrated rfr Ready for review sponsor Ready to sponsor labels Aug 30, 2022
@andy-goryachev-oracle andy-goryachev-oracle deleted the 8292678.junit5 branch August 30, 2022 19:15
@openjdk
Copy link

openjdk bot commented Aug 30, 2022

@nlisker @andy-goryachev-oracle Pushed as commit eb8f2fe.

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

@nlisker
Copy link
Collaborator

nlisker commented Aug 30, 2022

I wouldn't do it - it is convenient for git operations via context menu and also gives access to other non-java parts (doc-files for instance).

But the main issue is that it is has a org.eclipse.buildship.core.gradleprojectnature, and gradle support in eclipse is brittle at best.

How is the classpath file related to the git context menu? I just retested it and there's no difference. doc-files are also unaffected. Try to delete that file and tell me where you see the difference.

@andy-goryachev-oracle
Copy link
Contributor Author

you are right, sorry, I was talking about .project file.

we can do it as part of JDK-8221708 - the main issue (and reluctance to mess with it) is that it might affect the initial 'import as a gradle project', and associated testing.

is there a specific problem caused by the presence of this .classpath file?

@nlisker
Copy link
Collaborator

nlisker commented Aug 31, 2022

it might affect the initial 'import as a gradle project', and associated testing.

I removed it and didn't have any issue with this. The classpath file is not used when importing a project, just when it's configured, and in this case there is nothing to configure since this project has no dependencies on the classpath or modulepath.

is there a specific problem caused by the presence of this .classpath file?

It could be confusing for a non-Java project to have files associated with a Java project. Also, we want to minimize the amount of unneeded files (if Gradle knew how to generate these itself we wouldn't need to check them in). Since we are doing a cleanup, it is the right place to do it.

@andy-goryachev-oracle
Copy link
Contributor Author

created JDK-8293185 for removal of the root .classpath

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
3 participants