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

8313613: Use JUnit in langtools/lib tests #15281

Closed
wants to merge 11 commits into from

Conversation

xqoasis
Copy link
Contributor

@xqoasis xqoasis commented Aug 14, 2023

Use JUnit Jupiter API in langtools/lib tests instead of TestNG. They are under test/langtools/lib/combo/tools/javac/combo/.
Modified tests that extend tools in CompilationTestCase and JavacTemplateTestBase to implement TestWatcher.


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-8313613: Use JUnit in langtools/lib tests (Sub-task - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15281

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15281.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 14, 2023

👋 Welcome back xqoasis! 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
Copy link

openjdk bot commented Aug 14, 2023

@xqoasis The following label will be automatically applied to this pull request:

  • compiler

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the compiler compiler-dev@openjdk.org label Aug 14, 2023
Co-authored-by: Christian Stein <sormuras@gmail.com>
@xqoasis xqoasis marked this pull request as ready for review September 7, 2023 07:10
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 7, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 7, 2023

Webrevs

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 5, 2023

@xqoasis This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@xqoasis
Copy link
Contributor Author

xqoasis commented Oct 6, 2023

@sormuras Hi Christian. Can I ask whether you find any reviewer for this PR? Otherwise, it will be closed after 4 weeks. I can make any modifications if needed. Thanks!

@sormuras
Copy link
Member

Hi! Here is a patch that cleans up the conversion by using the JUnit extension in a more canonical way: https://gist.github.com/sormuras/834e2f05b7d8784d70ad63e91b5e2d96

If the patch doesn't apply cleanly, I'll create a PR against your fork and branch - or you grant me write access to your JUnit_javac_combo branch.

@sormuras
Copy link
Member

I'll create a PR against your fork and branch

So I did: xqoasis#1

Cleanup conversion. Thanks Christian!
@openjdk
Copy link

openjdk bot commented Oct 13, 2023

@xqoasis this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout JUnit_javac_combo
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Oct 13, 2023

⚠️ @xqoasis This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed rfr Pull request is ready for review labels Oct 13, 2023
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Oct 13, 2023
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 13, 2023
@sormuras
Copy link
Member

Ups. Thank you for fixing the CRLF line endings in the new files.

Copy link
Member

@sormuras sormuras left a comment

Choose a reason for hiding this comment

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

Looks good to me - and thanks for your patience!

Co-authored-by: Christian Stein <sormuras@gmail.com>
Copy link
Member

@asotona asotona left a comment

Choose a reason for hiding this comment

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

Looks good, thank you.

@openjdk
Copy link

openjdk bot commented Oct 16, 2023

@xqoasis 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:

8313613: Use JUnit in langtools/lib tests

Reviewed-by: cstein, asotona

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

  • 8c1bb2b: 8268916: Tests for AffirmTrust roots
  • 2d38495: 8316309: AArch64: VMError::print_native_stack() crashes on Java native method frame
  • 0d09168: 8312527: (ch) Re-examine use of sun.nio.ch.Invoker.myGroupAndInvokeCount
  • 1a7fd5d: 8317687: (fs) FileStore.supportsFileAttributeView("posix") incorrectly returns 'true' for FAT32 volume on macOS
  • eb7d972: 8308659: Use CSS scroll-margin instead of flexbox layout in API documentation
  • 7028fb9: 8317975: [JVMCI] assert(pointee != nullptr) failed: invariant
  • 36993ae: 8316918: Optimize conversions duplicated across phi nodes
  • 668d4b0: 8318154: Improve stability of WheelModifier.java test
  • a36eaf0: 8317112: Add screenshot for Frame/DefaultSizeTest.java
  • a27fc7e: 8317994: Serial: Use SerialHeap in generation
  • ... and 28 more: https://git.openjdk.org/jdk/compare/993951b85e016475f4cd5079ae21bd5ce1f2830c...master

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 (@sormuras, @asotona) 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 Pull request is ready to be integrated label Oct 16, 2023
@xqoasis
Copy link
Contributor Author

xqoasis commented Oct 16, 2023

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Oct 16, 2023
@openjdk
Copy link

openjdk bot commented Oct 16, 2023

@xqoasis
Your change (at version e13576b) is now ready to be sponsored by a Committer.

@sormuras
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Oct 16, 2023

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

  • 8c1bb2b: 8268916: Tests for AffirmTrust roots
  • 2d38495: 8316309: AArch64: VMError::print_native_stack() crashes on Java native method frame
  • 0d09168: 8312527: (ch) Re-examine use of sun.nio.ch.Invoker.myGroupAndInvokeCount
  • 1a7fd5d: 8317687: (fs) FileStore.supportsFileAttributeView("posix") incorrectly returns 'true' for FAT32 volume on macOS
  • eb7d972: 8308659: Use CSS scroll-margin instead of flexbox layout in API documentation
  • 7028fb9: 8317975: [JVMCI] assert(pointee != nullptr) failed: invariant
  • 36993ae: 8316918: Optimize conversions duplicated across phi nodes
  • 668d4b0: 8318154: Improve stability of WheelModifier.java test
  • a36eaf0: 8317112: Add screenshot for Frame/DefaultSizeTest.java
  • a27fc7e: 8317994: Serial: Use SerialHeap in generation
  • ... and 28 more: https://git.openjdk.org/jdk/compare/993951b85e016475f4cd5079ae21bd5ce1f2830c...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 16, 2023
@openjdk openjdk bot closed this Oct 16, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Oct 16, 2023
@openjdk
Copy link

openjdk bot commented Oct 16, 2023

@sormuras @xqoasis Pushed as commit 741ae06.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
compiler compiler-dev@openjdk.org integrated Pull request has been integrated
3 participants