[waffle-scm] [557] trunk: WAFFLE-56: Added instance of ParameterResolver to PicoRegistrarMockery.

Fri, 18 Jan 2008 07:17:00 -0800

Title: [waffle-scm] [557] trunk: WAFFLE-56: Added instance of ParameterResolver to PicoRegistrarMockery.
Revision
557
Author
mauro
Date
2008-01-18 09:16:56 -0600 (Fri, 18 Jan 2008)

Log Message

WAFFLE-56:  Added instance of ParameterResolver to PicoRegistrarMockery.  Added unit test.


Modified Paths




Added Paths

Diff

Modified: trunk/.classpath (556 => 557)

--- trunk/.classpath	2008-01-17 17:16:09 UTC (rev 556)
+++ trunk/.classpath	2008-01-18 15:16:56 UTC (rev 557)
@@ -5,6 +5,7 @@
 	<classpathentry kind="src" path="waffle-core/src/test/java"/>
     <classpathentry kind="src" path="waffle-core/src/test/resources"/>
     <classpathentry kind="src" path="waffle-mock/src/main/java"/>
+    <classpathentry kind="src" path="waffle-mock/src/test/java"/>
     <classpathentry kind="src" path="waffle-resources/src/main/resources"/>
 	<classpathentry kind="src" path="waffle-taglib/src/main/java"/>
 	<classpathentry kind="src" path="waffle-taglib/src/test/java"/>

Modified: trunk/waffle-mock/src/main/java/org/codehaus/waffle/mock/PicoRegistrarMockery.java (556 => 557)

--- trunk/waffle-mock/src/main/java/org/codehaus/waffle/mock/PicoRegistrarMockery.java	2008-01-17 17:16:09 UTC (rev 556)
+++ trunk/waffle-mock/src/main/java/org/codehaus/waffle/mock/PicoRegistrarMockery.java	2008-01-18 15:16:56 UTC (rev 557)
@@ -1,13 +1,17 @@
 package org.codehaus.waffle.mock;
 
+import org.codehaus.waffle.bind.DefaultStringTransmuter;
+import org.codehaus.waffle.bind.ognl.OgnlValueConverterFinder;
 import org.codehaus.waffle.context.ContextContainer;
 import org.codehaus.waffle.context.pico.PicoContextContainer;
 import org.codehaus.waffle.context.pico.PicoLifecycleStrategy;
 import org.codehaus.waffle.registrar.Registrar;
+import org.codehaus.waffle.registrar.pico.DefaultParameterResolver;
+import org.codehaus.waffle.registrar.pico.ParameterResolver;
 import org.codehaus.waffle.registrar.pico.PicoRegistrar;
 import org.picocontainer.MutablePicoContainer;
+import org.picocontainer.defaults.LifecycleStrategy;
 import org.picocontainer.monitors.NullComponentMonitor;
-import org.picocontainer.defaults.LifecycleStrategy;
 
 /**
  * Registrar Mockery that uses PicoContainer as the ContextContainer
@@ -22,6 +26,7 @@
 
     protected Registrar createRegistrar(ContextContainer container) {
         LifecycleStrategy lifecycleStrategy = new PicoLifecycleStrategy(new NullComponentMonitor());
-        return new PicoRegistrar((MutablePicoContainer) container.getDelegate(), null, lifecycleStrategy, getRegistrarMonitor(container));
+        ParameterResolver parameterResolver = new DefaultParameterResolver(new DefaultStringTransmuter(new OgnlValueConverterFinder()));
+        return new PicoRegistrar((MutablePicoContainer) container.getDelegate(), parameterResolver, lifecycleStrategy, getRegistrarMonitor(container));
     }
 }

Added: trunk/waffle-mock/src/test/java/org/codehaus/waffle/mock/ParameterController.java (0 => 557)

--- trunk/waffle-mock/src/test/java/org/codehaus/waffle/mock/ParameterController.java	                        (rev 0)
+++ trunk/waffle-mock/src/test/java/org/codehaus/waffle/mock/ParameterController.java	2008-01-18 15:16:56 UTC (rev 557)
@@ -0,0 +1,19 @@
+package org.codehaus.waffle.mock;
+
+public class ParameterController {
+    private String name;
+    private Integer age;
+
+    public ParameterController(String name, Integer age) {
+        this.name = name;
+        this.age = age;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+}

Added: trunk/waffle-mock/src/test/java/org/codehaus/waffle/mock/ParameterRegistrar.java (0 => 557)

--- trunk/waffle-mock/src/test/java/org/codehaus/waffle/mock/ParameterRegistrar.java	                        (rev 0)
+++ trunk/waffle-mock/src/test/java/org/codehaus/waffle/mock/ParameterRegistrar.java	2008-01-18 15:16:56 UTC (rev 557)
@@ -0,0 +1,19 @@
+package org.codehaus.waffle.mock;
+
+import org.codehaus.waffle.registrar.AbstractRegistrar;
+import org.codehaus.waffle.registrar.Registrar;
+import org.codehaus.waffle.registrar.RequestParameterReference;
+
+public class ParameterRegistrar extends AbstractRegistrar {
+
+    public ParameterRegistrar(Registrar delegate) {
+        super(delegate);
+    }
+
+    @Override
+    public void request() {
+        register("parameter_example", ParameterController.class, "Mike", 
+                RequestParameterReference.requestParameter("age", 30));
+    }
+
+}

Added: trunk/waffle-mock/src/test/java/org/codehaus/waffle/mock/PicoRegistrarMockeryTest.java (0 => 557)

--- trunk/waffle-mock/src/test/java/org/codehaus/waffle/mock/PicoRegistrarMockeryTest.java	                        (rev 0)
+++ trunk/waffle-mock/src/test/java/org/codehaus/waffle/mock/PicoRegistrarMockeryTest.java	2008-01-18 15:16:56 UTC (rev 557)
@@ -0,0 +1,34 @@
+/*****************************************************************************
+ * Copyright (C) 2005,2006 Michael Ward                                      *
+ * All rights reserved.                                                      *
+ * ------------------------------------------------------------------------- *
+ * The software in this package is published under the terms of the BSD      *
+ * style license a copy of which has been included with this distribution in *
+ * the LICENSE.txt file.                                                     *
+ *                                                                           *
+ * Original code by: Michael Ward                                            *
+ *****************************************************************************/
+package org.codehaus.waffle.mock;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.jmock.Expectations;
+import org.junit.Test;
+
+/**
+ * @author Mauro Talevi
+ */
+public class PicoRegistrarMockeryTest {
+
+    @Test
+    public void canAssertConfigurationWithParameters() {
+        PicoRegistrarMockery mockery = new PicoRegistrarMockery();
+        final HttpServletRequest request = mockery.mockHttpServletRequest();
+        mockery.checking(new Expectations(){{
+            atLeast(1).of(request).getParameter(with(equal("age")));
+            will(returnValue("30"));
+        }});
+        mockery.assertConfiguration(ParameterRegistrar.class);
+    }
+
+}

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to