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

RM-1234, Changed formatting of date.year.week substitution to match help text

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@63075 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Hibbins
2014-02-21 18:06:49 +00:00
parent cc073a62d3
commit 7b34e060f9
4 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java
View File

@@ -47,13 +47,18 @@ public class DateParameterProcessor extends ParameterProcessor implements Parame
private static final String[] ALL_FIELDS_FOR_SUBSTITUTION_QUERY = { private static final String[] ALL_FIELDS_FOR_SUBSTITUTION_QUERY = {
DAY + SEP + SHORT, DAY + SEP + SHORT,
DAY,
DAY + SEP + LONG, DAY + SEP + LONG,
DAY + SEP + NUMBER, DAY + SEP + NUMBER,
DAY + SEP + YEAR,
MONTH + SEP + SHORT, MONTH + SEP + SHORT,
MONTH,
MONTH + SEP + LONG, MONTH + SEP + LONG,
MONTH + SEP + NUMBER, MONTH + SEP + NUMBER,
YEAR + SEP + SHORT, YEAR + SEP + SHORT,
YEAR + SEP + LONG YEAR,
YEAR + SEP + LONG,
YEAR + SEP + WEEK
}; };
/** /**
@@ -163,7 +168,7 @@ public class DateParameterProcessor extends ParameterProcessor implements Parame
} }
else if (WEEK.equalsIgnoreCase(style)) else if (WEEK.equalsIgnoreCase(style))
{ {
pattern = "w"; pattern = "ww";
} }
else else
{ {

2
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/TestActionPropertySubs.java
View File

@@ -70,7 +70,7 @@ public class TestActionPropertySubs extends RMActionExecuterAbstractBase
String monthNumber = new SimpleDateFormat("MM").format(date); String monthNumber = new SimpleDateFormat("MM").format(date);
String yearShort = new SimpleDateFormat("yy").format(date); String yearShort = new SimpleDateFormat("yy").format(date);
String yearLong = new SimpleDateFormat("yyyy").format(date); String yearLong = new SimpleDateFormat("yyyy").format(date);
String yearWeek = new SimpleDateFormat("w").format(date); String yearWeek = new SimpleDateFormat("ww").format(date);
String name = (String) nodeService.getProperty(actionedUponNodeRef, ContentModel.PROP_NAME); String name = (String) nodeService.getProperty(actionedUponNodeRef, ContentModel.PROP_NAME);
String company = I18NUtil.getMessage("test.company"); String company = I18NUtil.getMessage("test.company");

28
rm-server/test/java/org/alfresco/repo/action/parameter/DateParameterProcessorTest.java
View File

@@ -47,14 +47,19 @@ public class DateParameterProcessorTest
{ {
List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("date"); List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("date");
assertTrue(suggestions.contains("date.day.short")); assertTrue(suggestions.contains("date.day.short"));
assertTrue(suggestions.contains("date.day"));
assertTrue(suggestions.contains("date.day.long")); assertTrue(suggestions.contains("date.day.long"));
assertTrue(suggestions.contains("date.day.number")); assertTrue(suggestions.contains("date.day.number"));
assertTrue(suggestions.contains("date.day.year"));
assertTrue(suggestions.contains("date.month.short")); assertTrue(suggestions.contains("date.month.short"));
assertTrue(suggestions.contains("date.month"));
assertTrue(suggestions.contains("date.month.long")); assertTrue(suggestions.contains("date.month.long"));
assertTrue(suggestions.contains("date.month.number")); assertTrue(suggestions.contains("date.month.number"));
assertTrue(suggestions.contains("date.year.short")); assertTrue(suggestions.contains("date.year.short"));
assertTrue(suggestions.contains("date.year"));
assertTrue(suggestions.contains("date.year.long")); assertTrue(suggestions.contains("date.year.long"));
assertEquals(8, suggestions.size()); assertTrue(suggestions.contains("date.year.week"));
assertEquals(13, suggestions.size());
} }
@Test @Test
@@ -62,14 +67,19 @@ public class DateParameterProcessorTest
{ {
List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("dat"); List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("dat");
assertTrue(suggestions.contains("date.day.short")); assertTrue(suggestions.contains("date.day.short"));
assertTrue(suggestions.contains("date.day"));
assertTrue(suggestions.contains("date.day.long")); assertTrue(suggestions.contains("date.day.long"));
assertTrue(suggestions.contains("date.day.number")); assertTrue(suggestions.contains("date.day.number"));
assertTrue(suggestions.contains("date.day.year"));
assertTrue(suggestions.contains("date.month.short")); assertTrue(suggestions.contains("date.month.short"));
assertTrue(suggestions.contains("date.month"));
assertTrue(suggestions.contains("date.month.long")); assertTrue(suggestions.contains("date.month.long"));
assertTrue(suggestions.contains("date.month.number")); assertTrue(suggestions.contains("date.month.number"));
assertTrue(suggestions.contains("date.year.short")); assertTrue(suggestions.contains("date.year.short"));
assertTrue(suggestions.contains("date.year"));
assertTrue(suggestions.contains("date.year.long")); assertTrue(suggestions.contains("date.year.long"));
assertEquals(8, suggestions.size()); assertTrue(suggestions.contains("date.year.week"));
assertEquals(13, suggestions.size());
} }
@Test @Test
@@ -77,14 +87,19 @@ public class DateParameterProcessorTest
{ {
List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("at"); List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("at");
assertTrue(suggestions.contains("date.day.short")); assertTrue(suggestions.contains("date.day.short"));
assertTrue(suggestions.contains("date.day"));
assertTrue(suggestions.contains("date.day.long")); assertTrue(suggestions.contains("date.day.long"));
assertTrue(suggestions.contains("date.day.number")); assertTrue(suggestions.contains("date.day.number"));
assertTrue(suggestions.contains("date.day.year"));
assertTrue(suggestions.contains("date.month.short")); assertTrue(suggestions.contains("date.month.short"));
assertTrue(suggestions.contains("date.month"));
assertTrue(suggestions.contains("date.month.long")); assertTrue(suggestions.contains("date.month.long"));
assertTrue(suggestions.contains("date.month.number")); assertTrue(suggestions.contains("date.month.number"));
assertTrue(suggestions.contains("date.year.short")); assertTrue(suggestions.contains("date.year.short"));
assertTrue(suggestions.contains("date.year"));
assertTrue(suggestions.contains("date.year.long")); assertTrue(suggestions.contains("date.year.long"));
assertEquals(8, suggestions.size()); assertTrue(suggestions.contains("date.year.week"));
assertEquals(13, suggestions.size());
} }
@Test @Test
@@ -92,9 +107,11 @@ public class DateParameterProcessorTest
{ {
List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("ay"); List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("ay");
assertTrue(suggestions.contains("date.day.short")); assertTrue(suggestions.contains("date.day.short"));
assertTrue(suggestions.contains("date.day"));
assertTrue(suggestions.contains("date.day.long")); assertTrue(suggestions.contains("date.day.long"));
assertTrue(suggestions.contains("date.day.number")); assertTrue(suggestions.contains("date.day.number"));
assertEquals(3, suggestions.size()); assertTrue(suggestions.contains("date.day.year"));
assertEquals(5, suggestions.size());
} }
@Test @Test
@@ -103,10 +120,11 @@ public class DateParameterProcessorTest
List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("on"); List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("on");
assertTrue(suggestions.contains("date.day.long")); assertTrue(suggestions.contains("date.day.long"));
assertTrue(suggestions.contains("date.month.short")); assertTrue(suggestions.contains("date.month.short"));
assertTrue(suggestions.contains("date.month"));
assertTrue(suggestions.contains("date.month.long")); assertTrue(suggestions.contains("date.month.long"));
assertTrue(suggestions.contains("date.month.number")); assertTrue(suggestions.contains("date.month.number"));
assertTrue(suggestions.contains("date.year.long")); assertTrue(suggestions.contains("date.year.long"));
assertEquals(5, suggestions.size()); assertEquals(6, suggestions.size());
} }
} }

3
rm-server/test/java/org/alfresco/repo/web/scripts/SubstitutionSuggestionsRestApiTest.java
View File

@@ -86,7 +86,8 @@ public class SubstitutionSuggestionsRestApiTest extends BaseRMWebScriptTestCase
{ {
"date.month.number", "date.month.number",
"date.month.long", "date.month.long",
"date.month.short" "date.month.short",
"date.month"
}); });
} }
} }