From 1f5f5adc50db5d4f476c42d60b5e599fda10080c Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Wed, 16 Apr 2014 11:26:29 +1000 Subject: [PATCH 1/3] Remove lastChanged override in target --- .../src/main/java/org/zanata/model/HTextFlowTarget.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java b/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java index 0d97178758..85290aca05 100644 --- a/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java +++ b/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java @@ -211,15 +211,6 @@ HTextFlow getTextFlow() { return textFlow; } - @Temporal(TemporalType.TIMESTAMP) - @Column(nullable = false) - @Field(analyze = Analyze.NO) - @FieldBridge(impl = DateBridge.class) - @Override - public Date getLastChanged() { - return super.getLastChanged(); - } - /** * As of release 1.6, replaced by {@link #getContents()} * From 6db712fae02c16328f4caf4774c55034e77c73de Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Wed, 16 Apr 2014 12:15:22 +1000 Subject: [PATCH 2/3] Fix unit test with new documentDAO param --- .../org/zanata/service/impl/CopyTransServiceImpl.java | 7 +++++-- .../org/zanata/service/impl/CopyTransServiceUnitTest.java | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java index 07dfa0fd44..71df06ec0c 100644 --- a/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java +++ b/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java @@ -32,6 +32,7 @@ import org.jboss.seam.annotations.Scope; import org.zanata.async.AsyncUtils; import org.zanata.async.tasks.CopyTransTask.CopyTransTaskHandle; +import org.zanata.dao.DocumentDAO; import org.zanata.dao.ProjectDAO; import org.zanata.model.HCopyTransOptions; import org.zanata.model.HDocument; @@ -58,6 +59,8 @@ public class CopyTransServiceImpl implements CopyTransService { @In private ProjectDAO projectDAO; @In + private DocumentDAO documentDAO; + @In private CopyTransWorkFactory copyTransWorkFactory; /** @@ -79,14 +82,14 @@ private void copyTransForDocumentLocale(HDocument document, int numCopied = 0; int start = 0; - Stopwatch stopwatch = new Stopwatch().start(); + // need to reload HDocument because of different hibernate session + document = documentDAO.findById(document.getId()); while (start < document.getTextFlows().size()) { numCopied += copyTransForBatch(document, start, COPY_TRANS_BATCH_SIZE, targetLocale, options); start += COPY_TRANS_BATCH_SIZE; } - log.info("Copy completed:" + stopwatch); // Advance the task handler if there is one Optional taskHandle = diff --git a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java index 9eed20a3b2..a24b276717 100644 --- a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java +++ b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java @@ -81,7 +81,7 @@ public void initializeSeam() { } @Test - public void shouldUseSpecifiedOptions() throws Exception { + public void shouldUseSpecifiedOpticdons() throws Exception { shouldUseProjectOptions(false); } @@ -92,7 +92,7 @@ public void shouldUseProjectOptions() throws Exception { private void shouldUseProjectOptions(boolean useProjectOpts) throws Exception { CopyTransServiceImpl ctService = new CopyTransServiceImpl( - localeServiceImpl, projectDAO, copyTransWorkFactory); + localeServiceImpl, projectDAO, documentDAO, copyTransWorkFactory); HCopyTransOptions projOptions = new HCopyTransOptions(IGNORE, IGNORE, IGNORE); @@ -101,6 +101,7 @@ private void shouldUseProjectOptions(boolean useProjectOpts) throws Exception { HProject proj = createProject(projSlug, projId, projOptions); when(projectDAO.findById(projId, false)).thenReturn(proj); + String iterSlug = "iterslug"; boolean requireReview = true; HProjectIteration iter = createIter(iterSlug, proj, requireReview); @@ -108,6 +109,8 @@ private void shouldUseProjectOptions(boolean useProjectOpts) throws Exception { List textFlows = Arrays.asList(new HTextFlow()); HDocument doc = createDoc(iter, textFlows); + when(documentDAO.findById(doc.getId())).thenReturn(doc); + HLocale de = new HLocale(LocaleId.DE); List localeList = Arrays.asList(de); when(localeServiceImpl.getSupportedLanguageByProjectIteration(projSlug, iterSlug)).thenReturn(localeList); @@ -138,6 +141,7 @@ private void shouldUseProjectOptions(boolean useProjectOpts) throws Exception { private HDocument createDoc(HProjectIteration iter, List textFlows) { HDocument doc = new HDocument(); + doc.setId(9999L); doc.setProjectIteration(iter); doc.setTextFlows(textFlows); return doc; From 890c48d8c412a2cf858fdab0c95ce5d7014e19d2 Mon Sep 17 00:00:00 2001 From: Alex Eng Date: Wed, 16 Apr 2014 14:54:41 +1000 Subject: [PATCH 3/3] revert naming of the test method. --- .../org/zanata/service/impl/CopyTransServiceUnitTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java index a24b276717..a909e1eed3 100644 --- a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java +++ b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java @@ -20,6 +20,9 @@ */ package org.zanata.service.impl; +import java.util.Arrays; +import java.util.List; + import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.testng.annotations.BeforeMethod; @@ -39,9 +42,6 @@ import org.zanata.service.ValidationService; import org.zanata.service.VersionStateCache; -import java.util.Arrays; -import java.util.List; - import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyListOf; @@ -81,7 +81,7 @@ public void initializeSeam() { } @Test - public void shouldUseSpecifiedOpticdons() throws Exception { + public void shouldUseSpecifiedOptions() throws Exception { shouldUseProjectOptions(false); }