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

8285690: CloneableReference subtest should not throw CloneNotSupportedException #8418

Closed
wants to merge 2 commits into from

Conversation

kimbarrett
Copy link

@kimbarrett kimbarrett commented Apr 27, 2022

Please review this fix to test/jdk/java/lang/ref/ReferenceClone.java. It was
passing if CloneableReference::clone were to throw CloneNotSupportedException.
That should be a failure.

Testing:
Locally (linux-x64) verified test still passes. Temporarily changed
CloneableReference::clone to throw and verified the expected failure gets
reported, unlike before.


Progress

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

Issue

  • JDK-8285690: CloneableReference subtest should not throw CloneNotSupportedException

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8418

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 27, 2022

👋 Welcome back kbarrett! 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 Pull request is ready for review label Apr 27, 2022
@openjdk
Copy link

openjdk bot commented Apr 27, 2022

@kimbarrett 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 Apr 27, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 27, 2022

Webrevs

Copy link
Contributor

@RogerRiggs RogerRiggs left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk
Copy link

openjdk bot commented Apr 27, 2022

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

8285690: CloneableReference subtest should not throw CloneNotSupportedException

Reviewed-by: rriggs, mchung

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

  • 4919525: 8285440: Typo in Collections.addAll method javadoc
  • e7c3b9d: 8285617: Fix java/awt/print/PrinterJob/ImagePrinting/PrintARGBImage.java manual test
  • 16a8ebb: 8285675: Temporary fix for arm32 SafeFetch

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 Pull request is ready to be integrated label Apr 27, 2022
} catch (CloneNotSupportedException e) {}
} catch (CloneNotSupportedException e) {
throw new RuntimeException("CloneableReference::clone should not throw CloneNotSupportedException");
}
Copy link
Member

Choose a reason for hiding this comment

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

Alternatively, it could simply let CNSE propagate.

CloneableReference ref = new CloneableReference(o);
ref.clone();

test() and main will need to declare this checked exception.

Copy link
Author

Choose a reason for hiding this comment

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

That was my initial thought, but it doesn't work - CNSE is a checked exception so must be handled.

Copy link
Member

Choose a reason for hiding this comment

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

test() and main will need to declare this checked exception.

diff --git a/test/jdk/java/lang/ref/ReferenceClone.java b/test/jdk/java/lang/ref/ReferenceClone.java
index bd1ead81bec..2f9386b81e4 100644
--- a/test/jdk/java/lang/ref/ReferenceClone.java
+++ b/test/jdk/java/lang/ref/ReferenceClone.java
@@ -31,12 +31,12 @@ import java.lang.ref.*;
 
 public class ReferenceClone {
     private static final ReferenceQueue<Object> QUEUE = new ReferenceQueue<>();
-    public static void main(String... args) {
+    public static void main(String... args) throws Exception {
         ReferenceClone refClone = new ReferenceClone();
         refClone.test();
     }
 
-    public void test() {
+    public void test() throws CloneNotSupportedException {
         // test Reference::clone that throws CNSE
         Object o = new Object();
         assertCloneNotSupported(new SoftRef(o));
@@ -45,9 +45,7 @@ public class ReferenceClone {
 
         // Reference subclass may override the clone method
         CloneableReference ref = new CloneableReference(o);
-        try {
             ref.clone();
-        } catch (CloneNotSupportedException e) {}
     }
 
     private void assertCloneNotSupported(CloneableRef ref) {
     ```

Copy link
Author

Choose a reason for hiding this comment

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

Yes, that would work. But I'd rather keep the code for that subtest close together, i.e. as currently written.

@kimbarrett
Copy link
Author

Thanks for reviews @RogerRiggs and @mlchung

@kimbarrett
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 28, 2022

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 28, 2022

@kimbarrett Pushed as commit 2d8d140.

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

@kimbarrett kimbarrett deleted the cloneable-test branch April 28, 2022 15:42
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.

3 participants