RSDEV-446: moving failing junit tests to IT tests (part 3 - refining)

Author: rs-nicof

src/test/java/com/researchspace/service/RecordSharingIT.java

@@ -51,7 +51,6 @@
 public class RecordSharingIT extends RealTransactionSpringTestBase {
 
   private @Autowired RecordGroupSharingDao groupShareDao;
-  private @Autowired GroupDao groupDao;
   private @Autowired RecordSharingManager recordSharingManager;
   private Group group;
   private User piUser;
@@ -69,10 +68,6 @@ public void tearDown() throws Exception {
     super.tearDown();
   }
 
-  @Test
-  public void reset() {
-  }
-
   @Test
   public void shareWithUser() throws Exception {
     // tests sharing with an individual user rather than a group.
@@ -315,10 +310,10 @@ public void shareDocumentWithGroupHavingOneMember() {
     piUser = reloadPiUser();
     shareRecordWithGroup(piUser, oneMemberGroup, recordToShare);
 
-    openTransaction();
-    labGrpShared = folderDao.get(labGrpShared.getId());
     // document should be shared, group folder should have one element
     assertEquals(1, sharingMgr.getRecordSharingInfo(recordToShare.getId()).size());
+    openTransaction();
+    labGrpShared = folderDao.get(labGrpShared.getId());
     assertEquals(1, labGrpShared.getChildren().size());
     commitTransaction();
   }
@@ -327,14 +322,14 @@ public void shareDocumentWithGroupHavingOneMember() {
   @Test
   public void deletionOfDocumentSharedIntoOtherNotebook() throws Exception {
 
-    User pi = createAndSaveUserIfNotExists(getRandomAlphabeticString("pi"), Constants.PI_ROLE);
+    User pi = createAndSaveUserIfNotExists(getRandomAlphabeticString("pi2"), Constants.PI_ROLE);
     User user = createAndSaveUserIfNotExists(getRandomAlphabeticString("u1"), Constants.USER_ROLE);
     initialiseContentWithEmptyContent(pi, user);
 
     // create lab group
-    Group labGroup = createGroup("g1", pi);
+    Group labGroup = createGroup(getRandomAlphabeticString("g1"), pi);
     addUsersToGroup(pi, labGroup, user);
-    Group labGroup2 = createGroup("g2", pi);
+    Group labGroup2 = createGroup(getRandomAlphabeticString("g2"), pi);
     addUsersToGroup(pi, labGroup2, user);
 
     // user creates a notebook and shares it for write with both groups
@@ -347,15 +342,14 @@ public void deletionOfDocumentSharedIntoOtherNotebook() throws Exception {
     StructuredDocument usersEntry = (StructuredDocument) sharedNotebook.getChildrens().toArray()[0];
     commitTransaction();
 
-    openTransaction();
+//    openTransaction();
     shareNotebookWithGroup(user, sharedNotebook, labGroup, "write");
     shareNotebookWithGroup(user, sharedNotebook, labGroup2, "write");
-    commitTransaction();
+//    commitTransaction();
 
     // pi creates a document and shares it into the notebook, for both groups
     logoutAndLoginAs(pi);
 
-    openTransaction();
     BaseRecord doc = createBasicDocumentInRootFolderWithText(pi, "any");
     sharedNotebook = folderMgr.getNotebook(sharedNotebook.getId());
     labGroup = grpMgr.getGroup(labGroup.getId());
@@ -405,7 +399,7 @@ public void deletionOfDocumentSharedIntoOtherNotebook() throws Exception {
 
     // the entry should be unshared from notebook, but shouldn't be deleted
     sharedNotebook = folderMgr.getNotebook(sharedNotebook.getId());
-    assertEquals(2, sharedNotebook.getEntryCount());
+    assertEquals(1, sharedNotebook.getEntryCount());
     doc = (StructuredDocument) recordMgr.get(doc.getId());
     assertFalse(doc.isDeleted());
   }
@@ -565,7 +559,7 @@ private StructuredDocument setUpOtherUserAndRecordToShare() {
             piUser.getRootFolder().getId(), anyForm.getId(), piUser);
     other = createAndSaveRandomUser();
     initUserFolder(other);
-    group = createGroup("grp1", piUser);
+    group = createGroup(getRandomAlphabeticString("grp1"), piUser);
     addLabGroup(group);
     addUsersToGroup(piUser, group, other);
     commitTransaction();

src/test/java/com/researchspace/service/RecordSharingTest.java

@@ -482,11 +482,6 @@ public void newUserCanReadSharedFolderAnd3FixedGroupsubfolders() {
     RSpaceTestUtils.logout();
   }
 
-
-  protected Set<BaseRecord> getChildrenOfIndividualSharedItemsFolder(User user) {
-    return folderDao.getIndividualSharedItemsFolderForUser(user).getChildrens();
-  }
-
   @Test
   public void sharingContinuesWithOtherGroupsIfDocIsSharedWithOneGroup() {
     final StructuredDocument docToShare1 = setUpOtherUserAndRecordToShare();