From c87d0a09a817c39ca4f66a8f8ee8e1e0d33e31b8 Mon Sep 17 00:00:00 2001 From: Richard Richter Date: Mon, 2 Mar 2020 13:01:58 +0100 Subject: [PATCH] UnitTestMixin: added getTestName(ITestResult) + footer prints test name --- .../midpoint/tools/testng/AbstractUnitTest.java | 2 +- .../midpoint/tools/testng/UnitTestMixin.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/AbstractUnitTest.java b/tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/AbstractUnitTest.java index 3c87709dba1..6e54b72cfdb 100644 --- a/tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/AbstractUnitTest.java +++ b/tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/AbstractUnitTest.java @@ -49,7 +49,7 @@ public Logger logger() { public String contextName() { ITestResult context = TEST_CONTEXT_THREAD_LOCAL.get(); return context != null - ? getClass().getSimpleName() + "." + context.getMethod().getMethodName() + ? getTestName(context) : getClass().getSimpleName(); } diff --git a/tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/UnitTestMixin.java b/tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/UnitTestMixin.java index 6a045eedb17..f542cdb2aaa 100644 --- a/tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/UnitTestMixin.java +++ b/tools/test-ng/src/main/java/com/evolveum/midpoint/tools/testng/UnitTestMixin.java @@ -36,6 +36,15 @@ public interface UnitTestMixin { */ @NotNull String contextName(); + /** + * Returns test name (as "class-simple-name.method") from {@link ITestResult}. + */ + @NotNull + default String getTestName(ITestResult context) { + return context.getTestClass().getRealClass().getSimpleName() + + "." + context.getMethod().getMethodName(); + } + /** * Returns short test name - typically just a method name (without class). * See also {@link #contextName()} if class name is required. @@ -55,8 +64,9 @@ default void displayTestTitle(String testName) { default void displayDefaultTestFooter(ITestResult testResult) { long testMsDuration = testResult.getEndMillis() - testResult.getStartMillis(); - System.out.println(TEST_OUT_FOOTER_PREFIX + " FINISHED in " + testMsDuration + " ms" + TEST_OUT_FOOTER_SUFFIX); - logger().info(TEST_LOG_PREFIX + " FINISHED in " + testMsDuration + " ms" + TEST_LOG_SUFFIX); + String testName = getTestName(testResult); + System.out.println(TEST_OUT_FOOTER_PREFIX + testName + " FINISHED in " + testMsDuration + " ms" + TEST_OUT_FOOTER_SUFFIX); + logger().info(TEST_LOG_PREFIX + testName + " FINISHED in " + testMsDuration + " ms" + TEST_LOG_SUFFIX); } /**