Updated Branches: refs/heads/master 7c14d4a26 -> e954445f9
RESOLVED - TAP5-2101: BeanEditor should always provide a new BeanValidationContext (JSR-303) - fix failing test Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/e954445f Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/e954445f Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/e954445f Branch: refs/heads/master Commit: e954445f990d6528ee3f2f0bc23a31b2a361ecd5 Parents: 7c14d4a Author: kaosko <[email protected]> Authored: Mon Apr 15 23:38:55 2013 -0700 Committer: kaosko <[email protected]> Committed: Mon Apr 15 23:38:55 2013 -0700 ---------------------------------------------------------------------- .../corelib/components/BeanEditorTest.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e954445f/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/BeanEditorTest.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/BeanEditorTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/BeanEditorTest.java index b335868..c824180 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/BeanEditorTest.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/BeanEditorTest.java @@ -159,9 +159,9 @@ public class BeanEditorTest extends TapestryTestCase train_getOverrideMessages(overrides, messages); expect(model.newInstance()).andReturn(data); - + expect(env.peek(eq(BeanValidationContext.class))).andReturn(null); - + expect(model.getBeanType()).andReturn(RegistrationData.class); BeanEditContext ctxt = new BeanEditContext() @@ -188,7 +188,7 @@ public class BeanEditorTest extends TapestryTestCase verify(); } - + @Test public void refresh_bean_validation_context() { @@ -208,13 +208,13 @@ public class BeanEditorTest extends TapestryTestCase train_getOverrideMessages(overrides, messages); expect(model.newInstance()).andReturn(data); - + expect(env.peek(eq(BeanValidationContext.class))).andReturn(beanValidationContext); - + expect(env.pop(eq(BeanValidationContext.class))).andReturn(beanValidationContext); - + expect(env.push(eq(BeanValidationContext.class), isA(BeanValidationContext.class))).andReturn(beanValidationContext); - + expect(model.getBeanType()).andReturn(RegistrationData.class); BeanEditContext ctxt = new BeanEditContext() @@ -251,6 +251,7 @@ public class BeanEditorTest extends TapestryTestCase PropertyOverrides overrides = mockPropertyOverrides(); expect(env.pop(BeanEditContext.class)).andReturn(null); + expect(env.pop(BeanValidationContext.class)).andReturn(null); replay();
