feat: Fix Test API usage - MEED-7545 - Meeds-io/MIPs#151 (#1139)

Meeds-io · Oct 7, 2024 · c59c673 · c59c673
1 parent 0621136
commit c59c673
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/notes-service/src/test/java/org/exoplatform/wiki/jpa/JPADataStorageTest.java b/notes-service/src/test/java/org/exoplatform/wiki/jpa/JPADataStorageTest.java
@@ -53,8 +53,6 @@
 import org.exoplatform.wiki.service.WikiPageParams;
 import org.exoplatform.wiki.utils.NoteConstants;
 
-import static org.exoplatform.social.core.jpa.test.AbstractCoreTest.persist;
-
 /**
  * Created by The eXo Platform SAS Author : eXoPlatform [email protected]
  * 9/8/15
@@ -1161,7 +1159,7 @@ public void testDeleteOrphanDraftPagesByParentPage() throws Exception {
     draft = draftPageDAO.create(draft);
     assertNotNull(draft);
     storage.deleteOrphanDraftPagesByParentPage(Long.parseLong(wiki.getWikiHome().getId()));
-    persist();
+    restartTransaction();
     assertNull(draftPageDAO.find(draft.getId()));
   }
 

diff --git a/notes-service/src/test/java/org/exoplatform/wiki/jpa/dao/DraftPageDAOTest.java b/notes-service/src/test/java/org/exoplatform/wiki/jpa/dao/DraftPageDAOTest.java
@@ -30,8 +30,6 @@
 import org.exoplatform.wiki.jpa.entity.PageEntity;
 import org.exoplatform.wiki.jpa.entity.WikiEntity;
 
-import static org.exoplatform.social.core.jpa.test.AbstractCoreTest.persist;
-
 /**
  * Created by The eXo Platform SAS Author : eXoPlatform [email protected] Jun
  * 26, 2015
@@ -348,7 +346,7 @@ public void testFindLatestDraftPageByTargetPage() throws InterruptedException {
     dp1.setCreatedDate(new Date());
     dp1.setUpdatedDate(new Date());
     draftPageDAO.create(dp1);
-    persist();
+    restartTransaction();
 
     // Added to fix random fail when draft pages
     // are added at the same time
@@ -361,7 +359,7 @@ public void testFindLatestDraftPageByTargetPage() throws InterruptedException {
     dp2.setCreatedDate(new Date());
     dp2.setUpdatedDate(new Date());
     draftPageDAO.create(dp2);
-    persist();
+    restartTransaction();
 
     // When
     DraftPageEntity latestDraft = draftPageDAO.findLatestDraftPageByTargetPage(page.getId());

diff --git a/notes-service/src/test/java/org/exoplatform/wiki/service/TestNoteService.java b/notes-service/src/test/java/org/exoplatform/wiki/service/TestNoteService.java
@@ -21,7 +21,6 @@
 package org.exoplatform.wiki.service;
 
 
-import static org.exoplatform.social.core.jpa.test.AbstractCoreTest.persist;
 import static org.junit.Assert.assertThrows;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
@@ -720,7 +719,7 @@ public void testRemoveOrphanDraftPagesByParentPage() throws Exception {
     draft = noteService.createDraftForNewPage(draft, new Date().getTime(), 1L);
     assertNotNull(draft);
     noteService.removeOrphanDraftPagesByParentPage(Long.parseLong(homePage.getId()));
-    persist();
+    restartTransaction();
     assertNull(noteService.getDraftNoteById(draft.getId(), "root"));
   }