From fd3b23c99da7956a6279c4e233b5b9166d2cc562 Mon Sep 17 00:00:00 2001 From: Lukas Hanusovsky Date: Fri, 27 Mar 2026 10:06:39 +0100 Subject: [PATCH] Migration Tool - Fix UpdateAsserts rewrite. Signed-off-by: Lukas Hanusovsky --- .../test/migration/UpdateAssertsRewrite.java | 69 ++++++++++--------- 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/tests/migration-util/src/main/java/org/keycloak/test/migration/UpdateAssertsRewrite.java b/tests/migration-util/src/main/java/org/keycloak/test/migration/UpdateAssertsRewrite.java index a2326a16e411..ad182bef1280 100644 --- a/tests/migration-util/src/main/java/org/keycloak/test/migration/UpdateAssertsRewrite.java +++ b/tests/migration-util/src/main/java/org/keycloak/test/migration/UpdateAssertsRewrite.java @@ -22,41 +22,48 @@ public void rewrite() { String trimmed = l.trim(); if (trimmed.startsWith("Assert.") && trimmed.endsWith(";")) { String method = trimmed.substring("Assert.".length(), trimmed.indexOf("(")); - int arguments = l.substring(l.indexOf("(") + 1, l.lastIndexOf(")")).split(", ").length; - - if (method.equals(FAIL)) { - directReplace(i, FAIL); - } else if (method.equals(ASSERT_THROWS) && arguments == 3) { - moveMessageToLast(i, ASSERT_THROWS); - } else if (method.equals(ASSERT_TRUE) && arguments == 1) { - directReplace(i, ASSERT_TRUE); - } else if (method.equals(ASSERT_TRUE) && arguments == 2) { - moveMessageToLast(i, ASSERT_TRUE); - } else if (method.equals(ASSERT_FALSE) && arguments == 1) { - directReplace(i, ASSERT_FALSE); - } else if (method.equals(ASSERT_FALSE) && arguments == 2) { - moveMessageToLast(i, ASSERT_FALSE); - } else if (method.equals(ASSERT_NULL) && arguments == 1) { - directReplace(i, ASSERT_NULL); - } else if (method.equals(ASSERT_NULL) && arguments == 2) { - moveMessageToLast(i, ASSERT_NULL); - } else if (method.equals(ASSERT_NOT_NULL) && arguments == 1) { - directReplace(i, ASSERT_NOT_NULL); - } else if (method.equals(ASSERT_NOT_NULL) && arguments == 2) { - moveMessageToLast(i, ASSERT_NOT_NULL); - } else if (method.equals(ASSERT_EQUALS) && arguments == 2) { - directReplace(i, ASSERT_EQUALS); - } else if (method.equals(ASSERT_EQUALS) && arguments == 3) { - moveMessageToLast(i, ASSERT_EQUALS); - } else if (method.equals(ASSERT_NOT_EQUALS) && arguments == 2) { - directReplace(i, ASSERT_NOT_EQUALS); - } else if (method.equals(ASSERT_NOT_EQUALS) && arguments == 3) { - moveMessageToLast(i, ASSERT_NOT_EQUALS); - } + moveMessageOnAllAsserts(i, l, method); + } else if ((trimmed.startsWith("assert") || trimmed.startsWith("fail")) && trimmed.endsWith(";")) { + String method = trimmed.substring(0, trimmed.indexOf("(")); + moveMessageOnAllAsserts(i, l, method); } } } + private void moveMessageOnAllAsserts(int index, String lineContent, String method) { + int arguments = lineContent.substring(lineContent.indexOf("(") + 1, lineContent.lastIndexOf(")")).split(", ").length; + + if (method.equals(FAIL)) { + directReplace(index, FAIL); + } else if (method.equals(ASSERT_THROWS) && arguments == 3) { + moveMessageToLast(index, ASSERT_THROWS); + } else if (method.equals(ASSERT_TRUE) && arguments == 1) { + directReplace(index, ASSERT_TRUE); + } else if (method.equals(ASSERT_TRUE) && arguments == 2) { + moveMessageToLast(index, ASSERT_TRUE); + } else if (method.equals(ASSERT_FALSE) && arguments == 1) { + directReplace(index, ASSERT_FALSE); + } else if (method.equals(ASSERT_FALSE) && arguments == 2) { + moveMessageToLast(index, ASSERT_FALSE); + } else if (method.equals(ASSERT_NULL) && arguments == 1) { + directReplace(index, ASSERT_NULL); + } else if (method.equals(ASSERT_NULL) && arguments == 2) { + moveMessageToLast(index, ASSERT_NULL); + } else if (method.equals(ASSERT_NOT_NULL) && arguments == 1) { + directReplace(index, ASSERT_NOT_NULL); + } else if (method.equals(ASSERT_NOT_NULL) && arguments == 2) { + moveMessageToLast(index, ASSERT_NOT_NULL); + } else if (method.equals(ASSERT_EQUALS) && arguments == 2) { + directReplace(index, ASSERT_EQUALS); + } else if (method.equals(ASSERT_EQUALS) && arguments == 3) { + moveMessageToLast(index, ASSERT_EQUALS); + } else if (method.equals(ASSERT_NOT_EQUALS) && arguments == 2) { + directReplace(index, ASSERT_NOT_EQUALS); + } else if (method.equals(ASSERT_NOT_EQUALS) && arguments == 3) { + moveMessageToLast(index, ASSERT_NOT_EQUALS); + } + } + private void directReplace(int l, String method) { replaceLine(l, content.get(l).replace("Assert." + method, "Assertions." + method)); }