This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 091198bed30e2cf34fbf2ba09f12771adb2c5382 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Feb 19 19:51:06 2015 +0100 fix validation service test using a customize validation data context --- .../tutti/service/ValidationServiceTest.java | 48 +++++++++++++++------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/ValidationServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/ValidationServiceTest.java index 29b5f02..78685c1 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/ValidationServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/ValidationServiceTest.java @@ -51,18 +51,16 @@ public class ValidationServiceTest extends AbstractServiceTest { private ValidationService service; - private TuttiDataContextFake dataContext; + private TuttiDataValidationContextFake validationContext; @Override protected TuttiServiceContext createServiceContext(TuttiConfiguration config) { - return new TuttiServiceContext(config, dataContext = new TuttiDataContextFake()); - } -// @Override -// protected TuttiServiceContext createServiceContext(RessourceClassLoader loader, -// TuttiConfiguration config) { -// return new TuttiServiceContext(loader, config, dataContext = new TuttiDataContextFake()); -// } + TuttiDataContext dataContext = new TuttiDataContext(); + dataContext.setValidationContext(new TuttiDataValidationContextFake(dataContext)); + + return new TuttiServiceContext(config, dataContext); + } @Before public void setUp() throws Exception { @@ -70,6 +68,8 @@ public class ValidationServiceTest extends AbstractServiceTest { super.setUp(); service = serviceContext.getService(ValidationService.class); + validationContext = (TuttiDataValidationContextFake) serviceContext.getDataContext().getValidationContext(); + } @Test @@ -122,7 +122,7 @@ public class ValidationServiceTest extends AbstractServiceTest { p3.setZone(z); // now program in data context - dataContext.setExistingPrograms(Lists.newArrayList(p2, p3)); + validationContext.setExistingPrograms(Lists.newArrayList(p2, p3)); // no more valid assertIsNotValid(service.validateProgram(p)); @@ -163,7 +163,7 @@ public class ValidationServiceTest extends AbstractServiceTest { p3.setName("pName2"); // now program in data context - dataContext.setExistingProtocols(Lists.newArrayList(p2, p3)); + validationContext.setExistingProtocols(Lists.newArrayList(p2, p3)); // no more valid assertIsNotValid(service.validateProtocol(p)); @@ -201,18 +201,36 @@ public class ValidationServiceTest extends AbstractServiceTest { Assert.assertTrue(validatorResult.isValid()); } - class TuttiDataContextFake extends TuttiDataContext { + class TuttiDataValidationContextFake extends TuttiValidationDataContext { - @Override - protected void checkOpened() { + List<Program> existingPrograms; + + List<TuttiProtocol> existingProtocols; + + public TuttiDataValidationContextFake(TuttiDataContext dataContext) { + super(dataContext); } public void setExistingPrograms(List<Program> existingPrograms) { - getValidationContext().existingPrograms = existingPrograms; + this.existingPrograms = existingPrograms; + resetExistingPrograms(); } public void setExistingProtocols(List<TuttiProtocol> existingProtocols) { - getValidationContext().existingProtocols = existingProtocols; + this.existingProtocols = existingProtocols; + resetExistingProtocols(); } + + @Override + protected List<Program> loadExistingPrograms() { + return existingPrograms; + } + + @Override + protected List<TuttiProtocol> loadExistingProtocols() { + return existingProtocols; + } + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.