RM-1144 & RM-1145 - changes to file to action - post review changes

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@61188 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Hibbins
2014-02-05 21:23:03 +00:00
parent 24404bab60
commit 241a88c1e3
5 changed files with 66 additions and 89 deletions

View File

@@ -34,7 +34,7 @@ public class DateParameterProcessorTest
{
private DateParameterProcessor dateParameterProcessor;
@Before
public void setUp() throws Exception
{
@@ -46,80 +46,55 @@ public class DateParameterProcessorTest
public void testGetSubstitutionSuggestions_All_01()
{
List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("date");
assertTrue(suggestions.contains("date.day"));
assertTrue(suggestions.contains("date.day.short"));
assertTrue(suggestions.contains("date.day.long"));
assertTrue(suggestions.contains("date.day.number"));
assertTrue(suggestions.contains("date.week"));
assertTrue(suggestions.contains("date.week.short"));
assertTrue(suggestions.contains("date.week.long"));
assertTrue(suggestions.contains("date.week.number"));
assertTrue(suggestions.contains("date.month"));
assertTrue(suggestions.contains("date.month.short"));
assertTrue(suggestions.contains("date.month.long"));
assertTrue(suggestions.contains("date.month.number"));
assertTrue(suggestions.contains("date.year"));
assertTrue(suggestions.contains("date.year.short"));
assertTrue(suggestions.contains("date.year.long"));
assertTrue(suggestions.contains("date.year.number"));
assertEquals(16, suggestions.size());
assertEquals(8, suggestions.size());
}
@Test
public void testGetSubstitutionSuggestions_All_02()
{
List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("dat");
assertTrue(suggestions.contains("date.day"));
assertTrue(suggestions.contains("date.day.short"));
assertTrue(suggestions.contains("date.day.long"));
assertTrue(suggestions.contains("date.day.number"));
assertTrue(suggestions.contains("date.week"));
assertTrue(suggestions.contains("date.week.short"));
assertTrue(suggestions.contains("date.week.long"));
assertTrue(suggestions.contains("date.week.number"));
assertTrue(suggestions.contains("date.month"));
assertTrue(suggestions.contains("date.month.short"));
assertTrue(suggestions.contains("date.month.long"));
assertTrue(suggestions.contains("date.month.number"));
assertTrue(suggestions.contains("date.year"));
assertTrue(suggestions.contains("date.year.short"));
assertTrue(suggestions.contains("date.year.long"));
assertTrue(suggestions.contains("date.year.number"));
assertEquals(16, suggestions.size());
assertEquals(8, suggestions.size());
}
@Test
public void testGetSubstitutionSuggestions_All_03()
{
List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("at");
assertTrue(suggestions.contains("date.day"));
assertTrue(suggestions.contains("date.day.short"));
assertTrue(suggestions.contains("date.day.long"));
assertTrue(suggestions.contains("date.day.number"));
assertTrue(suggestions.contains("date.week"));
assertTrue(suggestions.contains("date.week.short"));
assertTrue(suggestions.contains("date.week.long"));
assertTrue(suggestions.contains("date.week.number"));
assertTrue(suggestions.contains("date.month"));
assertTrue(suggestions.contains("date.month.short"));
assertTrue(suggestions.contains("date.month.long"));
assertTrue(suggestions.contains("date.month.number"));
assertTrue(suggestions.contains("date.year"));
assertTrue(suggestions.contains("date.year.short"));
assertTrue(suggestions.contains("date.year.long"));
assertTrue(suggestions.contains("date.year.number"));
assertEquals(16, suggestions.size());
assertEquals(8, suggestions.size());
}
@Test
public void testGetSubstitutionSuggestions_Partial_01()
{
List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("ay");
assertTrue(suggestions.contains("date.day"));
assertTrue(suggestions.contains("date.day.short"));
assertTrue(suggestions.contains("date.day.long"));
assertTrue(suggestions.contains("date.day.number"));
assertEquals(4, suggestions.size());
assertEquals(3, suggestions.size());
}
@Test
@@ -127,13 +102,11 @@ public class DateParameterProcessorTest
{
List<String> suggestions = this.dateParameterProcessor.getSubstitutionSuggestions("on");
assertTrue(suggestions.contains("date.day.long"));
assertTrue(suggestions.contains("date.week.long"));
assertTrue(suggestions.contains("date.month"));
assertTrue(suggestions.contains("date.month.short"));
assertTrue(suggestions.contains("date.month.long"));
assertTrue(suggestions.contains("date.month.number"));
assertTrue(suggestions.contains("date.year.long"));
assertEquals(7, suggestions.size());
assertEquals(5, suggestions.size());
}
}

View File

@@ -84,7 +84,6 @@ public class SubstitutionSuggestionsRestApiTest extends BaseRMWebScriptTestCase
{
return Arrays.asList(new String[]
{
"date.month",
"date.month.number",
"date.month.long",
"date.month.short"