Version 2023.01.16: Fixed proper place of screenshots on failed setup…

…, test and teardown
devonfw-forge · Jan 16, 2023 · 66c8fff · 66c8fff
1 parent bb498b7
commit 66c8fff
Show file tree

Hide file tree

Showing 13 changed files with 423 additions and 49 deletions.
diff --git a/mrchecker-framework-modules/mrchecker-cli-module/pom.xml b/mrchecker-framework-modules/mrchecker-cli-module/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <artifactId>mrchecker-test-framework</artifactId>
         <groupId>com.capgemini.mrchecker</groupId>
-        <version>2023.01.03</version>
+        <version>2023.01.16</version>
     </parent>
 
     <artifactId>mrchecker-cli-module</artifactId>
-    <version>2023.01.03</version>
+    <version>2023.01.16</version>
     <packaging>jar</packaging>
     <name>MrChecker - CLI - Module</name>
     <description>MrChecker CLI Module supports:
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mrchecker-core-module</artifactId>
-            <version>2023.01.03</version>
+            <version>2023.01.16</version>
         </dependency>
     </dependencies>
 

diff --git a/mrchecker-framework-modules/mrchecker-core-module/pom.xml b/mrchecker-framework-modules/mrchecker-core-module/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>mrchecker-test-framework</artifactId>
         <groupId>com.capgemini.mrchecker</groupId>
-        <version>2023.01.03</version>
+        <version>2023.01.16</version>
     </parent>
 
     <artifactId>mrchecker-core-module</artifactId>
-    <version>2023.01.03</version>
+    <version>2023.01.16</version>
     <packaging>jar</packaging>
     <name>MrChecker - Test core - Module</name>
     <description>MrChecker Test Framework Core is responsible for:

diff --git a/.../mrchecker-core-module/src/main/java/com/capgemini/mrchecker/test/core/ITestObserver.java b/.../mrchecker-core-module/src/main/java/com/capgemini/mrchecker/test/core/ITestObserver.java
@@ -7,9 +7,13 @@ public interface ITestObserver {
 
     void onTestFinish();
 
+    void onSetupFailure();
+
+    void onTeardownFailure();
+
     void onTestClassFinish();
 
     void addToTestExecutionObserver();
 
     ModuleType getModuleType();
-}
+}
diff --git a/...k-modules/mrchecker-core-module/src/main/java/com/capgemini/mrchecker/test/core/Page.java b/...k-modules/mrchecker-core-module/src/main/java/com/capgemini/mrchecker/test/core/Page.java
@@ -21,6 +21,18 @@ public void onTestFailure() {
                 .getSimpleName());
     }
 
+    @Override
+    public void onSetupFailure() {
+        BFLogger.logDebug("Page.onSetupFailure    " + getClass()
+                .getSimpleName());
+    }
+
+    @Override
+    public void onTeardownFailure() {
+        BFLogger.logDebug("Page.onTeardownFailure    " + getClass()
+                .getSimpleName());
+    }
+
     @Override
     public void onTestFinish() {
         BFLogger.logDebug("Page.onTestFinish    " + getClass()
@@ -39,4 +51,4 @@ public void onTestClassFinish() {
     public final void addToTestExecutionObserver() {
         TEST_EXECUTION_OBSERVER.addObserver(this);
     }
-}
+}
diff --git a/...er-core-module/src/main/java/com/capgemini/mrchecker/test/core/TestExecutionObserver.java b/...er-core-module/src/main/java/com/capgemini/mrchecker/test/core/TestExecutionObserver.java
@@ -51,15 +51,31 @@ public void beforeTestExecution(ExtensionContext context) {
                 .sendClassName();
         logTestInfo("STARTED");
         stopwatch.set(System.currentTimeMillis());
-        validateTestClassAndCallHook(context, BaseTest::setUp);
+        try {
+            validateTestClassAndCallHook(context, BaseTest::setUp);
+        } catch (Throwable throwable) {
+            observers.get()
+                    .forEach(ITestObserver::onSetupFailure);
+            classObservers.get()
+                    .forEach(ITestObserver::onSetupFailure);
+            throw throwable;
+        }
     }
 
     @Override
     public void afterTestExecution(ExtensionContext context) {
         stopwatch.set(System.currentTimeMillis() - stopwatch.get()); // end timing
         logTestInfo("FINISHED");
         printTimeExecutionLog();
-        validateTestClassAndCallHook(context, BaseTest::tearDown);
+        try {
+            validateTestClassAndCallHook(context, BaseTest::tearDown);
+        } catch (Throwable throwable) {
+            observers.get()
+                    .forEach(ITestObserver::onTeardownFailure);
+            classObservers.get()
+                    .forEach(ITestObserver::onTeardownFailure);
+            throw throwable;
+        }
     }
 
     private static void makeLogForTest() {
@@ -91,10 +107,6 @@ public void testSuccessful(ExtensionContext context) {
     @Override
     public void testFailed(ExtensionContext context, Throwable cause) {
         logTestInfo("FAILED");
-        observers.get()
-                .forEach(ITestObserver::onTestFailure);
-        classObservers.get()
-                .forEach(ITestObserver::onTestFailure);
         afterEach();
     }
 
@@ -148,27 +160,47 @@ private String getFormattedTestDuration() {
 
     @Override
     public void handleBeforeAllMethodExecutionException(ExtensionContext context, Throwable throwable) throws Throwable {
+        observers.get()
+                .forEach(ITestObserver::onSetupFailure);
+        classObservers.get()
+                .forEach(ITestObserver::onSetupFailure);
         logExceptionInfo(context, throwable, "@BeforeAll");
     }
 
     @Override
     public void handleBeforeEachMethodExecutionException(ExtensionContext context, Throwable throwable) throws Throwable {
+        observers.get()
+                .forEach(ITestObserver::onSetupFailure);
+        classObservers.get()
+                .forEach(ITestObserver::onSetupFailure);
         logExceptionInfo(context, throwable, "@BeforeEach");
     }
 
     @Override
     public void handleTestExecutionException(ExtensionContext context, Throwable throwable) throws Throwable {
+        observers.get()
+                .forEach(ITestObserver::onTestFailure);
+        classObservers.get()
+                .forEach(ITestObserver::onTestFailure);
         logExceptionInfo(context, throwable, "@Test");
     }
 
     @Override
     public void handleAfterEachMethodExecutionException(ExtensionContext context, Throwable throwable) throws Throwable {
+        observers.get()
+                .forEach(ITestObserver::onTeardownFailure);
+        classObservers.get()
+                .forEach(ITestObserver::onTeardownFailure);
         logExceptionInfo(context, throwable, "@AfterEach");
     }
 
     @Override
     public void handleAfterAllMethodExecutionException(ExtensionContext context, Throwable throwable) throws Throwable {
         try {
+            observers.get()
+                    .forEach(ITestObserver::onTeardownFailure);
+            classObservers.get()
+                    .forEach(ITestObserver::onTeardownFailure);
             logExceptionInfo(context, throwable, "@AfterAll");
         } catch (Throwable e) {
             if (DONT_CONSUME_EXCEPTION_IN_AFTERALL)

diff --git a/mrchecker-framework-modules/mrchecker-database-module/pom.xml b/mrchecker-framework-modules/mrchecker-database-module/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <artifactId>mrchecker-test-framework</artifactId>
         <groupId>com.capgemini.mrchecker</groupId>
-        <version>2023.01.03</version>
+        <version>2023.01.16</version>
     </parent>
 
     <artifactId>mrchecker-database-module</artifactId>
-    <version>2023.01.03</version>
+    <version>2023.01.16</version>
     <packaging>jar</packaging>
     <name>MrChecker - Database - Module</name>
     <description>MrChecker Database Module:
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mrchecker-core-module</artifactId>
-            <version>2023.01.03</version>
+            <version>2023.01.16</version>
         </dependency>
 
         <!-- JPA dependencies -->

diff --git a/mrchecker-framework-modules/mrchecker-mobile-module/pom.xml b/mrchecker-framework-modules/mrchecker-mobile-module/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>mrchecker-test-framework</artifactId>
         <groupId>com.capgemini.mrchecker</groupId>
-        <version>2023.01.03</version>
+        <version>2023.01.16</version>
     </parent>
 
     <artifactId>mrchecker-mobile-module</artifactId>
-    <version>2023.01.03</version>
+    <version>2023.01.16</version>
     <packaging>jar</packaging>
     <name>MrChecker - Mobile - Module</name>
     <description>MrChecker Test Framework name supports:
@@ -52,12 +52,12 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mrchecker-core-module</artifactId>
-            <version>2023.01.03</version>
+            <version>2023.01.16</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mrchecker-selenium-module</artifactId>
-            <version>2023.01.03</version>
+            <version>2023.01.16</version>
         </dependency>
 
         <!--This dependency is necessary for Appium plugin. -->

diff --git a/mrchecker-framework-modules/mrchecker-security-module/pom.xml b/mrchecker-framework-modules/mrchecker-security-module/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>mrchecker-test-framework</artifactId>
         <groupId>com.capgemini.mrchecker</groupId>
-        <version>2023.01.03</version>
+        <version>2023.01.16</version>
     </parent>
 
     <artifactId>mrchecker-security-module</artifactId>
-    <version>2023.01.03</version>
+    <version>2023.01.16</version>
     <packaging>jar</packaging>
     <name>MrChecker - Security - Module</name>
     <description>MrChecker Test Framework Security supports:
@@ -63,7 +63,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mrchecker-core-module</artifactId>
-            <version>2023.01.03</version>
+            <version>2023.01.16</version>
         </dependency>
 
         <!-- Needed to perform all API calls -->

diff --git a/mrchecker-framework-modules/mrchecker-selenium-module/pom.xml b/mrchecker-framework-modules/mrchecker-selenium-module/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <artifactId>mrchecker-test-framework</artifactId>
         <groupId>com.capgemini.mrchecker</groupId>
-        <version>2023.01.03</version>
+        <version>2023.01.16</version>
     </parent>
 
     <artifactId>mrchecker-selenium-module</artifactId>
-    <version>2023.01.03</version>
+    <version>2023.01.16</version>
     <packaging>jar</packaging>
     <name>MrChecker - Selenium - Module</name>
     <description>MrChecker Test Framework Selenium supports:
@@ -98,7 +98,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mrchecker-core-module</artifactId>
-            <version>2023.01.03</version>
+            <version>2023.01.16</version>
         </dependency>
 
         <!--This dependency is necessary for Selenium plugin. -->