Navigation Menu

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

8266460: java.io tests fail on null stream with upgraded jtreg/TestNG #3866

Closed
wants to merge 2 commits into from

Conversation

LanceAndersen
Copy link
Contributor

@LanceAndersen LanceAndersen commented May 4, 2021

Hi all,

This fix addresses a change in TestNG behavior for the Before/AfterGroups annotations that was introduced via testng-team/testng#2167. The tests have been verified against the latest TestNG release and continue to run with the current TestNG release used by jtreg


Progress

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

Issue

  • JDK-8266460: java.io tests fail on null stream with upgraded jtreg/TestNG

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3866/head:pull/3866
$ git checkout pull/3866

Update a local copy of the PR:
$ git checkout pull/3866
$ git pull https://git.openjdk.java.net/jdk pull/3866/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3866

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3866.diff

@bridgekeeper
Copy link

bridgekeeper bot commented May 4, 2021

👋 Welcome back lancea! 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 May 4, 2021

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

  • core-libs

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 core-libs core-libs-dev@openjdk.org label May 4, 2021
@openjdk openjdk bot added the rfr Pull request is ready for review label May 4, 2021
@mlbridge
Copy link

mlbridge bot commented May 4, 2021

Webrevs

import org.testng.annotations.BeforeGroups;
import org.testng.annotations.Test;
import java.io.InputStream;

import static org.testng.Assert.*;
Copy link
Member

Choose a reason for hiding this comment

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

Would it not be more standard to put the new imports just after this import? Same comment applies in the other files.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's IntelliJ magic. I can update if you prefer and can let IntelliJ optimize all of the imports

Copy link
Member

Choose a reason for hiding this comment

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

Ah. I was just thinking of consistency with other tests. Up to you.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think your milage will vary depending on the author and the IDE being used. My primary concern was to address the issue for the failing test and Intellij arranged the imports as they are above. I guess I am less concerned about the imports as I think in some cases it comes to personal preference.

So I would prefer to leave as is if you are OK :-)

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 that's fine.

@openjdk
Copy link

openjdk bot commented May 4, 2021

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

8266460: java.io tests fail on null stream with upgraded jtreg/TestNG

Reviewed-by: bpb

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

  • d282799: 8255566: Add size validation when parsing values from VersionProps
  • 61365d5: 8266465: Add wildcard to JTwork/JTreport exclude in jib-profiles.js
  • f00b70e: 8266527: RandomTestCoverage.java failing due to API removal
  • c53dee7: 8266227: Fix help text for --mac-signing-keychain
  • 80323b7: 8261169: Upgrade HarfBuzz to the latest 2.8.0
  • 9c4efdd: 8263124: Missed initialization of baselineY in sun.font.StrikeMetrics
  • 4e96b31: 8265989: System property for the native character encoding name
  • 8b37d48: 8255493: Support for pre-generated java.lang.invoke classes in CDS dynamic archive
  • 770dfc1: 8265279: Remove unused RandomGeneratorFactory.all(Class category)
  • ee5bba0: 8265767: compiler/eliminateAutobox/TestIntBoxing.java crashes on arm32 after 8264649 in debug VMs
  • ... and 61 more: https://git.openjdk.java.net/jdk/compare/5574922ff69e976bf29f1d766a4c1a67d341ef8c...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.

➡️ 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 Pull request is ready to be integrated label May 4, 2021
@LanceAndersen
Copy link
Contributor Author

/integrate

@openjdk openjdk bot closed this May 6, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 6, 2021
@openjdk
Copy link

openjdk bot commented May 6, 2021

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

  • fcedfc8: 8266579: Update test/jdk/java/lang/ProcessHandle/PermissionTest.java & test/jdk/java/sql/testng/util/TestPolicy.java
  • c665dba: 8266561: Remove Compile::_save_argument_registers
  • 47d4438: 8266426: ZHeapIteratorOopClosure does not handle native access properly
  • 2438498: 8252758: Lanai: Optimize index calculation while copying glyphs
  • eb3b96d: 8266496: WBIsKlassAliveClosure.do_klass() fails for hidden classes
  • 51f5adf: 8265047: Inconsistent warning message in jcmd VM.log
  • ea30bd6: 8263362: Avoid division by 0 in java/awt/font/TextJustifier.java justify
  • 0f9852c: 8266168: -Wmaybe-uninitialized happens in check_code.c
  • a86ee9b: 8266545: 8261169 broke Harfbuzz build with gcc 7 and 8
  • 2dd5667: 8266018: Shenandoah: fix an incorrect assert
  • ... and 96 more: https://git.openjdk.java.net/jdk/compare/5574922ff69e976bf29f1d766a4c1a67d341ef8c...master

Your commit was automatically rebased without conflicts.

Pushed as commit e840597.

💡 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
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
2 participants