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

JDK-8314752: Use google test string comparison macros #15355

Conversation

tstuefe
Copy link
Member

@tstuefe tstuefe commented Aug 20, 2023

Small improvement to use google test's string comparison macros instead of raw C-functions.

This makes the code more readable and provides us with automatic error output in case of string mismatches (so we don't have to print the values via "<<").


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-8314752: Use google test string comparison macros (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15355

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 20, 2023

👋 Welcome back stuefe! 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 20, 2023

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

  • hotspot

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 hotspot hotspot-dev@openjdk.org label Aug 20, 2023
@tstuefe tstuefe force-pushed the gtest-replace-c-stringfunctions-with-googletest-helpers branch from f485f1a to a9dcd2f Compare August 20, 2023 10:17
@tstuefe tstuefe changed the title google test string functions JDK-8314752: Use google test string comparision macros Aug 22, 2023
@tstuefe tstuefe marked this pull request as ready for review August 22, 2023 09:12
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 22, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 22, 2023

Webrevs

Copy link
Contributor

@coleenp coleenp left a comment

Choose a reason for hiding this comment

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

Seems reasonable.

@openjdk
Copy link

openjdk bot commented Aug 22, 2023

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

8314752: Use google test string comparison macros

Reviewed-by: coleenp, kbarrett

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

  • ce1ded1: 8314749: Remove unimplemented _Copy_conjoint_oops_atomic
  • 32bf468: 8314274: G1: Fix -Wconversion warnings around G1CardSetArray::_data
  • eb06572: 8313408: Use SVG for BoxLayout example
  • 20e9478: 8314426: runtime/os/TestTrimNative.java is failing on slow machines
  • 69d900d: 8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev
  • f39fc0a: 8314738: Remove all occurrences of and support for @Revised
  • 6b9df03: 8311240: Eliminate usage of testcases.jar from TestMetaSpaceLog.java
  • 3e1b1bf: 8314688: VM build without C1 fails after JDK-8313372
  • 02ef859: 8313689: C2: compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java fails intermittently with -XX:-TieredCompilation
  • ab86d23: 8250269: Replace ATTRIBUTE_ALIGNED with alignas
  • ... and 10 more: https://git.openjdk.org/jdk/compare/ed0f75f2666f61ec3d8ccb78594a21db9f1be50a...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 Aug 22, 2023
@tstuefe tstuefe changed the title JDK-8314752: Use google test string comparision macros JDK-8314752: Use google test string comparison macros Aug 22, 2023
@openjdk openjdk bot added ready Pull request is ready to be integrated and removed ready Pull request is ready to be integrated labels Aug 22, 2023
Copy link

@kimbarrett kimbarrett 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.

ASSERT_THAT(o1, HasSubstr("class java/lang/Object loader data:")) << "must find java/lang/Object";
ASSERT_THAT(o1, HasSubstr("method wait : (J)V")) << "must find java/lang/Object::wait(long)";
ASSERT_THAT(o1, HasSubstr("method wait : ()V")) << "must find java/lang/Object::wait()";
ASSERT_THAT(o1, Not(HasSubstr("method finalize : ()V"))) << "must not find java/lang/Object::finalize";

Choose a reason for hiding this comment

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

It required some research for me to understand how Not is working here and below. It's relying on ADL.
That used to be at best unreliable or not work at all in some common compilers, but I think that's mostly
fixed now. Since we don't use namespaces in HotSpot, ADL is not encountered much in our code. I'm
okay with this, but others might be surprised too.

@tstuefe
Copy link
Member Author

tstuefe commented Aug 23, 2023

Thanks Coleen and Kim!

/integrate

@openjdk
Copy link

openjdk bot commented Aug 23, 2023

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

  • 7e843c2: 8284772: GHA: Use GCC Major Version Dependencies Only
  • ba6cdbe: 8309214: sun/security/pkcs11/KeyStore/CertChainRemoval.java fails after 8301154
  • 9f4a9fe: 8312434: SPECjvm2008/xml.transform with CDS fails with "can't seal package nu.xom"
  • 7c169a4: 8312232: Remove sun.jvm.hotspot.runtime.VM.buildLongFromIntsPD()
  • 2eae13c: 8214248: (fs) Files:mismatch spec clarifications
  • ce1ded1: 8314749: Remove unimplemented _Copy_conjoint_oops_atomic
  • 32bf468: 8314274: G1: Fix -Wconversion warnings around G1CardSetArray::_data
  • eb06572: 8313408: Use SVG for BoxLayout example
  • 20e9478: 8314426: runtime/os/TestTrimNative.java is failing on slow machines
  • 69d900d: 8314730: GHA: Drop libfreetype6-dev transitional package in favor of libfreetype-dev
  • ... and 15 more: https://git.openjdk.org/jdk/compare/ed0f75f2666f61ec3d8ccb78594a21db9f1be50a...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 23, 2023

@tstuefe Pushed as commit a0d0f21.

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