Bugfix/multiple curly braces in one verification block (#603)

* process multiple curly braces blocks in one Verification * Apply formatter --------- Co-authored-by: Sheng Yu <[email protected]> Co-authored-by: Tim te Beek <[email protected]>
openrewrite · Sep 16, 2024 · a8e9320 · a8e9320
1 parent 251f882
commit a8e9320
Show file tree

Hide file tree

Showing 3 changed files with 134 additions and 78 deletions.
diff --git a/src/main/java/org/openrewrite/java/testing/jmockit/JMockitUtils.java b/src/main/java/org/openrewrite/java/testing/jmockit/JMockitUtils.java
@@ -36,8 +36,10 @@ static Optional<JMockitBlockType> getJMockitBlock(Statement s) {
         J.Identifier clazz = (J.Identifier) nc.getClazz();
 
         // JMockit block should be composed of a block within another block
-        if (nc.getBody() == null || (nc.getBody().getStatements().size() != 1 &&
-                !TypeUtils.isAssignableTo("mockit.Expectations", clazz.getType()))) {
+        if (nc.getBody() == null ||
+            (nc.getBody().getStatements().size() != 1 &&
+             !TypeUtils.isAssignableTo("mockit.Expectations", clazz.getType()) &&
+             !TypeUtils.isAssignableTo("mockit.Verifications", clazz.getType()))) {
             return empty();
         }
 

diff --git a/src/main/java/org/openrewrite/java/testing/jmockit/SetupStatementsRewriter.java b/src/main/java/org/openrewrite/java/testing/jmockit/SetupStatementsRewriter.java
@@ -54,7 +54,8 @@ J.Block rewriteMethodBody() {
 
             // Account for Expectations which may contain multiple blocks
             List<Statement> statementList = new ArrayList<>();
-            if (TypeUtils.isAssignableTo("mockit.Expectations", nc.getType())) {
+            if (TypeUtils.isAssignableTo("mockit.Expectations", nc.getType()) ||
+                TypeUtils.isAssignableTo("mockit.Verifications", nc.getType())) {
                 statementList.addAll(nc.getBody().getStatements());
             } else {
                 statementList.add(expectationsBlock);