Remove test-related methods from DocumentDAO

zanata · Oct 19, 2012 · bbb3363 · bbb3363
1 parent 4f4847e
commit bbb3363
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 21 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java b/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
@@ -22,7 +22,6 @@
 import org.zanata.model.HDocument;
 import org.zanata.model.HProjectIteration;
 import org.zanata.model.HRawDocument;
-import org.zanata.model.HTextFlow;
 import org.zanata.model.StatusCount;
 
 @Name("documentDAO")
@@ -304,21 +303,6 @@ public Map<LocaleId, TranslationStats> getStatistics(long docId, LocaleId ... lo
       return returnStats;
    }
 
-   public void syncRevisions(HDocument doc, HTextFlow... textFlows)
-   {
-      int rev = doc.getRevision();
-      syncRevisions(doc, rev, textFlows);
-   }
-
-   public void syncRevisions(HDocument doc, int revision, HTextFlow... textFlows)
-   {
-      doc.setRevision(revision);
-      for (HTextFlow textFlow : textFlows)
-      {
-         textFlow.setRevision(revision);
-      }
-   }
-
    public HDocument getByProjectIterationAndDocId(final String projectSlug, final String iterationSlug, final String docId)
    {
       Session session = getSession();

diff --git a/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java b/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
@@ -19,14 +19,12 @@
 import org.zanata.ZanataDbunitJpaTest;
 import org.zanata.common.ContentType;
 import org.zanata.common.LocaleId;
-import org.zanata.dao.DocumentDAO;
 import org.zanata.dao.LocaleDAO;
 
 @Test(groups = { "jpa-tests" })
 public class DocumentJPATest extends ZanataDbunitJpaTest
 {
 
-   private DocumentDAO dao;
    private LocaleDAO localeDAO;
    HLocale en_US;
    HLocale de_DE;
@@ -37,6 +35,21 @@ protected void prepareDBUnitOperations()
       beforeTestOperations.add(new DataSetOperation("org/zanata/test/model/LocalesData.dbunit.xml", DatabaseOperation.CLEAN_INSERT));
    }
 
+   public void syncRevisions(HDocument doc, HTextFlow... textFlows)
+   {
+      int rev = doc.getRevision();
+      syncRevisions(doc, rev, textFlows);
+   }
+
+   private void syncRevisions(HDocument doc, int revision, HTextFlow... textFlows)
+   {
+      doc.setRevision(revision);
+      for (HTextFlow textFlow : textFlows)
+      {
+         textFlow.setRevision(revision);
+      }
+   }
+
    @BeforeClass
    void beforeClass()
    {
@@ -46,7 +59,6 @@ void beforeClass()
    @BeforeMethod(firstTimeOnly = true)
    public void beforeMethod()
    {
-      dao = new DocumentDAO((Session) getEm().getDelegate());
       localeDAO = new LocaleDAO((Session) em.getDelegate());
       en_US = localeDAO.findByLocaleId(LocaleId.EN_US);
       de_DE = localeDAO.findByLocaleId(new LocaleId("de"));
@@ -99,7 +111,7 @@ public void checkPositionsNotNull() throws Exception
 
       textFlows2.remove(flow1);
       flow1.setObsolete(true);
-      dao.syncRevisions(hdoc, flow1);
+      syncRevisions(hdoc, flow1);
 
       // flow1.setPos(null);
       em.flush();
@@ -143,7 +155,7 @@ public void ensureHistoryOnTextFlow()
 
       flow1.setContents("nwe content!");
 
-      dao.syncRevisions(hdoc, flow1);
+      syncRevisions(hdoc, flow1);
 
       em.flush();