added methods to addresources to domain, add members to domain, create groups...

added methods to addresources to domain, add members to domain, create groups of domains, add members to groups, created tests for EditGroupsPage

Signed-off-by: bozmiha <Mihai.BOZ@ext.ec.europa.eu>

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

@@ -28,15 +28,6 @@ public class DomainModel {
     private Long index;
     private List<String> resourceDefinitions;
     private Long status;
-
-    public static DomainModel generatePublicDomainModelWithoutSML() {
-        DomainModel domainModel = new DomainModel();
-        domainModel.domainCode = "AUTDom" + Generator.randomAlphaNumeric(6);
-        domainModel.signatureKeyAlias = Utils.randomEnum(ResponseCertificates.values()).getName();
-        domainModel.visibility = "PUBLIC";
-        return domainModel;
-    }
-
     public DomainModel() {
     }
     public String getSmlSmpId() {
@@ -75,26 +66,10 @@ public class DomainModel {
         return smlClientCertAuth;
     }
 
-    public static DomainModel generatePublicDomainModelWithSML() {
-        DomainModel domainModel = new DomainModel();
-        domainModel.domainCode = "AUTDom" + Generator.randomAlphaNumeric(6);
-        domainModel.signatureKeyAlias = Utils.randomEnum(new ResponseCertificates[]{SMP_DOMAIN_01, SMP_DOMAIN_02}).getName();
-        domainModel.visibility = "PUBLIC";
-        domainModel.smlClientCertAuth = true;
-        domainModel.smlSubdomain = "AUTDomSML" + Generator.randomAlphaNumeric(6);
-        domainModel.smlSmpId = "AUTSMLSMP" + Generator.randomAlphaNumeric(4);
-        domainModel.smlClientKeyAlias = StringUtils.lowerCase(Utils.randomEnum(new ResponseCertificates[]{SMP_DOMAIN_01, SMP_DOMAIN_02}).toString());
-        return domainModel;
-    }
-
     public void setIndex(Long index) {
         this.index = index;
     }
 
-    public Long getStatus() {
-        return status;
-    }
-
     public void setStatus(Long status) {
         this.status = status;
     }
@@ -158,6 +133,26 @@ public class DomainModel {
     public void setGroups(List<Object> groups) {
         this.groups = groups;
     }
+
+    public static DomainModel generatePublicDomainModelWithSML() {
+        DomainModel domainModel = new DomainModel();
+        domainModel.domainCode = "AUTDom" + Generator.randomAlphaNumeric(6);
+        domainModel.signatureKeyAlias = Utils.randomEnum(new ResponseCertificates[]{SMP_DOMAIN_01, SMP_DOMAIN_02}).getName();
+        domainModel.visibility = "PUBLIC";
+        domainModel.smlClientCertAuth = true;
+        domainModel.smlSubdomain = "AUTDomSML" + Generator.randomAlphaNumeric(6);
+        domainModel.smlSmpId = "AUTSMLSMP" + Generator.randomAlphaNumeric(4);
+        domainModel.smlClientKeyAlias = StringUtils.lowerCase(Utils.randomEnum(new ResponseCertificates[]{SMP_DOMAIN_01, SMP_DOMAIN_02}).toString());
+        return domainModel;
+    }
+
+    public static DomainModel generatePublicDomainModelWithoutSML() {
+        DomainModel domainModel = new DomainModel();
+        domainModel.domainCode = "AUTDom" + Generator.randomAlphaNumeric(6);
+        domainModel.signatureKeyAlias = Utils.randomEnum(ResponseCertificates.values()).getName();
+        domainModel.visibility = "PUBLIC";
+        return domainModel;
+    }
 }
 
 

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

@@ -12,22 +12,6 @@ public class GroupModel {
     private Long index;
     private Long status;
 
-    public static GroupModel generatePublicGroup() {
-        GroupModel groupModel = new GroupModel();
-        groupModel.groupName = ("AUT_groupName_" + Generator.randomAlphaNumeric(4)).toLowerCase();
-        groupModel.groupDescription = Generator.randomAlphaNumeric(10).toLowerCase();
-        groupModel.visibility = "PUBLIC";
-        return groupModel;
-    }
-
-    public static GroupModel generatePrivateGroup() {
-        GroupModel groupModel = new GroupModel();
-        groupModel.groupName = ("AUT_groupName_" + Generator.randomAlphaNumeric(4)).toLowerCase();
-        groupModel.groupDescription = Generator.randomAlphaNumeric(10).toLowerCase();
-        groupModel.visibility = "PRIVATE";
-        return groupModel;
-    }
-
     public void setGroupName(String groupName) {
         this.groupName = groupName;
     }
@@ -70,5 +54,20 @@ public class GroupModel {
         return groupDescription;
     }
 
+    public static GroupModel generatePublicGroup() {
+        GroupModel groupModel = new GroupModel();
+        groupModel.groupName = ("AUT_groupName_" + Generator.randomAlphaNumeric(4)).toLowerCase();
+        groupModel.groupDescription = Generator.randomAlphaNumeric(10).toLowerCase();
+        groupModel.visibility = "PUBLIC";
+        return groupModel;
+    }
+
+    public static GroupModel generatePrivateGroup() {
+        GroupModel groupModel = new GroupModel();
+        groupModel.groupName = ("AUT_groupName_" + Generator.randomAlphaNumeric(4)).toLowerCase();
+        groupModel.groupDescription = Generator.randomAlphaNumeric(10).toLowerCase();
+        groupModel.visibility = "PRIVATE";
+        return groupModel;
+    }
 
 }

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

@@ -16,6 +16,9 @@ public class UserModel {
     private String smpTheme;
     private String smpLocale;
 
+    public UserModel() {
+    }
+
     public UserModel(String username, boolean active, String role, String emailAddress, String fullName, String smpTheme, String smpLocale) {
         this.username = username;
         this.active = active;
@@ -26,9 +29,6 @@ public class UserModel {
         this.smpLocale = smpLocale;
     }
 
-    public UserModel() {
-    }
-
     public String getUserId() {
         return userId;
     }

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

@@ -21,7 +21,6 @@ public class EditGroupsPgTests extends SeleniumTest {
     DomiSMPPage homePage;
     LoginPage loginPage;
     EditGroupsPage editGroupPage;
-    String domainId;
     UserModel adminUser;
     DomainModel domainModel;
     GroupModel groupModel;
@@ -43,7 +42,7 @@ public class EditGroupsPgTests extends SeleniumTest {
         superMember.setRoleType("ADMIN");
 
         //create user
-        String adminUserId = rest.users().createUser(adminUser).getString("userId");
+        rest.users().createUser(adminUser).getString("userId");
 
         //create domain
         domainModel = rest.domains().createDomain(domainModel);