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

8253876: jdk/test/lib/hexdump/ASN1FormatterTest.java fails with "AssertionError: Lines expected [126] but found [202]" #486

Closed

Conversation

RogerRiggs
Copy link
Contributor

@RogerRiggs RogerRiggs commented Oct 2, 2020

The HexPrinter test utility should be ignoring \r characters from the formatter.
It looks for \n and generates System.lineSeparator() at the end of each line.

With this fix, the ASN1FormatterTest can be removed from the ProblemList.


Progress

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

Testing

Linux x64 Windows x64 macOS x64
Build ✔️ (3/3 passed) ✔️ (2/2 passed) ✔️ (2/2 passed)
Test (tier1) ✔️ (9/9 passed) (1/9 failed) ✔️ (9/9 passed)

Failed test task

Issue

  • JDK-8253876: jdk/test/lib/hexdump/ASN1FormatterTest.java fails with "AssertionError: Lines expected [126] but found [202]"

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/486/head:pull/486
$ git checkout pull/486

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 2, 2020

👋 Welcome back rriggs! 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 label Oct 2, 2020
@openjdk
Copy link

openjdk bot commented Oct 2, 2020

@RogerRiggs 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 label Oct 2, 2020
@RogerRiggs RogerRiggs changed the title 8253876: jdk/test/lib/hexdump/ASN1FormatterTest.java fails with "AssertionError: Lines expected [126] but found [202] 8253876: jdk/test/lib/hexdump/ASN1FormatterTest.java fails with "AssertionError: Lines expected [126] but found [202]" Oct 2, 2020
@mlbridge
Copy link

mlbridge bot commented Oct 2, 2020

Webrevs

Copy link
Contributor

@shipilev shipilev left a comment

I am puzzled about this change. I feels weird to drop proper line separator from ASN1Formatter to please the test. And it does not even look complete, because ASN1Formatter still uses String.format("...%n", ...) sometimes, that still uses system line separator.

Can the test be made resilient by watching out for lineSeparator(), instead of just \n?

@RogerRiggs
Copy link
Contributor Author

RogerRiggs commented Oct 7, 2020

The real fix for the test failing was the change in HexPrinter to ignore the when it is breaking lines from the formatter.
HexPrinter expected only /n from the formatter.

However, since the formatters can be used independently of HexPrinter, they should use System.lineSeparator() to work consistently. I'll put back the System.lineSepartor() use and re-test.

Copy link
Contributor

@shipilev shipilev left a comment

This looks significantly better, thanks!

@@ -166,7 +166,8 @@ private int annotate(DataInputStream in, Appendable out, int available, String p
int nbytes = len & 0x7f;
if (nbytes > 4) {
out.append("***** Tag: " + tagName(tag) +
", Range of length error: " + len + " bytes" + System.lineSeparator());
", Range of length error: " + len + " bytes");
Copy link
Contributor

@shipilev shipilev Oct 7, 2020

Choose a reason for hiding this comment

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

I think you can break this line into append-s, while we are at it. But your choice.

@openjdk
Copy link

openjdk bot commented Oct 7, 2020

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

8253876: jdk/test/lib/hexdump/ASN1FormatterTest.java fails with "AssertionError: Lines expected [126] but found [202]"

Reviewed-by: shade, lancea

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 51 new commits pushed to 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 label Oct 7, 2020
@RogerRiggs
Copy link
Contributor Author

RogerRiggs commented Oct 7, 2020

/integrate

@openjdk openjdk bot closed this Oct 7, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 7, 2020
@openjdk
Copy link

openjdk bot commented Oct 7, 2020

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

Your commit was automatically rebased without conflicts.

Pushed as commit 38159d5.

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

@RogerRiggs RogerRiggs deleted the 8253876-windows-newlines branch Oct 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs integrated
3 participants