Skip to content

Conversation

@alexeysemenyukoracle
Copy link
Member

@alexeysemenyukoracle alexeysemenyukoracle commented Oct 25, 2024

  • merge EmptyFolderTest, EmptyFolderPackageTest and EmptyFolderTestBase in EmptyFolderTest class.
  • for .msi packaging still verify the output. It should not contain empty folders from --input, but should contain other folders and files from --input.
  • fixed TKit.assertPathNotEmptyDirectory() that didn't fail if the given path was not a directory.
  • renamed TKit.assertPathNotEmptyDirectory() into TKit.assertDirectoryNotEmpty() for consistency
  • added TKit.assertDirectoryEmpty()
  • replaced some TKit.assertFalse() calls with TKit.assertTrue() to improve test log readibilty. Old:
[17:04:16.189] TRACE: assertFalse(): Check [...] path doesn't exist

New:

[17:04:16.189] TRACE: assertTrue(): Check [...] path doesn't exist

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-8343100: Consolidate EmptyFolderTest and EmptyFolderPackageTest jpackage tests into single java file (Enhancement - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21721

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 25, 2024

👋 Welcome back asemenyuk! 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 Oct 25, 2024

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

8343100: Consolidate EmptyFolderTest and EmptyFolderPackageTest jpackage tests into single java file

Reviewed-by: almatvee

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

  • 1341b81: 8341666: FileInputStream doesn't support readAllBytes() or readNBytes(int) on pseudo devices
  • 52382e2: 8338021: Support new unsigned and saturating vector operators in VectorAPI
  • e659d9d: 8342975: C2: Micro-optimize PhaseIdealLoop::Dominators()
  • 9f6211b: 8341371: CDS cannot load archived heap objects with -XX:+UseSerialGC -XX:-UseCompressedOops
  • 120a935: 8342561: Metaspace for generated reflection classes is no longer needed
  • d5fb6b4: 8339939: [JVMCI] Don't compress abstract and interface Klasses
  • a5ad974: 8343056: C2: Micro-optimize Node lists grow
  • ec06187: 8034066: Incorrect alignment in the "Code" section for "-c -XDdetails" options
  • eb3669a: 8340796: Use a consistent order when loading cxq and EntryList
  • 0e3fc93: 8342083: Make a few fields in FileSystemPreferences final
  • ... and 21 more: https://git.openjdk.org/jdk/compare/ca1700b8bf3b7b34616c469837748ac4c3607dfc...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 rfr Pull request is ready for review label Oct 25, 2024
@openjdk
Copy link

openjdk bot commented Oct 25, 2024

@alexeysemenyukoracle 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 Oct 25, 2024
@mlbridge
Copy link

mlbridge bot commented Oct 25, 2024

Webrevs

Copy link
Member

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

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 28, 2024
@alexeysemenyukoracle
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 28, 2024

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

  • 9f6d5b4: 8343020: (fs) Add support for SecureDirectoryStream on macOS
  • 1341b81: 8341666: FileInputStream doesn't support readAllBytes() or readNBytes(int) on pseudo devices
  • 52382e2: 8338021: Support new unsigned and saturating vector operators in VectorAPI
  • e659d9d: 8342975: C2: Micro-optimize PhaseIdealLoop::Dominators()
  • 9f6211b: 8341371: CDS cannot load archived heap objects with -XX:+UseSerialGC -XX:-UseCompressedOops
  • 120a935: 8342561: Metaspace for generated reflection classes is no longer needed
  • d5fb6b4: 8339939: [JVMCI] Don't compress abstract and interface Klasses
  • a5ad974: 8343056: C2: Micro-optimize Node lists grow
  • ec06187: 8034066: Incorrect alignment in the "Code" section for "-c -XDdetails" options
  • eb3669a: 8340796: Use a consistent order when loading cxq and EntryList
  • ... and 22 more: https://git.openjdk.org/jdk/compare/ca1700b8bf3b7b34616c469837748ac4c3607dfc...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 28, 2024

@alexeysemenyukoracle Pushed as commit 00fe9f7.

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

@alexeysemenyukoracle alexeysemenyukoracle deleted the JDK-8343100 branch November 9, 2024 23:04
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

Development

Successfully merging this pull request may close these issues.

2 participants