Intermediate Commit

dspace-api/src/test/java/org/dspace/xmlworkflow/RoleTest.java

@@ -12,7 +12,6 @@ import static junit.framework.TestCase.assertEquals;
 import org.dspace.AbstractUnitTest;
 import org.dspace.utils.DSpace;
 import org.dspace.xmlworkflow.state.Workflow;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**

dspace-server-webapp/src/test/java/org/dspace/app/rest/builder/CollectionBuilder.java

@@ -159,7 +159,6 @@ public class CollectionBuilder extends AbstractDSpaceObjectBuilder<Collection> {
         if (collection.getAdministrators() != null) {
             Group adminGroup = collection.getAdministrators();
             collectionService.removeAdministrators(context, collection);
-            groupService.delete(context, adminGroup);
         }
         deleteWorkflowGroups(collection);
         delete(collection);

dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/CollectionMatcher.java

@@ -85,7 +85,10 @@ public class CollectionMatcher {
                 "mappedItems",
                 "parentCommunity",
                 "self",
-                "adminGroup"
+                "adminGroup",
+                "submittersGroup",
+                "itemReadGroup",
+                "bitstreamReadGroup"
 
         );
     }