inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud)

Browse Source 
87707: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      87551: MNT-12191 : Intermittent test failure: CronScheduledQueryBasedTemplateActionDefinitionTest.testQueryTemplateFunctionsUnescapingMnt11598
      Fixed the test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 09:48:16 +00:00
parent 7b555931f1
commit 3458af98f2
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/test-java/org/alfresco/repo/action/scheduled/CronScheduledQueryBasedTemplateActionDefinitionTest.java
View File

@@ -45,6 +45,7 @@ import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.search.ResultSet; import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.ISO8601DateFormat;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -61,7 +62,7 @@ import org.springframework.context.ApplicationContext;
*/ */
public class CronScheduledQueryBasedTemplateActionDefinitionTest extends TestCase public class CronScheduledQueryBasedTemplateActionDefinitionTest extends TestCase
{ {
private static final int AMOUNT_OF_DAYS_BEFORE = -2; private static final int AMOUNT_OF_DAYS_BEFORE = -4;
private static final int TEST_DOCUMENTS_AMOUNT = 5; private static final int TEST_DOCUMENTS_AMOUNT = 5;
@@ -124,7 +125,7 @@ public class CronScheduledQueryBasedTemplateActionDefinitionTest extends TestCas
private static final String YESTERDAY_TEST_DOCUMENT_NAME_TEMPLATE = "Yesterday" + TEST_DOCUMENT_NAME_TEMPLATE; private static final String YESTERDAY_TEST_DOCUMENT_NAME_TEMPLATE = "Yesterday" + TEST_DOCUMENT_NAME_TEMPLATE;
private static final String MNT_11598_QUERY_TEMPLATE = "@cm\\:created:\\$\\{luceneDateRange(yesterday, \"-P10Y\")\\}"; private static final String MNT_11598_QUERY_TEMPLATE = "@cm\\:created:\\$\\{luceneDateRange(\"%s\", \"-P10Y\")\\}";
private static final String TEST_FOLDER_NAME = String.format(ROOT_TEST_FOLDER_NAME_TEMPLATE, System.currentTimeMillis()); private static final String TEST_FOLDER_NAME = String.format(ROOT_TEST_FOLDER_NAME_TEMPLATE, System.currentTimeMillis());
@@ -275,6 +276,10 @@ public class CronScheduledQueryBasedTemplateActionDefinitionTest extends TestCas
{ {
Thread.sleep(500); Thread.sleep(500);
} }
else
{
break;
}
} }
assertFalse("The content was not created or indexed correctly.", notFound); assertFalse("The content was not created or indexed correctly.", notFound);
} }
@@ -299,7 +304,13 @@ public class CronScheduledQueryBasedTemplateActionDefinitionTest extends TestCas
@Test @Test
public void testQueryTemplateFunctionsUnescapingMnt11598() throws Exception public void testQueryTemplateFunctionsUnescapingMnt11598() throws Exception
{ {
scheduler.setQueryTemplate(MNT_11598_QUERY_TEMPLATE); // Set the query to 2 days ago
Calendar calendar = GregorianCalendar.getInstance();
calendar.setTimeInMillis(System.currentTimeMillis());
calendar.add(Calendar.DAY_OF_YEAR, AMOUNT_OF_DAYS_BEFORE + 2);
String isoDate = ISO8601DateFormat.format(calendar.getTime());
String queryTemplate = String.format(MNT_11598_QUERY_TEMPLATE, isoDate);
scheduler.setQueryTemplate(queryTemplate);
Set<NodeRef> actualNodes = new HashSet<NodeRef>(scheduler.getNodes()); Set<NodeRef> actualNodes = new HashSet<NodeRef>(scheduler.getNodes());
assertNotNull("Result set must not be null!", actualNodes); assertNotNull("Result set must not be null!", actualNodes);