Improving test to reproduce MID-5002, but it is already fixed in master

Evolveum · Dec 21, 2018 · 418ccba · 418ccba
1 parent 8ceb3cd
commit 418ccba
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestArchetypes.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestArchetypes.java
@@ -229,7 +229,7 @@ public void test104GetGuybryshCompiledUserProfile() throws Exception {
 		ObjectFilter allEmployeesViewFilter = assertCompiledUserProfile(compiledUserProfile)
 			.assertAdditionalMenuLinks(0)
 			.assertUserDashboardLinks(0)
-			.assertObjectForms(0)
+			.assertObjectForms(2)
 			.assertUserDashboardWidgets(0)
 			.objectCollectionViews()
 				.assertViews(2)

diff --git a/model/model-intest/src/test/resources/archetypes/role-user-administrator.xml b/model/model-intest/src/test/resources/archetypes/role-user-administrator.xml
@@ -71,6 +71,12 @@
     </authorization>
 
     <adminGuiConfiguration>
+    	<objectForms>
+			<objectForm id="111"> <!-- Make sure there will be id conflict: MID-5002 -->
+				<type>RoleType</type>
+				<includeDefaultForms>true</includeDefaultForms>
+			</objectForm>
+		</objectForms>
     	<objectCollectionViews>
     		<objectCollectionView>
     			<name>Active employees</name>

diff --git a/model/model-intest/src/test/resources/archetypes/system-configuration-archetypes.xml b/model/model-intest/src/test/resources/archetypes/system-configuration-archetypes.xml
@@ -195,6 +195,12 @@
     </internals>
 
     <adminGuiConfiguration>
+    	<objectForms>
+			<objectForm id="111"> <!-- Make sure there will be id conflict: MID-5002 -->
+				<type>ServiceType</type>
+				<includeDefaultForms>true</includeDefaultForms>
+			</objectForm>
+		</objectForms>
     	<objectCollectionViews>
     		<objectCollectionView>
     			<name>All employees</name>