1 files changed, 73 insertions, 4 deletions

diff --git a/catalog-be/src/test/java/org/openecomp/sdc/be/components/utils/GroupDefinitionBuilder.java b/catalog-be/src/test/java/org/openecomp/sdc/be/components/utils/GroupDefinitionBuilder.java
index 08ed89f35c..cf18b453b3 100644
--- a/catalog-be/src/test/java/org/openecomp/sdc/be/components/utils/GroupDefinitionBuilder.java
+++ b/catalog-be/src/test/java/org/openecomp/sdc/be/components/utils/GroupDefinitionBuilder.java
@@ -1,10 +1,15 @@
 package org.openecomp.sdc.be.components.utils;
 
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
+import org.openecomp.sdc.be.datatypes.enums.CreatedFrom;
+import org.openecomp.sdc.be.model.GroupDefinition;
+import org.openecomp.sdc.be.model.PropertyDefinition;
+
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
-import org.openecomp.sdc.be.model.GroupDefinition;
-
 public class GroupDefinitionBuilder {
     private GroupDefinition groupDefinition;
 
@@ -21,18 +26,82 @@ public class GroupDefinitionBuilder {
         return this;
     }
 
+    public GroupDefinitionBuilder setType(String type) {
+        groupDefinition.setType(type);
+        return this;
+    }
+
     public GroupDefinition build() {
         return groupDefinition;
     }
 
-    public GroupDefinitionBuilder addMember(String memberName, String memberId) {
+    public GroupDefinitionBuilder addMember(String name, String memberId) {
+        Map<String, String> groupMembers = getGroupMembers();
+        groupMembers.put(name, memberId);
+        return this;
+    }
+
+    public GroupDefinitionBuilder addMember(String memberId) {
+        Map<String, String> members = getGroupMembers();
+        members.put(memberId + "name", memberId);
+        return this;
+    }
+
+    private Map<String, String> getGroupMembers() {
         Map<String, String> members = groupDefinition.getMembers();
         if (members == null) {
             members = new HashMap<>();
             groupDefinition.setMembers(members);
         }
-        members.put(memberId, memberId);
+        return members;
+    }
+
+    public GroupDefinitionBuilder setInvariantName(String name) {
+        groupDefinition.setInvariantName(name);
+        return this;
+    }
+       
+    public GroupDefinitionBuilder setInvariantUUID(String invariantUUID) {
+        groupDefinition.setInvariantUUID(invariantUUID);
+        return this;
+    }
+    
+    public GroupDefinitionBuilder setGroupUUID(String groupUUID) {
+        groupDefinition.setGroupUUID(groupUUID);
+        return this;
+    }
+
+    public GroupDefinitionBuilder setName(String name) {
+        groupDefinition.setName(name);
+        return this;
+    }
+    
+    public GroupDefinitionBuilder setVersion(String version) {
+        groupDefinition.setVersion(version);
         return this;
     }
+    
+    public GroupDefinitionBuilder setCreatedFrom(CreatedFrom createdfrom) {
+        groupDefinition.setCreatedFrom(createdfrom);
+        return this;
+    }
+
+    public GroupDefinitionBuilder addProperty(String propertyName) {
+        List<PropertyDataDefinition> grpProps = getGroupProperties();
+        PropertyDefinition prop = new PropertyDataDefinitionBuilder()
+                .setName(propertyName)
+                .build();
+        grpProps.add(prop);
+        return this;
+    }
+
+    private List<PropertyDataDefinition> getGroupProperties() {
+        List<PropertyDataDefinition> grpProps = groupDefinition.getProperties();
+        if (grpProps == null) {
+            grpProps = new ArrayList<>();
+            groupDefinition.setProperties(grpProps);
+        }
+        return grpProps;
+    }
 }