Fix test for MID-6045

Evolveum · Mar 6, 2020 · bd0ee6a · bd0ee6a
1 parent 457c710
commit bd0ee6a
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplate.java
@@ -144,11 +144,12 @@ public void test000Sanity() throws Exception {
         assertNotNull("no system config", systemConfiguration);
         List<ObjectPolicyConfigurationType> defaultObjectPolicyConfiguration = systemConfiguration.asObjectable().getDefaultObjectPolicyConfiguration();
         assertNotNull("No object policy", defaultObjectPolicyConfiguration);
-        assertEquals("Wrong object policy size", 6, defaultObjectPolicyConfiguration.size());       // last two are conflict resolution rules
+        assertEquals("Wrong object policy size", 7, defaultObjectPolicyConfiguration.size());       // last two are conflict resolution rules
         assertObjectTemplate(defaultObjectPolicyConfiguration, UserType.COMPLEX_TYPE, null, USER_TEMPLATE_COMPLEX_OID);
         assertObjectTemplate(defaultObjectPolicyConfiguration, UserType.COMPLEX_TYPE, SUBTYPE_MAROONED, USER_TEMPLATE_MAROONED_OID);
         assertObjectTemplate(defaultObjectPolicyConfiguration, UserType.COMPLEX_TYPE, SUBTYPE_USELESS, USER_TEMPLATE_USELESS_OID);
         assertObjectTemplate(defaultObjectPolicyConfiguration, UserType.COMPLEX_TYPE, SUBTYPE_MID_5892, USER_TEMPLATE_MID_5892.oid);
+        assertObjectTemplate(defaultObjectPolicyConfiguration, UserType.COMPLEX_TYPE, SUBTYPE_MID_6045, USER_TEMPLATE_MID_6045.oid);
 
         assertRoles(getNumberOfRoles());
     }
@@ -253,7 +254,7 @@ public void test101ModifyUserEmployeeTypePirate() throws Exception {
 
     /**
      * Switch employeeType from PIRATE to BUCCANEER. This makes one condition to go false and the other to go
-     * true. For the same role assignement value. So nothing should be changed.
+     * true. For the same role assignment value. So nothing should be changed.
      */
     @Test
     public void test102ModifyUserEmployeeTypeBuccaneer() throws Exception {
@@ -3571,6 +3572,8 @@ public void test990SpecialTimedMapping() throws Exception {
         Task task = getTestTask();
         OperationResult result = task.getResult();
 
+        clock.resetOverride();
+
         XMLGregorianCalendar firstTriggerTime = XmlTypeConverter.fromNow("PT1M");
 
         UserType user = new UserType(prismContext)