Pull request #39: EDELIVERY-12323 Automate new SMP UI testcases part 7

Merge in EDELIVERY/smp from EDELIVERY-12323-Automate_new_SMP_UI_testcases-part_7 to development

* commit '145fd1cb':
  fix PR comments
  fix issue when alert was blocking the code editor.
  updated mvn dependecies versions. renamed test methods to start with lowercase.
  modify locator for expired on element to fix test.
  Mapped Edit resource page, created rest methods to create resource and add member, created tests EDT-RES01, EDT-RES02, EDT-RES03, EDT-DOM02,
  Mapped Edit resource page, created rest methods to create resource and add member, created tests EDT-RES01, EDT-RES02

domiSMP-ui-tests/src/main/java/rest/ResourceClient.java

+package rest;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.sun.jersey.api.client.ClientResponse;
+import org.json.JSONObject;
+import rest.models.DomainModel;
+import rest.models.GroupModel;
+import rest.models.MemberModel;
+import rest.models.ResourceModel;
+import utils.TestRunData;
+
+/**
+ * Rest client for group actions
+ */
+public class ResourceClient extends BaseRestClient {
+    public ResourceModel createResourceForGroup(DomainModel domainModel, GroupModel groupModel, ResourceModel resourceModelToBeCreated) {
+        JSONObject resourceJson = new JSONObject(resourceModelToBeCreated);
+        String createResourcePath = RestServicePaths.getCreateResourcePath(TestRunData.getInstance().getUserId(), domainModel.getDomainId(), groupModel.getGroupId());
+        ClientResponse response = jsonPUT(resource.path(createResourcePath), resourceJson);
+        if (response.getStatus() != 200) {
+            try {
+                throw new SMPRestException("Could not create resource!", response);
+            } catch (SMPRestException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        log.debug("Resource have been added!");
+        return response.getEntity(ResourceModel.class);
+    }
+
+    public MemberModel addMembersToResource(DomainModel domainModel, GroupModel groupModel, ResourceModel resourceModel, MemberModel groupMember) throws JsonProcessingException {
+        ObjectMapper mapper = new ObjectMapper();
+        String membersJson = mapper.writeValueAsString(groupMember);
+
+        String addGroupMemberPath = RestServicePaths.getResourceAddMemberPath(TestRunData.getInstance().getUserId(), domainModel.getDomainId(), groupModel.getGroupId(), resourceModel.getResourceId());
+
+        ClientResponse response = jsonPUT(resource.path(addGroupMemberPath), membersJson);
+        if (response.getStatus() != 200) {
+            try {
+                throw new SMPRestException("Could not add members to resource", response);
+            } catch (SMPRestException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        log.debug("Member: " + groupMember.getUsername() + " has been added!");
+        return response.getEntity(MemberModel.class);
+    }
+}

domiSMP-ui-tests/src/main/java/rest/RestServicePaths.java

@@ -52,4 +52,16 @@ public class RestServicePaths {
         return CONTEXT_PATH_EDIT + currentUserId + "/domain/" + domainId + "/group/" + groupId + "/member/put";
     }
 
+    //Resources
+
+    public static String getCreateResourcePath(String currentUserId, String domainId, String groupId) {
+
+        return CONTEXT_PATH_EDIT + currentUserId + "/domain/" + domainId + "/group/" + groupId + "/resource/create";
+    }
+
+    public static String getResourceAddMemberPath(String currentUserId, String domainId, String groupId, String resourceId) {
+
+        return CONTEXT_PATH_EDIT + currentUserId + "/domain/" + domainId + "/group/" + groupId + "/resource/" + resourceId + "/member/put";
+    }
+
 }

domiSMP-ui-tests/src/main/java/rest/models/DocumentModel.java

+
+package rest.models;
+
+import java.util.List;
+
+/**
+ * Data object for Document used in Subresource.
+ */
+public class DocumentModel {
+    private List<Long> allVersions;
+    private Long currentResourceVersion;
+    private Object documentId;
+    private String mimeType;
+    private String name;
+    private String payload;
+    private Long payloadVersion;
+
+    public List<Long> getAllVersions() {
+        return allVersions;
+    }
+
+    public void setAllVersions(List<Long> allVersions) {
+        this.allVersions = allVersions;
+    }
+
+    public Long getCurrentResourceVersion() {
+        return currentResourceVersion;
+    }
+
+    public void setCurrentResourceVersion(Long currentResourceVersion) {
+        this.currentResourceVersion = currentResourceVersion;
+    }
+
+    public Object getDocumentId() {
+        return documentId;
+    }
+
+    public void setDocumentId(Object documentId) {
+        this.documentId = documentId;
+    }
+
+    public String getMimeType() {
+        return mimeType;
+    }
+
+    public void setMimeType(String mimeType) {
+        this.mimeType = mimeType;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPayload() {
+        return payload;
+    }
+
+    public void setPayload(String payload) {
+        this.payload = payload;
+    }
+
+    public Long getPayloadVersion() {
+        return payloadVersion;
+    }
+
+    public void setPayloadVersion(Long payloadVersion) {
+        this.payloadVersion = payloadVersion;
+    }
+
+}

domiSMP-ui-tests/src/main/java/rest/models/DomainModel.java

@@ -10,6 +10,9 @@ import java.util.List;
 import static ddsl.enums.ResponseCertificates.SMP_DOMAIN_01;
 import static ddsl.enums.ResponseCertificates.SMP_DOMAIN_02;
 
+/**
+ * Data model for Domain used for generating domains, mapping domain rest calls.
+ */
 public class DomainModel {
 
     private String smlSmpId;

domiSMP-ui-tests/src/main/java/rest/models/ResourceModel.java

@@ -85,4 +85,16 @@ public class ResourceModel {
     public void setVisibility(String visibility) {
         this.visibility = visibility;
     }
+
+    public static ResourceModel generatePublicResourceUnregisteredToSML() {
+        ResourceModel resourceModel = new ResourceModel();
+        resourceModel.identifierScheme = StringUtils.lowerCase(Generator.randomAlphabeticalValue(3) + "-" + Generator.randomAlphaNumericValue(3) + "-" + Generator.randomAlphaNumericValue(3));
+        resourceModel.identifierValue = "AUT_resIden_" + Generator.randomAlphaNumericValue(4).toLowerCase();
+        resourceModel.smlRegistered = false;
+        resourceModel.resourceTypeIdentifier = StringUtils.lowerCase(Utils.randomEnum(ResourceTypes.values()).getName());
+        resourceModel.visibility = "PUBLIC";
+        return resourceModel;
+    }
+
+
 }

domiSMP-ui-tests/src/main/java/utils/TestRunData.java

@@ -116,6 +116,11 @@ public class TestRunData {
         this.cookies = cookies;
     }
 
+    public void destroySession() {
+        setUserId(null);
+        getCookies().clear();
+
+    }
     public void setUserId(String userId) {
         this.userId = userId;
     }

domiSMP-ui-tests/src/main/java/utils/XMLUtils.java

+package utils;
+
+import org.apache.xml.serialize.OutputFormat;
+import org.apache.xml.serialize.XMLSerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Document;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.Writer;
+
+public class XMLUtils {
+
+    protected final Logger log = LoggerFactory.getLogger(this.getClass());
+
+
+    Document doc;
+
+    public XMLUtils(String xmlStr) throws ParserConfigurationException {
+        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
+        try {
+            doc = dBuilder.parse(new InputSource(new StringReader(xmlStr)));
+        } catch (Exception e) {
+            log.error("Error while parsing xml", e);
+        }
+    }
+
+    public String printDoc() throws IOException {
+        OutputFormat format = new OutputFormat(doc);
+        format.setIndenting(false);
+        Writer out = new StringWriter();
+        XMLSerializer serializer = new XMLSerializer(out, format);
+        serializer.serialize(doc);
+        return out.toString();
+    }
+
+    public boolean isNodePresent(String nodeName) {
+        NodeList nList = doc.getElementsByTagName(nodeName);
+        return nList.getLength() != 0;
+    }
+
+//    public boolean isNodeContaingValue(String nodeName) {
+//
+//        NodeList nList = doc.getChildNodes();
+//        for(Integer i=0; i = nList.getLength()){
+//
+//        }
+//
+//
+//    }
+
+}

domiSMP-ui-tests/src/test/java/domiSMPTests/ui/DomainsPgTests.java

@@ -34,7 +34,7 @@ public class DomainsPgTests extends SeleniumTest {
 
 
     @Test(description = "DOM-01 System admin is able to create Domains")
-    public void SystemAdminIsAbleToCreateDomains() {
+    public void systemAdminIsAbleToCreateDomains() {
         DomainModel domainModel = DomainModel.generatePublicDomainModelWithoutSML();
 
         domainsPage.getCreateDomainBtn().click();
@@ -52,7 +52,7 @@ public class DomainsPgTests extends SeleniumTest {
 
 
     @Test(description = "DOM-02 System admin can integrates domain with SMP")
-    public void SystemAdminCanIntegrateDomainWithSMP() throws Exception {
+    public void systemAdminCanIntegrateDomainWithSMP() throws Exception {
         DomainModel domainModel = DomainModel.generatePublicDomainModelWithSML();
 
         domainsPage.getCreateDomainBtn().click();
@@ -79,7 +79,7 @@ public class DomainsPgTests extends SeleniumTest {
     }
 
     @Test(description = "DOM-03 System admin is able to Invite/Remove users from domains")
-    public void SystemAdminIsAbleToInviteRemoveUsersFromDomains() throws Exception {
+    public void systemAdminIsAbleToInviteRemoveUsersFromDomains() throws Exception {
         UserModel normalUser = UserModel.generateUserWithUSERrole();
         DomainModel domainModel = DomainModel.generatePublicDomainModelWithoutSML();
 
@@ -146,7 +146,7 @@ public class DomainsPgTests extends SeleniumTest {
     }
 
     @Test(description = "DOM-04 System admin is not able to create duplicated Domains")
-    public void SystemAdminIsNotAbleToCreateDuplicatedDomains() throws Exception {
+    public void systemAdminIsNotAbleToCreateDuplicatedDomains() {
         UserModel normalUser = UserModel.generateUserWithUSERrole();
         DomainModel domainModel = DomainModel.generatePublicDomainModelWithoutSML();
 

domiSMP-ui-tests/src/test/java/domiSMPTests/ui/EditDomainsPgTests.java

 package domiSMPTests.ui;
 
 import ddsl.DomiSMPPage;
+import ddsl.dcomponents.commonComponents.members.InviteMembersWithGridPopup;
 import ddsl.enums.Pages;
 import domiSMPTests.SeleniumTest;
 import org.openqa.selenium.WebElement;
 import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 import org.testng.asserts.SoftAssert;
 import pages.LoginPage;
@@ -17,12 +17,15 @@ import rest.models.GroupModel;
 import rest.models.MemberModel;
 import rest.models.UserModel;
 
+/**
+ * Test class for Edit domains page tests.
+ */
+
 public class EditDomainsPgTests extends SeleniumTest {
 
     DomiSMPPage homePage;
     LoginPage loginPage;
     EditDomainsPage editDomainPage;
-    String domainId;
     DomainModel domainModel;
     UserModel adminUser;
     SoftAssert soft;
@@ -48,7 +51,7 @@ public class EditDomainsPgTests extends SeleniumTest {
     }
 
     @Test(description = "EDTDOM-01 Domain admins are able to invite/edit/remove members")
-    public void DomainAdminsAreAbleToInviteEditRemoveMembers() throws Exception {
+    public void domainAdminsAreAbleToInviteEditRemoveMembers() {
         UserModel domainMember = UserModel.generateUserWithUSERrole();
         rest.users().createUser(domainMember);
 
@@ -69,9 +72,8 @@ public class EditDomainsPgTests extends SeleniumTest {
         soft.assertAll();
     }
 
-    @Ignore
     @Test(description = "EDTDOM-02 Domain admins are able to create new groups")
-    public void domainAdminsAreAbleToCreate() throws Exception {
+    public void domainAdminsAreAbleToCreate() {
         GroupModel groupToBeCreated = GroupModel.generatePublicGroup();
         editDomainPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
 
@@ -84,14 +86,19 @@ public class EditDomainsPgTests extends SeleniumTest {
 
         WebElement createGroup = editDomainPage.getGroupTab().getGrid().searchAndGetElementInColumn("Group name", groupToBeCreated.getGroupName());
         soft.assertNotNull(createGroup);
+        createGroup.click();
+        InviteMembersWithGridPopup inviteMembersWithGridPopup = editDomainPage.getGroupTab().clickOnGroupMembersBtn();
+        soft.assertTrue(inviteMembersWithGridPopup.isMemberPresentByUsername(adminUser));
+        inviteMembersWithGridPopup.clickOnCloseBtn();
 
         EditGroupsPage editgroupPage = homePage.getSidebar().navigateTo(Pages.ADMINISTRATION_EDIT_GROUPS);
+        editgroupPage.selectDomain(domainModel, groupToBeCreated);
         soft.assertAll();
 
     }
 
     @Test(description = "EDTDOM-03 Domain admins are not able to create duplicated groups")
-    public void domainAdminsAreNotAbleToCreateDuplicatedGroups() throws Exception {
+    public void domainAdminsAreNotAbleToCreateDuplicatedGroups() {
         GroupModel duplicatedGroup = GroupModel.generatePublicGroup();
 
         editDomainPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();
@@ -112,7 +119,7 @@ public class EditDomainsPgTests extends SeleniumTest {
     }
 
     @Test(description = "EDTDOM-04 Domain admins are able to delete groups without resources")
-    public void domainAdminsAreNotAbleToDeleteGroups() throws Exception {
+    public void domainAdminsAreNotAbleToDeleteGroups() {
         GroupModel groupToBeDeleted = GroupModel.generatePublicGroup();
 
         editDomainPage.getLeftSideGrid().searchAndGetElementInColumn("Domain code", domainModel.getDomainCode()).click();

domiSMP-ui-tests/src/test/java/domiSMPTests/ui/EditGroupsPgTests.java

@@ -11,6 +11,7 @@ import pages.LoginPage;
 import pages.administration.editGroupsPage.CreateResourceDetailsDialog;
 import pages.administration.editGroupsPage.EditGroupsPage;
 import rest.models.*;
+import utils.TestRunData;
 
 import java.util.Arrays;
 import java.util.List;
@@ -36,7 +37,7 @@ public class EditGroupsPgTests extends SeleniumTest {
         adminMember.setRoleType("ADMIN");
 
         MemberModel superMember = new MemberModel();
-        superMember.setUsername(data.getAdminUsername());
+        superMember.setUsername(TestRunData.getInstance().getAdminUsername());
         superMember.setRoleType("ADMIN");
 
         //create user
@@ -62,7 +63,7 @@ public class EditGroupsPgTests extends SeleniumTest {
 
         homePage = new DomiSMPPage(driver);
         loginPage = homePage.goToLoginPage();
-        loginPage.login(adminUser.getUsername(), data.getNewPassword());
+        loginPage.login(adminUser.getUsername(), TestRunData.getInstance().getNewPassword());
         editGroupPage = homePage.getSidebar().navigateTo(Pages.ADMINISTRATION_EDIT_GROUPS);
     }
 

domiSMP-ui-tests/src/test/java/domiSMPTests/ui/EditResourcePgTests.java

+package domiSMPTests.ui;
+
+import ddsl.DomiSMPPage;
+import ddsl.enums.Pages;
+import ddsl.enums.ResourceTypes;
+import domiSMPTests.SeleniumTest;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Ignore;
+import org.testng.annotations.Test;
+import org.testng.asserts.SoftAssert;
+import pages.LoginPage;
+import pages.administration.editResourcesPage.EditResourceDocumentPage;
+import pages.administration.editResourcesPage.EditResourcePage;
+import rest.models.*;
+import utils.TestRunData;
+import utils.XMLUtils;
+
+import javax.xml.parsers.ParserConfigurationException;
+import java.util.Arrays;
+import java.util.List;
+
+public class EditResourcePgTests extends SeleniumTest {
+    DomiSMPPage homePage;
+    LoginPage loginPage;
+    EditResourcePage editResourcePage;
+    UserModel adminUser;
+    DomainModel domainModel;
+    GroupModel groupModel;
+    ResourceModel resourceModel;
+    SoftAssert soft;
+
+    MemberModel adminMember;
+
+    @BeforeMethod(alwaysRun = true)
+    public void beforeTest() throws Exception {
+        soft = new SoftAssert();
+        domainModel = DomainModel.generatePublicDomainModelWithSML();
+        adminUser = UserModel.generateUserWithADMINrole();
+        groupModel = GroupModel.generatePublicGroup();
+        resourceModel = ResourceModel.generatePublicResourceUnregisteredToSML();
+
+        adminMember = new MemberModel() {
+        };
+        adminMember.setUsername(adminUser.getUsername());
+        adminMember.setRoleType("ADMIN");
+
+        MemberModel superMember = new MemberModel();
+        superMember.setUsername(TestRunData.getInstance().getAdminUsername());
+        superMember.setRoleType("ADMIN");
+
+        //create user
+        rest.users().createUser(adminUser).getString("userId");
+
+        //create domain
+        domainModel = rest.domains().createDomain(domainModel);
+
+        //add users to domain
+        rest.domains().addMembersToDomain(domainModel, adminMember);
+        rest.domains().addMembersToDomain(domainModel, superMember);
+
+        //add resources to domain
+        List<ResourceTypes> resourcesToBeAdded = Arrays.asList(ResourceTypes.OASIS1, ResourceTypes.OASIS3, ResourceTypes.OASIS2);
+        domainModel = rest.domains().addResourcesToDomain(domainModel, resourcesToBeAdded);
+
+        //create group for domain
+        groupModel = rest.domains().createGroupForDomain(domainModel, groupModel);
+
+        //add users to groups
+        rest.groups().addMembersToGroup(domainModel, groupModel, adminMember);
+
+        //add resource to group
+        resourceModel = rest.resources().createResourceForGroup(domainModel, groupModel, resourceModel);
+        rest.resources().addMembersToResource(domainModel, groupModel, resourceModel, adminMember);
+
+
+        homePage = new DomiSMPPage(driver);
+        loginPage = homePage.goToLoginPage();
+        loginPage.login(adminUser.getUsername(), TestRunData.getInstance().getNewPassword());
+        editResourcePage = homePage.getSidebar().navigateTo(Pages.ADMINISTRATION_EDIT_RESOURCES);
+    }
+
+    @Test(description = "EDTRES-01 Resource admins are able to invite/edit/remove resource members")
+    public void resourceAdminsAreAbleToInviteEditRemoveMembers() {
+
+        UserModel domainMember = UserModel.generateUserWithUSERrole();
+        rest.users().createUser(domainMember);
+
+        editResourcePage.selectDomain(domainModel, groupModel, resourceModel);
+        editResourcePage.goToTab("Members");
+        //Add user
+        editResourcePage.getResourceMembersTab().getInviteMemberBtn().click();
+        editResourcePage.getResourceMembersTab().getInviteMembersPopup().selectMember(domainMember.getUsername(), "VIEWER");
+        soft.assertTrue(editResourcePage.getResourceMembersTab().getMembersGrid().isValuePresentInColumn("Username", domainMember.getUsername()));
+
+        //Change role of user
+        editResourcePage.getResourceMembersTab().changeRoleOfUser(domainMember.getUsername(), "ADMIN");
+        String currentRoleTypeOfuser = editResourcePage.getResourceMembersTab().getMembersGrid().getColumnValueForSpecificRow("Username", domainMember.getUsername(), "Role type");
+        soft.assertEquals(currentRoleTypeOfuser, "ADMIN");
+
+        //Remove user
+        editResourcePage.getResourceMembersTab().removeUser(domainMember.getUsername());
+        soft.assertFalse(editResourcePage.getResourceMembersTab().getMembersGrid().isValuePresentInColumn("Username", domainMember.getUsername()));
+
+        soft.assertAll();
+    }
+
+    @Test(description = "EDTRES-02 Resource admins are to view their resources", priority = 1)
+    public void resourceAdminsAreAbleToViewTheirResources() {
+
+        UserModel domainMember = UserModel.generateUserWithUSERrole();
+        rest.users().createUser(domainMember);
+
+        editResourcePage.selectDomain(domainModel, groupModel, resourceModel);
+        editResourcePage.goToTab("Members");
+        //Add user
+        editResourcePage.getResourceMembersTab().getInviteMemberBtn().click();
+        editResourcePage.getResourceMembersTab().getInviteMembersPopup().selectMember(domainMember.getUsername(), "VIEWER");
+        soft.assertTrue(editResourcePage.getResourceMembersTab().getMembersGrid().isValuePresentInColumn("Username", domainMember.getUsername()));
+    }
+
+    @Test(description = "EDTRES-03 Resource admins are able to add generated document", priority = 1)
+    public void resourceAdminsAreAbleToAddGeneratedDocument() throws Exception {
+
+        //Generate resource Oasis 3
+        ResourceModel resourceModelOasis3 = ResourceModel.generatePublicResourceUnregisteredToSML();
+        resourceModelOasis3.setResourceTypeIdentifier(ResourceTypes.OASIS3.getName());
+        resourceModelOasis3 = rest.resources().createResourceForGroup(domainModel, groupModel, resourceModelOasis3);
+        rest.resources().addMembersToResource(domainModel, groupModel, resourceModelOasis3, adminMember);
+
+        editResourcePage.refreshPage();
+        editResourcePage.selectDomain(domainModel, groupModel, resourceModelOasis3);
+        editResourcePage.goToTab("Resource details");
+        EditResourceDocumentPage editResourceDocumentPage = editResourcePage.getResourceDetailsTab().clickOnEditDocument();
+        editResourceDocumentPage.clickOnGenerate();
+        editResourceDocumentPage.clickOnSave();
+        editResourceDocumentPage.getAlertArea().closeAlert();
+
+        String currentGeneratedValue = editResourceDocumentPage.getDocumentValue();
+
+        editResourceDocumentPage.clickOnValidate();
+        soft.assertEquals(editResourceDocumentPage.getAlertArea().getAlertMessage(), "Document is Valid.", "Generated document is not valid");
+
+        soft.assertNotNull(currentGeneratedValue, "Document is empty");
+        XMLUtils documentXML = new XMLUtils(currentGeneratedValue);
+        soft.assertTrue(documentXML.isNodePresent("CPP"), "Node is not present in generated document");
+
+        editResourcePage = homePage.getSidebar().navigateTo(Pages.ADMINISTRATION_EDIT_RESOURCES);
+
+        //Generate resource Oasis 2
+        ResourceModel resourceModelOasis2 = ResourceModel.generatePublicResourceUnregisteredToSML();
+        resourceModelOasis2.setResourceTypeIdentifier(ResourceTypes.OASIS2.getName());
+        resourceModelOasis2 = rest.resources().createResourceForGroup(domainModel, groupModel, resourceModelOasis2);
+        rest.resources().addMembersToResource(domainModel, groupModel, resourceModelOasis2, adminMember);
+
+        editResourcePage.refreshPage();
+        editResourcePage.selectDomain(domainModel, groupModel, resourceModelOasis2);
+        editResourcePage.goToTab("Resource details");
+        editResourceDocumentPage = editResourcePage.getResourceDetailsTab().clickOnEditDocument();
+        editResourceDocumentPage.clickOnGenerate();
+        editResourceDocumentPage.clickOnSave();
+        editResourceDocumentPage.getAlertArea().closeAlert();
+        String oasis2GeneratedDocumentValue = editResourceDocumentPage.getDocumentValue();
+
+        editResourceDocumentPage.clickOnValidate();
+
+        soft.assertEquals(editResourceDocumentPage.getAlertArea().getAlertMessage(), "Document is Valid.", "Generated document is not valid");
+        soft.assertNotNull(oasis2GeneratedDocumentValue, "Document is empty");
+        XMLUtils oasis2DocumentXML = new XMLUtils(oasis2GeneratedDocumentValue);
+        soft.assertTrue(oasis2DocumentXML.isNodePresent("ns5:ServiceGroup"), " Service group Node is not present in generated document");
+
+        //Generate resource Oasis 3
+        ResourceModel resourceModelOasis1 = ResourceModel.generatePublicResourceUnregisteredToSML();
+        resourceModelOasis1.setResourceTypeIdentifier(ResourceTypes.OASIS1.getName());
+        resourceModelOasis1 = rest.resources().createResourceForGroup(domainModel, groupModel, resourceModelOasis1);
+        rest.resources().addMembersToResource(domainModel, groupModel, resourceModelOasis1, adminMember);
+
+        editResourcePage = homePage.getSidebar().navigateTo(Pages.ADMINISTRATION_EDIT_RESOURCES);
+        editResourcePage.refreshPage();
+        editResourcePage.selectDomain(domainModel, groupModel, resourceModelOasis1);
+        editResourcePage.goToTab("Resource details");
+        editResourceDocumentPage = editResourcePage.getResourceDetailsTab().clickOnEditDocument();
+        editResourceDocumentPage.clickOnGenerate();
+        editResourceDocumentPage.clickOnSave();
+        editResourceDocumentPage.getAlertArea().closeAlert();
+
+
+        String oasis1GeneratedDocumentValue = editResourceDocumentPage.getDocumentValue();
+
+        editResourceDocumentPage.clickOnValidate();
+
+        soft.assertEquals(editResourceDocumentPage.getAlertArea().getAlertMessage(), "Document is Valid.", "Generated document is not valid");
+        soft.assertNotNull(oasis1GeneratedDocumentValue, "Document is empty");
+        XMLUtils oasis1DocumentXML = new XMLUtils(oasis1GeneratedDocumentValue);
+        soft.assertTrue(oasis1DocumentXML.isNodePresent("ServiceGroup"), " Service group Node is not present in generated document");
+        soft.assertAll();
+    }
+
+    @Ignore //TODO: continue test with select version
+    @Test(description = "EDTRES-04 Resource admins are able to add generated document", priority = 1)
+    public void resourceAdminsAreAbleToAddGeneratedDocument2() throws ParserConfigurationException {
+
+        editResourcePage.goToTab("Resource details");
+        EditResourceDocumentPage editResourceDocumentPage = editResourcePage.getResourceDetailsTab().clickOnEditDocument();
+        editResourceDocumentPage.clickOnGenerate();
+        editResourceDocumentPage.clickOnSave();
+        editResourceDocumentPage.getAlertArea().closeAlert();
+        XMLUtils document1 = new XMLUtils(editResourceDocumentPage.getDocumentValue());
+
+    }
+}
+
+
+

domiSMP-ui-tests/src/test/java/domiSMPTests/ui/KeystorePgTests.java

@@ -73,7 +73,7 @@ public class KeystorePgTests extends SeleniumTest {
         soft.assertAll();
     }
 
-    @Test(description = "KEYS-03 SSystem admin is able to import duplicated keystore", priority = 1)
+    @Test(description = "KEYS-04 SSystem admin is able to import duplicated keystore", priority = 1)
     public void systemAdminIsAbleToImportDuplicatedKeyStores() throws Exception {
         String path = FileUtils.getAbsoluteKeystorePath("valid_keystore.jks");
 

domiSMP-ui-tests/src/test/java/domiSMPTests/ui/ProfilePgTests.java

@@ -149,7 +149,6 @@ public class ProfilePgTests extends SeleniumTest {
         String oldLastSet = profilePage.profileData.getLastSetValue();
         String oldPasswordExpiresOn = profilePage.profileData.getPasswordExpiresOnValue();
 
-        //profilePage.profileData.setChangePasswordBtn.click();
         String newPass = "Edeltest!23456789Edelt" + Generator.randomAlphaNumericValue(4);
         SetChangePasswordDialog setChangePasswordDialog = profilePage.profileData.clickOnChangePassword();
         setChangePasswordDialog.fillChangePassword(data.getNewPassword(), newPass);

domiSMP-ui-tests/src/test/java/domiSMPTests/ui/PropertiesPgTests.java

@@ -53,7 +53,7 @@ public class PropertiesPgTests extends SeleniumTest {
         soft.assertAll();
     }
 
-    @Test(description = "PRP-5 Value is validated according to expected format (URL")
+    @Test(description = "PRP-5 Value is validated according to expected format (URL)", priority = 4)
     public void propertyValueURLIsValidatedAccordingToExpectedFormat() throws Exception {
 
         String property = "bdmsl.integration.url";

domiSMP-ui-tests/src/test/java/domiSMPTests/ui/TrustorePgTests.java

@@ -13,7 +13,7 @@ public class TrustorePgTests extends SeleniumTest {
 
 
     @Test(description = "TRST-01 System admin is able to import certificates")
-    public void SystemAdminIsAbleToImportCertificates() throws Exception {
+    public void systemAdminIsAbleToImportCertificates() throws Exception {
 
         SoftAssert soft = new SoftAssert();
         DomiSMPPage homePage = new DomiSMPPage(driver);
@@ -34,11 +34,7 @@ public class TrustorePgTests extends SeleniumTest {
         soft.assertEquals(truststorepage.getValidToValue(), "22/3/2033, 10:49:22");
         soft.assertEquals(truststorepage.getIssuerValue(), "C=BE,O=eDelivery,CN=red_gw");
         soft.assertEquals(truststorepage.getSerialNumberValue(), "110fa0d8");
-
-
         soft.assertAll();
-
-
     }
 
     @Test(description = "TRST-02 System admin is able to import certificates")
@@ -60,10 +56,8 @@ public class TrustorePgTests extends SeleniumTest {
         String duplicatedCertificateALias = truststorepage.addCertificateAndReturnAlias(path);
         soft.assertNotNull(duplicatedCertificateALias);
         soft.assertTrue(truststorepage.getLeftSideGrid().isValuePresentInColumn("Alias", duplicatedCertificateALias));
-
         soft.assertAll();
 
-
     }
 
 }

domiSMP-ui-tests/src/test/java/domiSMPTests/ui/UsersPgTests.java

@@ -51,7 +51,7 @@ public class UsersPgTests extends SeleniumTest {
 
     }
 
-    @Test(description = "USR-02 USR-02 System admin is not able to create duplicated user")
+    @Test(description = "USR-02 System admin is not able to create duplicated user")
     public void systemAdminIsNotAbleToCreateDuplicatedUser() throws Exception {
 
         loginPage.login(data.getAdminUser().get("username"), data.getAdminUser().get("password"));