ALF-11518 and ALF-11519: unify separate validation/differences lists and move text generation to Result classes.

ALF-11518: Unify differences and validation results lists
ALF-11519: Move validation/diff result text generation from SchemaBootstrap to result classes.



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32110 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2011-11-18 18:20:53 +00:00
parent 50ad2d600c
commit 29dadc748a
25 changed files with 554 additions and 167 deletions

View File

@@ -49,7 +49,7 @@ public class NameValidator implements DbValidator
if (pattern != null && !pattern.matcher(name).matches())
{
ctx.getValidationResults().add(result);
ctx.getComparisonResults().add(result);
}
}

View File

@@ -22,7 +22,6 @@ package org.alfresco.util.schemacomp.validator;
import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
import org.alfresco.util.schemacomp.DiffContext;
@@ -43,14 +42,14 @@ public class NameValidatorTest
{
private NameValidator validator;
private DiffContext ctx;
private List<ValidationResult> validationResults;
private Results validationResults;
@Before
public void setUp() throws Exception
{
validator = new NameValidator();
validationResults = new ArrayList<ValidationResult>();
ctx = new DiffContext(new Oracle10gDialect(), new Results(), validationResults, null, null);
validationResults = new Results();
ctx = new DiffContext(new Oracle10gDialect(), validationResults, null, null);
}
@Test
@@ -63,8 +62,8 @@ public class NameValidatorTest
validator.validate(null, indexForName("MY_INDEX"), ctx);
assertEquals(2, validationResults.size());
assertEquals("SYS_", validationResults.get(0).getValue());
assertEquals("MY_INDEX", validationResults.get(1).getValue());
assertEquals("SYS_", ((ValidationResult) validationResults.get(0)).getValue());
assertEquals("MY_INDEX", ((ValidationResult) validationResults.get(1)).getValue());
}
@Test
@@ -76,7 +75,7 @@ public class NameValidatorTest
validator.validate(null, indexForName("SYS_MYINDEX"), ctx);
assertEquals(1, validationResults.size());
assertEquals("SYS_MYINDEX", validationResults.get(0).getValue());
assertEquals("SYS_MYINDEX", ((ValidationResult) validationResults.get(0)).getValue());
}