Updated Branches: refs/heads/5.3 07709f29b -> e0b1a96d9
RESOLVED - TAP5-2101: BeanEditor should always provide a new BeanValidationContext (JSR-303) - fix failing tests, manual merge from master Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/e0b1a96d Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/e0b1a96d Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/e0b1a96d Branch: refs/heads/5.3 Commit: e0b1a96d9e646b501cd88cf465425f7ee3104c53 Parents: 07709f2 Author: kaosko <[email protected]> Authored: Sun Apr 21 21:01:34 2013 -0700 Committer: kaosko <[email protected]> Committed: Sun Apr 21 21:01:34 2013 -0700 ---------------------------------------------------------------------- .../corelib/components/BeanEditorTest.java | 20 +++++++------- 1 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/e0b1a96d/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..bec719e 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,7 @@ 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() @@ -178,6 +176,10 @@ public class BeanEditorTest extends TapestryTestCase }; expect(env.push(eq(BeanEditContext.class), contextEq())).andReturn(ctxt); + + expect(env.push(eq(BeanValidationContext.class), isA(BeanValidationContext.class))) + .andReturn(null); + replay(); BeanEditor component = new BeanEditor(); @@ -188,7 +190,7 @@ public class BeanEditorTest extends TapestryTestCase verify(); } - + @Test public void refresh_bean_validation_context() { @@ -208,13 +210,9 @@ 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() @@ -252,6 +250,8 @@ public class BeanEditorTest extends TapestryTestCase expect(env.pop(BeanEditContext.class)).andReturn(null); + expect(env.pop(BeanValidationContext.class)).andReturn(null); + replay(); BeanEditor component = new BeanEditor();
