UnitTestMixin: added getTestName(ITestResult) + footer prints test name

Evolveum · Mar 2, 2020 · c87d0a0 · c87d0a0
1 parent a45fb2e
commit c87d0a0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 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
@@ -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
@@ -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);
     }
 
     /**