From 8fed3f02c0d8eae42cf1d9ddb82b8ca675dc837a Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Fri, 8 Aug 2008 21:27:55 +0000 Subject: [PATCH] polish --- .../DefaultExpressionParserFactoryTests.java | 28 ++++++++----------- .../webflow/mvc/view/MvcViewTests.java | 8 ++++++ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/spring-webflow/src/test/java/org/springframework/webflow/expression/DefaultExpressionParserFactoryTests.java b/spring-webflow/src/test/java/org/springframework/webflow/expression/DefaultExpressionParserFactoryTests.java index 5f207d0c..dab6127e 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/expression/DefaultExpressionParserFactoryTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/expression/DefaultExpressionParserFactoryTests.java @@ -15,15 +15,9 @@ */ package org.springframework.webflow.expression; -import java.util.Calendar; - import junit.framework.TestCase; -import org.springframework.binding.convert.service.DefaultConversionService; -import org.springframework.binding.expression.Expression; import org.springframework.binding.expression.ExpressionParser; -import org.springframework.binding.expression.support.FluentParserContext; -import org.springframework.webflow.TestBean; /** * Unit tests for {@link DefaultExpressionParserFactory}. @@ -35,15 +29,15 @@ public class DefaultExpressionParserFactoryTests extends TestCase { assertNotNull(parser); } - public void testGetDefaultExpressionParserConversionService() { - DefaultConversionService conversionService = new DefaultConversionService(); - ExpressionParser parser = DefaultExpressionParserFactory.getExpressionParser(conversionService); - Expression exp = parser.parseExpression("datum3", new FluentParserContext().expectResult(String.class)); - TestBean context = new TestBean(); - Calendar cal = Calendar.getInstance(); - cal.set(2008, 1, 1); - exp.setValue(context, cal.getTime()); - String string = (String) exp.getValue(context); - assertEquals(null, string); - } + // public void testGetDefaultExpressionParserConversionService() { + // DefaultConversionService conversionService = new DefaultConversionService(); + // ExpressionParser parser = DefaultExpressionParserFactory.getExpressionParser(conversionService); + // Expression exp = parser.parseExpression("datum3", new FluentParserContext().expectResult(String.class)); + // TestBean context = new TestBean(); + // Calendar cal = Calendar.getInstance(); + // cal.set(2008, 1, 1); + // exp.setValue(context, cal.getTime()); + // String string = (String) exp.getValue(context); + // assertEquals(null, string); + // } } diff --git a/spring-webflow/src/test/java/org/springframework/webflow/mvc/view/MvcViewTests.java b/spring-webflow/src/test/java/org/springframework/webflow/mvc/view/MvcViewTests.java index 1431ac8b..636265cb 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/mvc/view/MvcViewTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/mvc/view/MvcViewTests.java @@ -28,6 +28,7 @@ import org.springframework.webflow.engine.ViewState; import org.springframework.webflow.engine.builder.BinderConfiguration; import org.springframework.webflow.engine.builder.BinderConfiguration.Binding; import org.springframework.webflow.execution.RequestContext; +import org.springframework.webflow.expression.DefaultExpressionParserFactory; import org.springframework.webflow.test.MockFlowExecutionKey; import org.springframework.webflow.test.MockRequestContext; import org.springframework.webflow.test.MockRequestControlContext; @@ -53,6 +54,7 @@ public class MvcViewTests extends TestCase { context.getMockFlowExecutionContext().setKey(new MockFlowExecutionKey("c1v1")); org.springframework.web.servlet.View mvcView = new MockView(); AbstractMvcView view = new MockMvcView(mvcView, context); + view.setExpressionParser(DefaultExpressionParserFactory.getExpressionParser()); view.render(); assertTrue(renderCalled); assertEquals("bar", model.get("foo")); @@ -82,6 +84,7 @@ public class MvcViewTests extends TestCase { context.getMockExternalContext().setNativeResponse(new MockHttpServletResponse()); org.springframework.web.servlet.View mvcView = new MockView(); AbstractMvcView view = new MockMvcView(mvcView, context); + view.setExpressionParser(DefaultExpressionParserFactory.getExpressionParser()); view.render(); assertTrue(renderCalled); assertEquals("bar", model.get("foo")); @@ -109,6 +112,7 @@ public class MvcViewTests extends TestCase { context.getMockFlowExecutionContext().setKey(new MockFlowExecutionKey("c1v1")); org.springframework.web.servlet.View mvcView = new MockView(); AbstractMvcView view = new MockMvcView(mvcView, context); + view.setExpressionParser(DefaultExpressionParserFactory.getExpressionParser()); view.setConversionService(new DefaultConversionService()); view.render(); assertEquals(context.getFlowScope().get("bindBean"), model.get("bindBean")); @@ -169,6 +173,7 @@ public class MvcViewTests extends TestCase { context.getMockFlowExecutionContext().setKey(new MockFlowExecutionKey("c1v1")); org.springframework.web.servlet.View mvcView = new MockView(); AbstractMvcView view = new MockMvcView(mvcView, context); + view.setExpressionParser(DefaultExpressionParserFactory.getExpressionParser()); view.processUserEvent(); assertTrue(view.hasFlowEvent()); assertEquals("submit", view.getFlowEvent().getId()); @@ -216,6 +221,7 @@ public class MvcViewTests extends TestCase { context.getMockFlowExecutionContext().setKey(new MockFlowExecutionKey("c1v1")); org.springframework.web.servlet.View mvcView = new MockView(); AbstractMvcView view = new MockMvcView(mvcView, context); + view.setExpressionParser(DefaultExpressionParserFactory.getExpressionParser()); BinderConfiguration binderConfiguration = new BinderConfiguration(); binderConfiguration.addBinding(new Binding("stringProperty", null, true)); view.setBinderConfiguration(binderConfiguration); @@ -246,6 +252,7 @@ public class MvcViewTests extends TestCase { context.getMockFlowExecutionContext().setKey(new MockFlowExecutionKey("c1v1")); org.springframework.web.servlet.View mvcView = new MockView(); AbstractMvcView view = new MockMvcView(mvcView, context); + view.setExpressionParser(DefaultExpressionParserFactory.getExpressionParser()); HashSet allowedBindFields = new HashSet(); allowedBindFields.add("booleanProperty"); view.processUserEvent(); @@ -268,6 +275,7 @@ public class MvcViewTests extends TestCase { context.getMockFlowExecutionContext().setKey(new MockFlowExecutionKey("c1v1")); org.springframework.web.servlet.View mvcView = new MockView(); AbstractMvcView view = new MockMvcView(mvcView, context); + view.setExpressionParser(DefaultExpressionParserFactory.getExpressionParser()); view.processUserEvent(); assertEquals(true, bindBean.getBooleanProperty()); }