rhbz882770 - fix up tests after change

zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java

@@ -20,6 +20,7 @@
 import org.zanata.webtrans.shared.rpc.EditorFilter;
 
 import com.allen_sauer.gwt.log.client.Log;
+import com.google.common.base.Objects;
 import com.google.gwt.event.logical.shared.ValueChangeEvent;
 import com.google.gwt.event.logical.shared.ValueChangeHandler;
 import com.google.inject.Inject;
@@ -144,7 +145,7 @@ protected void processForAppPresenter(DocumentId docId) {
 
     protected void processForTransFilter(HistoryToken newHistoryToken) {
         boolean findMessageChanged =
-                !newHistoryToken.getSearchText().equals(
+                !Objects.equal(newHistoryToken.getSearchText(),
                         currentHistoryState.getSearchText());
         if (findMessageChanged) {
             Log.info("[gwt-history] trans filter search has changed");

zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java

@@ -81,7 +81,7 @@ public class GetTransUnitListHandler extends
 
     // TODO pahuang this needs to be standardized in client
     private DateTimeFormatter dateFormatter =
-            DateTimeFormat.forPattern("dd-MMM-yyyy");
+            DateTimeFormat.forPattern("dd-mm-yyyy");
 
     @Override
     public GetTransUnitListResult execute(GetTransUnitList action,

zanata-war/src/test/java/org/zanata/search/ContentCriterionTest.java

@@ -19,7 +19,7 @@ public void canBuildWithAlias() {
                 FilterConstraintToQuery.Parameters.searchString
                         .placeHolder());
 
-        assertThat(hql, Matchers.equalTo("(tf.content0 like :searchTerm OR tf.content1 like :searchTerm)"));
+        assertThat(hql, Matchers.equalTo("(tf.content0 like :searchString OR tf.content1 like :searchString)"));
     }
 
     @Test
@@ -28,7 +28,7 @@ public void canBuildWithoutAlias() {
                 FilterConstraintToQuery.Parameters.searchString
                         .placeHolder());
 
-        assertThat(hql, Matchers.equalTo("(content0 like :searchTerm OR content1 like :searchTerm)"));
+        assertThat(hql, Matchers.equalTo("(content0 like :searchString OR content1 like :searchString)"));
     }
 
     @Test
@@ -37,6 +37,6 @@ public void caseInsensitive() {
                 FilterConstraintToQuery.Parameters.searchString
                         .placeHolder());
 
-        assertThat(hql, Matchers.equalTo("(lower(content0) like :searchTerm OR lower(content1) like :searchTerm)"));
+        assertThat(hql, Matchers.equalTo("(lower(content0) like :searchString OR lower(content1) like :searchString)"));
     }
 }

zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java

@@ -2,23 +2,43 @@
 
 import java.util.List;
 
+import org.dbunit.operation.DatabaseOperation;
 import org.hamcrest.Matchers;
 import org.hibernate.transform.ResultTransformer;
 import org.joda.time.DateTime;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
+import org.zanata.ZanataDbunitJpaTest;
 import org.zanata.ZanataJpaTest;
 import org.zanata.common.ContentState;
+import org.zanata.model.Activity;
 import org.zanata.model.HAccount;
+import org.zanata.model.HAccountActivationKey;
 import org.zanata.model.HDocument;
+import org.zanata.model.HDocumentHistory;
+import org.zanata.model.HGlossaryEntry;
+import org.zanata.model.HGlossaryTerm;
+import org.zanata.model.HIterationGroup;
 import org.zanata.model.HLocale;
+import org.zanata.model.HLocaleMember;
 import org.zanata.model.HPerson;
+import org.zanata.model.HProject;
+import org.zanata.model.HProjectIteration;
+import org.zanata.model.HTermComment;
 import org.zanata.model.HTextFlow;
 import org.zanata.model.HTextFlowBuilder;
 import org.zanata.model.HTextFlowTarget;
+import org.zanata.model.HTextFlowTargetHistory;
+import org.zanata.model.po.HPoTargetHeader;
+import org.zanata.model.security.HCredentials;
+import org.zanata.model.tm.TransMemory;
+import org.zanata.model.tm.TransMemoryUnit;
+import org.zanata.model.tm.TransMemoryUnitVariant;
 import org.zanata.webtrans.server.rpc.GetTransUnitsNavigationService;
 import org.zanata.webtrans.shared.model.ContentStateGroup;
 import org.zanata.webtrans.shared.model.DocumentId;
+import com.github.huangp.entityunit.entity.EntityCleaner;
 import com.github.huangp.entityunit.entity.EntityMakerBuilder;
 import com.github.huangp.entityunit.maker.FixedValueMaker;
 import com.google.common.base.Function;
@@ -43,9 +63,9 @@ public class FilterConstraintToQueryJpaTest extends ZanataJpaTest {
     private DocumentId documentId;
     private DateTime today = new DateTime();
     private DateTime yesterday = new DateTime().minusDays(1);
+    private ResultTransformer transformer;
     private HPerson admin;
     private HPerson translator;
-    private ResultTransformer transformer;
 
     @BeforeMethod
     public void setUpData() {
@@ -56,8 +76,8 @@ public void setUpData() {
                 new GetTransUnitsNavigationService.TextFlowResultTransformer(
                         hLocale);
 
-        admin = makePerson("admin");
-        translator = makePerson("translator");
+        admin = makePerson("admin123");
+        translator = makePerson("translator123");
 
         HDocument hDocument =
                 EntityMakerBuilder.builder().reuseEntity(hLocale).build()
@@ -321,11 +341,12 @@ public void filterByTargetComment() {
 
     @Test
     public void filterByTargetModifiedUser() {
+        String username = translator.getAccount().getUsername();
         FilterConstraintToQuery constraintToQuery =
                 FilterConstraintToQuery.filterInSingleDocument(
                         FilterConstraints.builder().keepNone()
                                 .includeStates(allContentStates)
-                                .lastModifiedBy("translator").build(),
+                                .lastModifiedBy(username).build(),
                         documentId);
 
         String hql = constraintToQuery.toEntityQuery();
@@ -372,11 +393,12 @@ public void filterByTargetChangedDateBefore() {
 
     @Test
     public void filterByUntranslatedAndModifiedPerson() {
+        String username = admin.getAccount().getUsername();
         FilterConstraintToQuery constraintToQuery =
                 FilterConstraintToQuery.filterInSingleDocument(
                         FilterConstraints.builder().keepNone()
                                 .includeStates(untranslatedOnly)
-                                .lastModifiedBy("admin").build(), documentId);
+                                .lastModifiedBy(username).build(), documentId);
 
         String hql = constraintToQuery.toEntityQuery();
         List<HTextFlow> result = getResultList(hql, constraintToQuery);
@@ -388,13 +410,14 @@ public void filterByUntranslatedAndModifiedPerson() {
 
     @Test
     public void filterByContentAndModifiedPersonAndState() {
+        String username = admin.getAccount().getUsername();
         FilterConstraintToQuery constraintToQuery =
                 FilterConstraintToQuery.filterInSingleDocument(
                         FilterConstraints.builder().keepNone()
                                 .checkInSource(true).checkInTarget(true)
                                 .filterBy("source")
                                 .includeStates(untranslatedOnly)
-                                .lastModifiedBy("admin").build(), documentId);
+                                .lastModifiedBy(username).build(), documentId);
 
         String hql = constraintToQuery.toEntityQuery();
         List<HTextFlow> result = getResultList(hql, constraintToQuery);