Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · May 6, 2022 · 6d576ca · 6d576ca
2 parents 1f7a8e8 + 7d983dc
commit 6d576ca
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/infra/test-util/src/main/java/com/evolveum/midpoint/test/util/OperationResultAssert.java b/infra/test-util/src/main/java/com/evolveum/midpoint/test/util/OperationResultAssert.java
@@ -40,6 +40,15 @@ public OperationResultAssert isFatalError() {
         return this;
     }
 
+    public OperationResultAssert isHandledError() {
+        isNotNull();
+        actual.computeStatusIfUnknown();
+        if (!actual.isHandledError()) {
+            failWithMessage("Expected operation result to be handled error: %s", actual);
+        }
+        return this;
+    }
+
     public OperationResultAssert isTracedSomewhere() {
         if (findTracedSubresult(actual) == null) {
             failWithMessage("No traced subresult in %s", actual);

diff --git a/...-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoModifyObjectTest.java b/...-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoModifyObjectTest.java
@@ -3443,8 +3443,8 @@ public void test816ModifyDynamicallyWithObjectNotFound() {
                                 null, result))
                 .isInstanceOf(ObjectNotFoundException.class);
 
-        then("operation is not fatal error (nothing happens really)");
-        assertThatOperationResult(result).isSuccess();
+        and("operation result is handled error");
+        assertThatOperationResult(result).isHandledError();
     }
 
     // endregion

diff --git a/repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSmokeTest.java b/repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSmokeTest.java
@@ -259,8 +259,8 @@ public void test202GetObjectWrongOidNonFatal() {
                 result))
                 .isInstanceOf(ObjectNotFoundException.class);
 
-        and("operation result is success with minor partial error");
-        assertThatOperationResult(result).isSuccess();
+        and("operation result is handled error");
+        assertThatOperationResult(result).isHandledError();
     }
 
     @Test

diff --git a/tools/jenkins/midpoint-main-pipeline b/tools/jenkins/midpoint-main-pipeline
@@ -13,7 +13,7 @@ podTemplate(
                         resourceRequestCpu: '900m',
                         resourceRequestMemory: '1Gi'),
                 containerTemplate(name: 'maven',
-                        image: 'maven:3.8.5-openjdk-11-slim',
+                        image: "${MAVEN_IMAGE}",
                         ttyEnabled: true,
                         command: 'cat',
                         resourceLimitCpu: '4',