diff --git a/infra/schema/src/main/resources/localization/schema.properties b/infra/schema/src/main/resources/localization/schema.properties index 9560c93b2c3..a5932b4673c 100755 --- a/infra/schema/src/main/resources/localization/schema.properties +++ b/infra/schema/src/main/resources/localization/schema.properties @@ -331,6 +331,16 @@ GuiObjectListViewType.disableSorting=Disable sorting GuiObjectListViewType.action=Action GuiObjectListViewsType.default=Default GuiObjectListViewsType.objectList=Object list +GuiObjectListViewsType.objectCollectionView=Object collection view +GuiObjectListViewType.collection=Collection +CollectionSpecificationType.collectionRef=Collection ref +CollectionSpecificationType.depth=Depth +CollectionSpecificationType.interpretation=Interpretation +CollectionSpecificationType.relation=Relation +UserInterfaceFeatureType.display=Display +DisplayType.pluralLabel=Plural label +DisplayType.icon=Icon +IconType.color=Color HasAssignmentPolicyConstraintType.targetRef=Target HasAssignmentPolicyConstraintType.enabled=Enable HasAssignmentPolicyConstraintType.direct=Direct @@ -623,6 +633,8 @@ RoleManagementConfigurationType.defaultExecuteAfterAllApprovals=Default execute RoleManagementConfigurationType.autoassignEnabled=Autoassign enabled RoleManagementConfigurationType.relations=Relations SearchBoxConfigurationType.defaultMode=Default mode +SearchBoxConfigurationType.defaultObjectType=Default object type +SearchBoxConfigurationType.defaultScope=Default scope ShadowType.dead=Dead ShadowType.kind=Kind ShadowType.failedOperationType=Failed operation type @@ -865,6 +877,8 @@ AdminGuiConfigurationType.defaultExportSettings=Default export settings AdminGuiConfigurationType.feature=Feature AdminGuiConfigurationType.feedbackMessagesHook=Feedback messages hook AdminGuiConfigurationType.roleManagement=Role management +AdminGuiConfigurationType.displayFormats=Display formats +AdminGuiConfigurationType.objectCollectionViews=Object collection views midPointVersion=${pom.version} midPointRevision=${git.describe} IdempotenceType.CONSERVATIVE=Conservative @@ -1227,4 +1241,4 @@ ArchetypePolicyType.display=Display ArchetypePolicyType.conflictResolution=Conflict resolution ArchetypePolicyType.lifecycleStateModel=Lifecycle state model ArchetypePolicyType.applicablePolicies=Applicable policies -ConfigurationType.configurationProperties=Configuration properties \ No newline at end of file +ConfigurationType.configurationProperties=Configuration properties diff --git a/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/TestBase.java b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/TestBase.java index 69e6f61ef4e..b5d95100636 100644 --- a/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/TestBase.java +++ b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/TestBase.java @@ -197,9 +197,9 @@ public void changeResourceAttribute(String resourceName,String attributeName,Str listResourcesPage .table() .search() - .byName() - .inputValue(resourceName) - .updateSearch() + .byName() + .inputValue(resourceName) + .updateSearch() .and() .clickByName(resourceName) .clickEditResourceConfiguration() @@ -214,6 +214,11 @@ public void changeResourceAttribute(String resourceName,String attributeName,Str Assert.assertTrue( listResourcesPage .table() + .search() + .byName() + .inputValue(resourceName) + .updateSearch() + .and() .clickByName(resourceName) .clickEditResourceConfiguration() .form() diff --git a/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/ObjectListArchetypeTests.java b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/ObjectListArchetypeTests.java new file mode 100644 index 00000000000..b7f813cd9cd --- /dev/null +++ b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/ObjectListArchetypeTests.java @@ -0,0 +1,33 @@ +package com.evolveum.midpoint.testing.schrodinger.scenarios; + +import com.evolveum.midpoint.schrodinger.page.configuration.ImportObjectPage; +import com.evolveum.midpoint.testing.schrodinger.TestBase; +import org.testng.Assert; +import org.testng.annotations.Test; + +import javax.naming.ConfigurationException; +import java.io.File; +import java.io.IOException; + +/** + * Created by honchar + */ +public class ObjectListArchetypeTests extends TestBase { + + private static final File EMPLOYEE_ARCHETYPE_FILE = new File("src/test/resources/configuration/objects/archetypes/archetype-employee.xml"); + + @Test + public void importEmployeeArchetype() throws IOException, ConfigurationException { + + ImportObjectPage importPage = basicPage.importObject(); + Assert.assertTrue( + importPage + .getObjectsFromFile() + .chooseFile(EMPLOYEE_ARCHETYPE_FILE) + .checkOverwriteExistingObject() + .clickImport() + .feedback() + .isSuccess() + ); + } +} diff --git a/testing/schrodingertest/src/test/resources/configuration/objects/archetypes/archetype-employee.xml b/testing/schrodingertest/src/test/resources/configuration/objects/archetypes/archetype-employee.xml new file mode 100644 index 00000000000..df79c31fe63 --- /dev/null +++ b/testing/schrodingertest/src/test/resources/configuration/objects/archetypes/archetype-employee.xml @@ -0,0 +1,37 @@ + + + Employee + + + + Employees + + fa fa-male + blue + + + + + + UserType + + +