[waffle-scm] [720] trunk/waffle-core/src/test/java/org/codehaus/waffle/action: Pulled up string conversion tests to abstract method definition finder test.

[mauro]

Title: [waffle-scm] [720] trunk/waffle-core/src/test/java/org/codehaus/waffle/action: Pulled up string conversion tests to abstract method definition finder test.

Revision

720

Author

mauro

Date

2008-06-17 09:19:38 -0500 (Tue, 17 Jun 2008)

Log Message

Pulled up string conversion tests to abstract method definition finder test.

Modified Paths

trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AbstractMethodDefinitionFinderTest.java
trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AnnotatedMethodDefinitionFinderTest.java
trunk/waffle-core/src/test/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinderTest.java
trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/FakeControllerWithMethodDefinitions.java

Diff

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AbstractMethodDefinitionFinderTest.java (719 => 720)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AbstractMethodDefinitionFinderTest.java	2008-06-17 14:12:27 UTC (rev 719)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AbstractMethodDefinitionFinderTest.java	2008-06-17 14:19:38 UTC (rev 720)
@@ -3,6 +3,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
 
 import java.beans.BeanInfo;
 import java.beans.IntrospectionException;
@@ -581,4 +582,179 @@
         assertEquals(expectedMethod, methodDefinition.getMethod());
     }
 
+
+    @Test
+    public void canConvertStringToInteger() throws Exception {
+        // Mock HttpServletRequest
+        final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
+
+        // Mock HttpServletResponse
+        final HttpServletResponse response = mockery.mock(HttpServletResponse.class);
+
+        // Mock MethodNameResolver
+        final MethodNameResolver methodNameResolver = mockery.mock(MethodNameResolver.class);
+        mockery.checking(new Expectations() {
+            {
+                one(methodNameResolver).resolve(with(same(request)));
+                will(returnValue("methodInteger"));
+            }
+        });
+
+        // Mock ArgumentResolver
+        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
+        mockery.checking(new Expectations() {
+            {
+                one(argumentResolver).resolve(request, "{integer}");
+                will(returnValue("45"));
+            }
+        });
+
+        // Mock StringTransmuter
+        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
+        mockery.checking(new Expectations() {
+            {
+                one(stringTransmuter).transmute("45", int.class);
+                will(returnValue(45));
+            }
+        });
+
+        FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions();
+
+        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
+                methodNameResolver, stringTransmuter);
+        MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response);
+        assertEquals(45, methodDefinition.getMethodArguments().get(0));
+    }
+
+    @Test
+    public void canConvertStringToIntegerPragmatic() throws Exception {
+        // Mock HttpServletRequest
+        final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
+
+        // Mock HttpServletResponse
+        final HttpServletResponse response = mockery.mock(HttpServletResponse.class);
+
+        // Mock MethodNameResolver
+        final MethodNameResolver methodNameResolver = mockery.mock(MethodNameResolver.class);
+        mockery.checking(new Expectations() {
+            {
+                one(methodNameResolver).resolve(with(same(request)));
+                will(returnValue("methodInteger|45"));
+            }
+        });
+
+        // Mock ArgumentResolver
+        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
+        mockery.checking(new Expectations() {
+            {
+                one(argumentResolver).resolve(request, "45");
+                will(returnValue("45"));
+            }
+        });
+
+        // Mock StringTransmuter
+        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
+        mockery.checking(new Expectations() {
+            {
+                one(stringTransmuter).transmute("45", int.class);
+                will(returnValue(45));
+            }
+        });
+
+        FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions();
+
+        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
+                methodNameResolver, stringTransmuter);
+        MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response);
+        assertEquals(45, methodDefinition.getMethodArguments().get(0));
+    }
+
+    @Test
+    public void canConvertStringToFloat() throws Exception {
+        // Mock HttpServletRequest
+        final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
+
+        // Mock HttpServletResponse
+        final HttpServletResponse response = mockery.mock(HttpServletResponse.class);
+
+        // Mock MethodNameResolver
+        final MethodNameResolver methodNameResolver = mockery.mock(MethodNameResolver.class);
+        mockery.checking(new Expectations() {
+            {
+                one(methodNameResolver).resolve(with(same(request)));
+                will(returnValue("methodFloat"));
+            }
+        });
+
+        // Mock ArgumentResolver
+        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
+        mockery.checking(new Expectations() {
+            {
+                one(argumentResolver).resolve(request, "{decimal}");
+                will(returnValue("99.99"));
+            }
+        });
+
+        // Mock StringTransmuter
+        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
+        mockery.checking(new Expectations() {
+            {
+                one(stringTransmuter).transmute("99.99", Float.class);
+                will(returnValue(99.99f));
+            }
+        });
+
+        FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions();
+
+        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
+                methodNameResolver, stringTransmuter);
+        MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response);
+
+        assertEquals(99.99f, methodDefinition.getMethodArguments().get(0));
+    }
+
+    @Test
+    public void canConvertStringToBoolean() throws Exception {
+        // Mock HttpServletRequest
+        final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
+
+        // Mock HttpServletResponse
+        final HttpServletResponse response = mockery.mock(HttpServletResponse.class);
+
+        // Mock MethodNameResolver
+        final MethodNameResolver methodNameResolver = mockery.mock(MethodNameResolver.class);
+        mockery.checking(new Expectations() {
+            {
+                one(methodNameResolver).resolve(with(same(request)));
+                will(returnValue("methodBoolean"));
+            }
+        });
+
+        // Mock ArgumentResolver
+        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
+        mockery.checking(new Expectations() {
+            {
+                one(argumentResolver).resolve(request, "{bool}");
+                will(returnValue("true"));
+            }
+        });
+
+        // Mock StringTransmuter
+        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
+        mockery.checking(new Expectations() {
+            {
+                one(stringTransmuter).transmute("true", boolean.class);
+                will(returnValue(true));
+            }
+        });
+
+        FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions();
+
+        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
+                methodNameResolver, stringTransmuter);
+        MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response);
+
+        assertTrue((Boolean) methodDefinition.getMethodArguments().get(0));
+    }
+
 }

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AnnotatedMethodDefinitionFinderTest.java (719 => 720)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AnnotatedMethodDefinitionFinderTest.java	2008-06-17 14:12:27 UTC (rev 719)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AnnotatedMethodDefinitionFinderTest.java	2008-06-17 14:19:38 UTC (rev 720)
@@ -1,8 +1,6 @@
 package org.codehaus.waffle.action;
 
-import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -59,7 +57,7 @@
         final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
         mockery.checking(new Expectations() {
             {
-                one(argumentResolver).resolve(request, "{foobaz}");
+                one(argumentResolver).resolve(request, "{list}");
                 will(returnValue(new ArrayList<Object>()));
             }
         });
@@ -97,8 +95,10 @@
         final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
         mockery.checking(new Expectations() {
             {
-                exactly(2).of(argumentResolver).resolve(request, "{foobaz}");
+                one(argumentResolver).resolve(request, "{object}");
                 will(returnValue(new ArrayList<Object>()));
+                one(argumentResolver).resolve(request, "{list}");
+                will(returnValue(new ArrayList<Object>()));
             }
         });
 
@@ -111,269 +111,5 @@
 
         methodDefinitionFinder.find(sampleForMethodFinder, request, response);
     }
-    
-    @Test
-    public void canConvertStringToInteger() throws Exception {
-        // Mock HttpServletRequest
-        final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
 
-        // Mock HttpServletResponse
-        final HttpServletResponse response = mockery.mock(HttpServletResponse.class);
-
-        // Mock MethodNameResolver
-        final MethodNameResolver methodNameResolver = mockery.mock(MethodNameResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(methodNameResolver).resolve(with(same(request)));
-                will(returnValue("methodInteger"));
-            }
-        });
-
-        // Mock ArgumentResolver
-        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(argumentResolver).resolve(request, "{foobaz}");
-                will(returnValue("45"));
-            }
-        });
-
-        // Mock StringTransmuter
-        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
-        mockery.checking(new Expectations() {
-            {
-                one(stringTransmuter).transmute("45", int.class);
-                will(returnValue(45));
-            }
-        });
-
-        FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions();
-
-        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
-                methodNameResolver, stringTransmuter);
-        MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response);
-        assertEquals(45, methodDefinition.getMethodArguments().get(0));
-    }
-
-    @Test
-    public void canConvertStringToIntegerPragmatic() throws Exception {
-        // Mock HttpServletRequest
-        final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
-
-        // Mock HttpServletResponse
-        final HttpServletResponse response = mockery.mock(HttpServletResponse.class);
-
-        // Mock MethodNameResolver
-        final MethodNameResolver methodNameResolver = mockery.mock(MethodNameResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(methodNameResolver).resolve(with(same(request)));
-                will(returnValue("methodInteger|45"));
-            }
-        });
-
-        // Mock ArgumentResolver
-        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(argumentResolver).resolve(request, "45");
-                will(returnValue("45"));
-            }
-        });
-
-        // Mock StringTransmuter
-        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
-        mockery.checking(new Expectations() {
-            {
-                one(stringTransmuter).transmute("45", int.class);
-                will(returnValue(45));
-            }
-        });
-
-        FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions();
-
-        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
-                methodNameResolver, stringTransmuter);
-        MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response);
-        assertEquals(45, methodDefinition.getMethodArguments().get(0));
-    }
-
-    @Test
-    public void canConvertStringToFloat() throws Exception {
-        // Mock HttpServletRequest
-        final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
-
-        // Mock HttpServletResponse
-        final HttpServletResponse response = mockery.mock(HttpServletResponse.class);
-
-        // Mock MethodNameResolver
-        final MethodNameResolver methodNameResolver = mockery.mock(MethodNameResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(methodNameResolver).resolve(with(same(request)));
-                will(returnValue("methodFloat"));
-            }
-        });
-
-        // Mock ArgumentResolver
-        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(argumentResolver).resolve(request, "{foobaz}");
-                will(returnValue("99.99"));
-            }
-        });
-
-        // Mock StringTransmuter
-        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
-        mockery.checking(new Expectations() {
-            {
-                one(stringTransmuter).transmute("99.99", Float.class);
-                will(returnValue(99.99f));
-            }
-        });
-
-        FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions();
-
-        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
-                methodNameResolver, stringTransmuter);
-        MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response);
-
-        assertEquals(99.99f, methodDefinition.getMethodArguments().get(0));
-    }
-
-    @Test
-    public void canConvertStringToBoolean() throws Exception {
-        // Mock HttpServletRequest
-        final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
-
-        // Mock HttpServletResponse
-        final HttpServletResponse response = mockery.mock(HttpServletResponse.class);
-
-        // Mock MethodNameResolver
-        final MethodNameResolver methodNameResolver = mockery.mock(MethodNameResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(methodNameResolver).resolve(with(same(request)));
-                will(returnValue("methodBoolean"));
-            }
-        });
-
-        // Mock ArgumentResolver
-        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(argumentResolver).resolve(request, "{foobaz}");
-                will(returnValue("true"));
-            }
-        });
-
-        // Mock StringTransmuter
-        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
-        mockery.checking(new Expectations() {
-            {
-                one(stringTransmuter).transmute("true", boolean.class);
-                will(returnValue(true));
-            }
-        });
-
-        FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions();
-
-        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
-                methodNameResolver, stringTransmuter);
-        MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response);
-
-        assertTrue((Boolean) methodDefinition.getMethodArguments().get(0));
-    }
-
-    @Test
-    public void canConvertStringToListOfStrings() throws Exception {
-        // Mock HttpServletRequest
-        final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
-
-        // Mock HttpServletResponse
-        final HttpServletResponse response = mockery.mock(HttpServletResponse.class);
-
-        // Mock MethodNameResolver
-        final MethodNameResolver methodNameResolver = mockery.mock(MethodNameResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(methodNameResolver).resolve(with(same(request)));
-                will(returnValue("methodListOfStrings"));
-            }
-        });
-
-        final List<String> list = asList("one", "two");
-        // Mock ArgumentResolver
-        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(argumentResolver).resolve(request, "{foobaz}");
-                will(returnValue("one,two"));
-            }
-        });
-
-        // Mock StringTransmuter
-        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
-        mockery.checking(new Expectations() {
-            {
-                one(stringTransmuter).transmute("one,two", parameterTypeForMethod(ControllerWithListMethods.class, "listOfStrings"));
-                will(returnValue(list));
-            }
-        });
-
-        FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions();
-
-        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
-                methodNameResolver, stringTransmuter);
-        MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response);
-
-        assertEquals(list, methodDefinition.getMethodArguments().get(0));
-    }
-
-    @Test
-    public void canConvertStringToListOfIntegers() throws Exception {
-        // Mock HttpServletRequest
-        final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
-
-        // Mock HttpServletResponse
-        final HttpServletResponse response = mockery.mock(HttpServletResponse.class);
-
-        // Mock MethodNameResolver
-        final MethodNameResolver methodNameResolver = mockery.mock(MethodNameResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(methodNameResolver).resolve(with(same(request)));
-                will(returnValue("methodListOfIntegers"));
-            }
-        });
-
-        final List<Integer> list = asList(1, 2);
-        // Mock ArgumentResolver
-        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(argumentResolver).resolve(request, "{foobaz}");
-                will(returnValue("1,2"));
-            }
-        });
-
-        // Mock StringTransmuter
-        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
-        mockery.checking(new Expectations() {
-            {
-                one(stringTransmuter).transmute("1,2", parameterTypeForMethod(ControllerWithListMethods.class, "listOfIntegers"));
-                will(returnValue(list));
-            }
-        });
-
-        FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions();
-
-        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
-                methodNameResolver, stringTransmuter);
-        MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response);
-
-        assertEquals(list, methodDefinition.getMethodArguments().get(0));
-    }
-
 }

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinderTest.java (719 => 720)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinderTest.java	2008-06-17 14:12:27 UTC (rev 719)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinderTest.java	2008-06-17 14:19:38 UTC (rev 720)
@@ -1,7 +1,6 @@
 package org.codehaus.waffle.action;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -17,7 +16,6 @@
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
 /**
@@ -112,178 +110,4 @@
         methodDefinitionFinder.find(sampleForMethodFinder, request, response);
     }
 
-    @Test
-    public void canConvertStringToInteger() throws Exception {
-        // Mock HttpServletRequest
-        final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
-
-        // Mock HttpServletResponse
-        final HttpServletResponse response = mockery.mock(HttpServletResponse.class);
-
-        // Mock MethodNameResolver
-        final MethodNameResolver methodNameResolver = mockery.mock(MethodNameResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(methodNameResolver).resolve(with(same(request)));
-                will(returnValue("methodInteger"));
-            }
-        });
-
-        // Mock ArgumentResolver
-        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(argumentResolver).resolve(request, "{integer}");
-                will(returnValue("45"));
-            }
-        });
-
-        // Mock StringTransmuter
-        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
-        mockery.checking(new Expectations() {
-            {
-                one(stringTransmuter).transmute("45", int.class);
-                will(returnValue(45));
-            }
-        });
-
-        FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions();
-
-        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
-                methodNameResolver, stringTransmuter);
-        MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response);
-        assertEquals(45, methodDefinition.getMethodArguments().get(0));
-    }
-
-    @Test
-    public void canConvertStringToIntegerPragmatic() throws Exception {
-        // Mock HttpServletRequest
-        final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
-
-        // Mock HttpServletResponse
-        final HttpServletResponse response = mockery.mock(HttpServletResponse.class);
-
-        // Mock MethodNameResolver
-        final MethodNameResolver methodNameResolver = mockery.mock(MethodNameResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(methodNameResolver).resolve(with(same(request)));
-                will(returnValue("methodInteger|45"));
-            }
-        });
-
-        // Mock ArgumentResolver
-        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(argumentResolver).resolve(request, "45");
-                will(returnValue("45"));
-            }
-        });
-
-        // Mock StringTransmuter
-        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
-        mockery.checking(new Expectations() {
-            {
-                one(stringTransmuter).transmute("45", int.class);
-                will(returnValue(45));
-            }
-        });
-
-        FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions();
-
-        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
-                methodNameResolver, stringTransmuter);
-        MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response);
-        assertEquals(45, methodDefinition.getMethodArguments().get(0));
-    }
-
-    @Test
-    public void canConvertStringToFloat() throws Exception {
-        // Mock HttpServletRequest
-        final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
-
-        // Mock HttpServletResponse
-        final HttpServletResponse response = mockery.mock(HttpServletResponse.class);
-
-        // Mock MethodNameResolver
-        final MethodNameResolver methodNameResolver = mockery.mock(MethodNameResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(methodNameResolver).resolve(with(same(request)));
-                will(returnValue("methodFloat"));
-            }
-        });
-
-        // Mock ArgumentResolver
-        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(argumentResolver).resolve(request, "{decimal}");
-                will(returnValue("99.99"));
-            }
-        });
-
-        // Mock StringTransmuter
-        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
-        mockery.checking(new Expectations() {
-            {
-                one(stringTransmuter).transmute("99.99", Float.class);
-                will(returnValue(99.99f));
-            }
-        });
-
-        FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions();
-
-        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
-                methodNameResolver, stringTransmuter);
-        MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response);
-
-        assertEquals(99.99f, methodDefinition.getMethodArguments().get(0));
-    }
-
-    @Test
-    public void canConvertStringToBoolean() throws Exception {
-        // Mock HttpServletRequest
-        final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
-
-        // Mock HttpServletResponse
-        final HttpServletResponse response = mockery.mock(HttpServletResponse.class);
-
-        // Mock MethodNameResolver
-        final MethodNameResolver methodNameResolver = mockery.mock(MethodNameResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(methodNameResolver).resolve(with(same(request)));
-                will(returnValue("methodBoolean"));
-            }
-        });
-
-        // Mock ArgumentResolver
-        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(argumentResolver).resolve(request, "{bool}");
-                will(returnValue("true"));
-            }
-        });
-
-        // Mock StringTransmuter
-        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
-        mockery.checking(new Expectations() {
-            {
-                one(stringTransmuter).transmute("true", boolean.class);
-                will(returnValue(true));
-            }
-        });
-
-        FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions();
-
-        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
-                methodNameResolver, stringTransmuter);
-        MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response);
-
-        assertTrue((Boolean) methodDefinition.getMethodArguments().get(0));
-    }
-
 }

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/FakeControllerWithMethodDefinitions.java (719 => 720)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/FakeControllerWithMethodDefinitions.java	2008-06-17 14:12:27 UTC (rev 719)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/FakeControllerWithMethodDefinitions.java	2008-06-17 14:19:38 UTC (rev 720)
@@ -43,42 +43,42 @@
         methodOneInvoked = true;
     }
 
-    @ActionMethod(parameters = {"foobaz"})
+    @ActionMethod(parameters = {"list"})
     public void methodTwo(List<?> list) {
         methodTwoObject = list;
     }
 
-    @ActionMethod(parameters = {"foobaz"})
+    @ActionMethod(parameters = {"object"})
     public void methodAmbiguous(Object object) {
         methodThreeObject = object;
     }
 
-    @ActionMethod(parameters = {"foobaz"})
+    @ActionMethod(parameters = {"list"})
     public void methodAmbiguous(List<?> list) {
         methodThreeObject = list;
     }
 
-    @ActionMethod(parameters = {"foobaz"})
+    @ActionMethod(parameters = {"integer"})
     public void methodInteger(int integer) {
         this.integer = integer;
     }
 
-    @ActionMethod(parameters = {"foobaz"})
+    @ActionMethod(parameters = {"decimal"})
     public void methodFloat(Float decimal) {
         this.decimal = decimal;
     }
 
-    @ActionMethod(parameters = {"foobaz"})
+    @ActionMethod(parameters = {"bool"})
     public void methodBoolean(boolean bool) {
         this.bool = bool;
     }
     
-    @ActionMethod(parameters = {"foobaz"})
+    @ActionMethod(parameters = {"list"})
     public void methodListOfStrings(List<String> list) {
         this.listOfStrings = list;
     }
     
-    @ActionMethod(parameters = {"foobaz"})
+    @ActionMethod(parameters = {"list"})
     public void methodListOfIntegers(List<Integer> list) {
         this.listOfIntegers = list;
     }

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email