[waffle-scm] [726] trunk/waffle-core/src/test/java/org/codehaus/waffle/action: Pulled up tests to abstract method definition finder test, leaving only the ones that depend on the use of custom string transmuter.

Tue, 17 Jun 2008 08:31:23 -0700

Title: [waffle-scm] [726] trunk/waffle-core/src/test/java/org/codehaus/waffle/action: Pulled up tests to abstract method definition finder test, leaving only the ones that depend on the use of custom string transmuter.
Revision
726
Author
mauro
Date
2008-06-17 10:31:18 -0500 (Tue, 17 Jun 2008)

Log Message

Pulled up tests to abstract method definition finder test, leaving only the ones that depend on the use of custom string transmuter.


Modified Paths

Diff

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

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AbstractMethodDefinitionFinderTest.java	2008-06-17 15:28:26 UTC (rev 725)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AbstractMethodDefinitionFinderTest.java	2008-06-17 15:31:18 UTC (rev 726)
@@ -272,6 +272,82 @@
         assertEquals(methodExpected, definition.getMethod());
     }
 
+    @Test
+    public void canFindMethodWhenParameterAssignable() 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("methodTwo"));
+            }
+        });
+
+        // Mock ArgumentResolver
+        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
+        mockery.checking(new Expectations() {
+            {
+                one(argumentResolver).resolve(request, "{list}");
+                will(returnValue(new ArrayList<Object>()));
+            }
+        });
+
+        // Mock StringTransmuter
+        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
+
+        FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions();
+        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
+                methodNameResolver, stringTransmuter);
+        MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response);
+
+        Method expectedMethod = FakeControllerWithMethodDefinitions.class.getMethod("methodTwo", List.class);
+        assertEquals(expectedMethod, methodDefinition.getMethod());
+    }
+
+    @Test(expected = AmbiguousActionSignatureMethodException.class)
+    public void cannotAllowAmbiguity() 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("methodAmbiguous"));
+            }
+        });
+
+        // Mock ArgumentResolver
+        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
+        mockery.checking(new Expectations() {
+            {
+                one(argumentResolver).resolve(request, "{list}");
+                will(returnValue(new ArrayList<Object>()));
+                one(argumentResolver).resolve(request, "{object}");
+                will(returnValue(new ArrayList<Object>()));
+            }
+        });
+
+        // Mock StringTransmuter
+        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
+
+        FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions();
+        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
+                methodNameResolver, stringTransmuter);
+
+        methodDefinitionFinder.find(controller, request, response);
+    }
+
     @Test(expected = NoMatchingActionMethodException.class)
     public void cannotFindMethodsWithNoName() throws Exception {
         // Mock HttpServletRequest
@@ -535,7 +611,6 @@
         assertSame(servletContext, methodDefinition.getMethodArguments().get(0));
     }
 
- 
     @Test
     public void canConvertStringToInteger() throws Exception {
         // Mock HttpServletRequest

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

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AnnotatedMethodDefinitionFinderTest.java	2008-06-17 15:28:26 UTC (rev 725)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AnnotatedMethodDefinitionFinderTest.java	2008-06-17 15:31:18 UTC (rev 726)
@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertEquals;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -37,82 +36,6 @@
     }
 
     @Test
-    public void canFindMethodWhenParameterAssignable() 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("methodTwo"));
-            }
-        });
-
-        // Mock ArgumentResolver
-        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(argumentResolver).resolve(request, "{list}");
-                will(returnValue(new ArrayList<Object>()));
-            }
-        });
-
-        // Mock StringTransmuter
-        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
-
-        FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions();
-        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
-                methodNameResolver, stringTransmuter);
-        MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response);
-
-        Method expectedMethod = FakeControllerWithMethodDefinitions.class.getMethod("methodTwo", List.class);
-        assertEquals(expectedMethod, methodDefinition.getMethod());
-    }
-
-    @Test(expected = AmbiguousActionSignatureMethodException.class)
-    public void cannotAllowAmbiguity() 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("methodAmbiguous"));
-            }
-        });
-
-        // Mock ArgumentResolver
-        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(argumentResolver).resolve(request, "{object}");
-                will(returnValue(new ArrayList<Object>()));
-                one(argumentResolver).resolve(request, "{list}");
-                will(returnValue(new ArrayList<Object>()));
-            }
-        });
-
-        // Mock StringTransmuter
-        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
-
-        FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions();
-        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
-                methodNameResolver, stringTransmuter);
-
-        methodDefinitionFinder.find(controller, request, response);
-    }
-
-    @Test
     public void canUseCustomStringTransmuter() throws Exception {
         // Mock HttpServletRequest
         final HttpServletRequest request = mockery.mock(HttpServletRequest.class);

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

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinderTest.java	2008-06-17 15:28:26 UTC (rev 725)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinderTest.java	2008-06-17 15:31:18 UTC (rev 726)
@@ -3,7 +3,6 @@
 import static org.junit.Assert.assertEquals;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -37,82 +36,6 @@
     }
 
     @Test
-    public void canFindMethodWhenParameterAssignable() 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("methodTwo"));
-            }
-        });
-
-        // Mock ArgumentResolver
-        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(argumentResolver).resolve(request, "{list}");
-                will(returnValue(new ArrayList<Object>()));
-            }
-        });
-
-        // Mock StringTransmuter
-        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
-
-        FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions();
-        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
-                methodNameResolver, stringTransmuter);
-        MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response);
-
-        Method expectedMethod = FakeControllerWithMethodDefinitions.class.getMethod("methodTwo", List.class);
-        assertEquals(expectedMethod, methodDefinition.getMethod());
-    }
-
-    @Test(expected = AmbiguousActionSignatureMethodException.class)
-    public void cannotAllowAmbiguity() 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("methodAmbiguous"));
-            }
-        });
-
-        // Mock ArgumentResolver
-        final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class);
-        mockery.checking(new Expectations() {
-            {
-                one(argumentResolver).resolve(request, "{list}");
-                will(returnValue(new ArrayList<Object>()));
-                one(argumentResolver).resolve(request, "{object}");
-                will(returnValue(new ArrayList<Object>()));
-            }
-        });
-
-        // Mock StringTransmuter
-        final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class);
-
-        FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions();
-        MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver,
-                methodNameResolver, stringTransmuter);
-
-        methodDefinitionFinder.find(controller, request, response);
-    }
-
-    @Test
     public void canUseCustomStringTransmuter() throws Exception {
         // Mock HttpServletRequest
         final HttpServletRequest request = mockery.mock(HttpServletRequest.class);

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to