From 47713a3cd82bccfcc9bd0be2a7ff3d72ab75741e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Sun, 6 Feb 2022 15:52:17 +0100
Subject: [PATCH] Update tests for targets

---
 .../pmd/lang/java/ast/ASTContinueStatement.java          | 9 ++++-----
 .../symbols/table/internal/AbruptCompletionTests.java    | 4 ++--
 .../sourceforge/pmd/lang/java/ast/ASTStatementsTest.kt   | 8 ++++----
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTContinueStatement.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTContinueStatement.java
index 9c1175af09..c00fbb9697 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTContinueStatement.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTContinueStatement.java
@@ -44,17 +44,16 @@ public final class ASTContinueStatement extends AbstractStatement {
     }
 
     /**
-     * Returns the statement that is the target of this break. This must
-     * be a loop.
+     * Returns the statement that is the target of this break. This can
+     * be a loop, or an {@link ASTLabeledStatement}.
      */
-    public ASTLoopStatement getTarget() {
+    public ASTStatement getTarget() {
         String myLabel = this.getLabel();
         if (myLabel == null) {
             return ancestors().map(CONTINUE_TARGET_MAPPER).first();
         }
-        return (ASTLoopStatement) ancestors(ASTLabeledStatement.class)
+        return ancestors(ASTLabeledStatement.class)
             .filter(it -> it.getLabel().equals(myLabel))
-            .map(ASTLabeledStatement::getStatement)
             .first();
     }
 
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/table/internal/AbruptCompletionTests.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/table/internal/AbruptCompletionTests.java
index 6ba763114a..a8c57e1618 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/table/internal/AbruptCompletionTests.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/symbols/table/internal/AbruptCompletionTests.java
@@ -54,7 +54,7 @@ public class AbruptCompletionTests extends BaseNonParserTest {
     private Executable canCompleteNormally(String stmt) {
         return canCompleteNormally(stmt, actual -> {
             if (!actual) {
-                throw new AssertionFailedError("Code can complete normally: `" + stmt + "`");
+                throw new AssertionFailedError("Code CAN complete normally: `" + stmt + "`");
             }
         });
     }
@@ -62,7 +62,7 @@ public class AbruptCompletionTests extends BaseNonParserTest {
     private Executable mustCompleteAbruptly(String stmt) {
         return canCompleteNormally(stmt, actual -> {
             if (actual) {
-                throw new AssertionFailedError("Code MUST complete abruptly, got " + actual + ": `" + stmt + "`");
+                throw new AssertionFailedError("Code MUST complete abruptly: `" + stmt + "`");
             }
         });
     }
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTStatementsTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTStatementsTest.kt
index 8a3566e8a0..bad8d742da 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTStatementsTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/ASTStatementsTest.kt
@@ -179,19 +179,19 @@ class ASTStatementsTest : ParserTestSpec({
             """ should parseAs {
                 block {
                     labeledStatement("l") {
+                        val labeledL = it
                         forLoop {
-                            val loopL = it
                             block {
                                 labeledStatement("i") {
+                                    val labeledI = it
                                     forLoop {
-                                        val loopI = it;
                                         ifStatement {
                                             it::getCondition shouldBe unspecifiedChild()
                                             it::getThenBranch shouldBe breakStatement("l") {
-                                                it::getTarget shouldBe loopL
+                                                it::getTarget shouldBe labeledL
                                             }
                                             it::getElseBranch shouldBe continueStatement("i") {
-                                                it::getTarget shouldBe loopI
+                                                it::getTarget shouldBe labeledI
                                             }
                                         }
                                     }