Merge remote-tracking branch 'origin/master'

Evolveum · Sep 3, 2021 · 96f6db5 · 96f6db5
2 parents f1b55c2 + 467734b
commit 96f6db5
Show file tree

Hide file tree

Showing 21 changed files with 411 additions and 273 deletions.
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestAudit.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestAudit.java
@@ -609,8 +609,10 @@ public void test310ConcurrentAuditsRaw() throws Exception {
                                 iteration + ":" + System.currentTimeMillis() + "-" + (int) (Math.random() * 1_000_000));
                         ObjectDelta<? extends ObjectType> delta = prismContext.deltaFor(UserType.class)
                                 .item(UserType.F_FULL_NAME).replace(PolyString.fromOrig("Hi" + iteration))
-                                .item(UserType.F_METADATA, MetadataType.F_MODIFY_TIMESTAMP).replace(XmlTypeConverter.createXMLGregorianCalendar(new Date()))
-                                .asObjectDelta("oid" + index);
+                                .item(UserType.F_METADATA, MetadataType.F_MODIFY_TIMESTAMP)
+                                .replace(XmlTypeConverter.createXMLGregorianCalendar(new Date()))
+                                // OID in ascii: "audi-to-id-: -000...index"
+                                .asObjectDelta(String.format("61756469-746f-6964-3a20-%012d", index));
                         record.addDelta(new ObjectDeltaOperation<>(delta));
                         modelAuditService.audit(record, threadTask, threadResult);
                         if (failed.get()) {

diff --git a/...va/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationMultiNode.java b/...va/com/evolveum/midpoint/model/intest/sync/TestSyncStoryUsingReconciliationMultiNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2018 Evolveum and contributors
+ * Copyright (C) 2010-2021 Evolveum and contributors
  *
  * This work is dual-licensed under the Apache License 2.0
  * and European Union Public License. See LICENSE file for details.
@@ -26,13 +26,13 @@
 public class TestSyncStoryUsingReconciliationMultiNode extends TestSyncStoryUsingReconciliationPartitioned {
 
     protected static final String TASK_RECONCILE_DUMMY_MULTINODE_FILENAME = COMMON_DIR + "/task-reconcile-dummy-multinode.xml";
-    protected static final String TASK_RECONCILE_DUMMY_MULTINODE_OID = "10000000-0000-0000-565M-565600000004";
+    protected static final String TASK_RECONCILE_DUMMY_MULTINODE_OID = "10000000-0000-0000-565f-565600000004";
 
     protected static final String TASK_RECONCILE_DUMMY_BLUE_MULTINODE_FILENAME = COMMON_DIR + "/task-reconcile-dummy-blue-multinode.xml";
-    protected static final String TASK_RECONCILE_DUMMY_BLUE_MULTINODE_OID = "10000000-0000-0000-565M-565600000204";
+    protected static final String TASK_RECONCILE_DUMMY_BLUE_MULTINODE_OID = "10000000-0000-0000-565f-565600000204";
 
     protected static final String TASK_RECONCILE_DUMMY_GREEN_MULTINODE_FILENAME = COMMON_DIR + "/task-reconcile-dummy-green-multinode.xml";
-    protected static final String TASK_RECONCILE_DUMMY_GREEN_MULTINODE_OID = "10000000-0000-0000-565M-565600000404";
+    protected static final String TASK_RECONCILE_DUMMY_GREEN_MULTINODE_OID = "10000000-0000-0000-565f-565600000404";
 
     @SuppressWarnings("Duplicates")
     @Override

diff --git a/model/model-intest/src/test/resources/common/task-reconcile-dummy-blue-multinode.xml b/model/model-intest/src/test/resources/common/task-reconcile-dummy-blue-multinode.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2018 Evolveum and contributors
+  ~ Copyright (C) 2010-2021 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
   -->
 
 <!--Reconciliation task definition for dummy resource -->
 
-<task oid="10000000-0000-0000-565M-565600000204"
-    xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-    xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
-    xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3">
+<task oid="10000000-0000-0000-565f-565600000204"
+        xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+        xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
+        xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3">
 
     <name>Reconciliation: Dummy Blue</name>
 
-    <taskIdentifier>10000000-0000-0000-565M-565600000204</taskIdentifier>
+    <taskIdentifier>10000000-0000-0000-565f-565600000204</taskIdentifier>
     <ownerRef oid="00000000-0000-0000-0000-000000000002"/>
     <executionStatus>runnable</executionStatus>
     <recurrence>recurring</recurrence>
@@ -28,7 +28,7 @@
         <work>
             <reconciliation>
                 <resourceObjects>
-                    <resourceRef oid="10000000-0000-0000-0000-000000000204" />
+                    <resourceRef oid="10000000-0000-0000-0000-000000000204"/>
                     <objectclass>ri:AccountObjectClass</objectclass>
                 </resourceObjects>
             </reconciliation>

diff --git a/model/model-intest/src/test/resources/common/task-reconcile-dummy-green-multinode.xml b/model/model-intest/src/test/resources/common/task-reconcile-dummy-green-multinode.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2018 Evolveum and contributors
+  ~ Copyright (C) 2010-2021 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
   -->
 
 <!--Reconciliation task definition for dummy resource -->
 
-<task oid="10000000-0000-0000-565M-565600000404"
-      xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-      xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
-      xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3">
+<task oid="10000000-0000-0000-565f-565600000404"
+        xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+        xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance-3"
+        xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3">
 
     <name>Reconciliation: Dummy Green</name>
 
-    <taskIdentifier>10000000-0000-0000-565M-565600000404</taskIdentifier>
+    <taskIdentifier>10000000-0000-0000-565f-565600000404</taskIdentifier>
     <ownerRef oid="00000000-0000-0000-0000-000000000002"/>
     <executionStatus>runnable</executionStatus>
 
@@ -29,7 +29,7 @@
         <work>
             <reconciliation>
                 <resourceObjects>
-                    <resourceRef oid="10000000-0000-0000-0000-000000000404" />
+                    <resourceRef oid="10000000-0000-0000-0000-000000000404"/>
                     <objectclass>ri:AccountObjectClass</objectclass>
                 </resourceObjects>
             </reconciliation>

diff --git a/model/model-intest/src/test/resources/common/task-reconcile-dummy-multinode.xml b/model/model-intest/src/test/resources/common/task-reconcile-dummy-multinode.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2018 Evolveum and contributors
+  ~ Copyright (C) 2010-2021 Evolveum and contributors
   ~
   ~ This work is dual-licensed under the Apache License 2.0
   ~ and European Union Public License. See LICENSE file for details.
   -->
 
 <!--Reconciliation task definition for dummy resource -->
 
-<task oid="10000000-0000-0000-565M-565600000004"
-    xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-    xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance/10000000-0000-0000-0000-000000000004"
-    xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3">
+<task oid="10000000-0000-0000-565f-565600000004"
+        xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+        xmlns:ri="http://midpoint.evolveum.com/xml/ns/public/resource/instance/10000000-0000-0000-0000-000000000004"
+        xmlns:icfs="http://midpoint.evolveum.com/xml/ns/public/connector/icf-1/resource-schema-3">
 
     <name>Reconciliation: Dummy</name>
 
-    <taskIdentifier>10000000-0000-0000-565M-565600000004</taskIdentifier>
+    <taskIdentifier>10000000-0000-0000-565f-565600000004</taskIdentifier>
     <ownerRef oid="00000000-0000-0000-0000-000000000002"/>
     <executionStatus>runnable</executionStatus>
     <recurrence>recurring</recurrence>
@@ -27,7 +27,7 @@
         <work>
             <reconciliation>
                 <resourceObjects>
-                    <resourceRef oid="10000000-0000-0000-0000-000000000004" />
+                    <resourceRef oid="10000000-0000-0000-0000-000000000004"/>
                     <objectclass>ri:AccountObjectClass</objectclass>
                 </resourceObjects>
             </reconciliation>

diff --git a/model/model-intest/testng-integration-sqale.xml b/model/model-intest/testng-integration-sqale.xml
@@ -19,13 +19,11 @@ mvn integration-test -P sqale -pl model/model-intest/
     <test name="Security" preserve-order="true" parallel="false" verbose="10">
         <classes>
             <class name="com.evolveum.midpoint.model.intest.security.TestSecurityPrincipal"/>
-            <!-- TODO missing audit implementation
+            <!-- TODO fails on access certification campaign (parent) is not returned with container search
             <class name="com.evolveum.midpoint.model.intest.security.TestSecurityBasic"/>
             -->
             <class name="com.evolveum.midpoint.model.intest.security.TestSecurityMedium"/>
-            <!-- TODO also audit problem
             <class name="com.evolveum.midpoint.model.intest.security.TestSecurityAdvanced"/>
-            -->
             <class name="com.evolveum.midpoint.model.intest.security.TestSecurityMultitenant"/>
         </classes>
     </test>
@@ -55,7 +53,7 @@ mvn integration-test -P sqale -pl model/model-intest/
             <class name="com.evolveum.midpoint.model.intest.mapping.TestMappingAdvanced"/>
             <class name="com.evolveum.midpoint.model.intest.TestInbounds"/>
             <class name="com.evolveum.midpoint.model.intest.TestVolatility"/>
-            <!-- TODO fails on skip counter assert
+            <!-- TODO fails on AssertionError: Wrong value of total skip counter (multiple methods)
             <class name="com.evolveum.midpoint.model.intest.TestTriggerTask"/>
             -->
             <class name="com.evolveum.midpoint.model.intest.TestOptimizingTriggerCreator"/>
@@ -71,9 +69,7 @@ mvn integration-test -P sqale -pl model/model-intest/
             <class name="com.evolveum.midpoint.model.intest.TestConsistencySimple"/>
             <class name="com.evolveum.midpoint.model.intest.TestConnectorMultiInstance"/>
             <class name="com.evolveum.midpoint.model.intest.TestMerge"/>
-            <!-- TODO needs working audit impl.
             <class name="com.evolveum.midpoint.model.intest.TestAudit"/>
-            -->
             <class name="com.evolveum.midpoint.model.intest.TestDeputy"/>
 
             <class name="com.evolveum.midpoint.model.intest.rbac.TestRbac"/>
@@ -180,15 +176,13 @@ mvn integration-test -P sqale -pl model/model-intest/
             <class name="com.evolveum.midpoint.model.intest.manual.TestDummyItsmIntegration"/>
         </classes>
     </test>
-    <!--  
+    <!--
     Tests from testng-db-specific.xml
     -->
     <test name="Synchronization DB" preserve-order="true" parallel="false" verbose="10">
         <classes>
             <class name="com.evolveum.midpoint.model.intest.sync.TestSyncStoryUsingReconciliationPartitioned"/>
-            <!-- Invalid UUIDs in tests
             <class name="com.evolveum.midpoint.model.intest.sync.TestSyncStoryUsingReconciliationMultiNode"/>
-             --> 
         </classes>
     </test>
 </suite>