- Revision
- 721
- Author
- mauro
- Date
- 2008-06-17 09:22:29 -0500 (Tue, 17 Jun 2008)
Log Message
Renamed variable instances of FakeControllerWithMethodDefinitions.
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
Diff
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AbstractMethodDefinitionFinderTest.java (720 => 721)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AbstractMethodDefinitionFinderTest.java 2008-06-17 14:19:38 UTC (rev 720) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AbstractMethodDefinitionFinderTest.java 2008-06-17 14:22:29 UTC (rev 721) @@ -105,7 +105,6 @@ assertEquals(expectedMethod, methodDefinition.getMethod()); } - @Test public void canReturnDefaultActionMethodWithArgument() throws NoSuchMethodException { // Mock HttpServletRequest @@ -193,10 +192,10 @@ // Mock StringTransmuter final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, null, methodNameResolver, stringTransmuter); - MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); + MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response); Method expectedMethod = FakeControllerWithMethodDefinitions.class.getMethod("noArgumentMethod"); assertEquals(expectedMethod, methodDefinition.getMethod()); @@ -231,10 +230,10 @@ // Mock StringTransmuter final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver, methodNameResolver, stringTransmuter); - MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); + MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response); Method expectedMethod = FakeControllerWithMethodDefinitions.class.getMethod("methodTwo", List.class); assertEquals(expectedMethod, methodDefinition.getMethod()); @@ -263,18 +262,17 @@ // Mock ArgumentResolver final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver, methodNameResolver, stringTransmuter); - MethodDefinition definition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); + MethodDefinition definition = methodDefinitionFinder.find(controller, request, response); Method methodExpected = FakeControllerWithMethodDefinitions.class.getMethod("noAmbiguityWhenMethodNotPublic", HttpServletRequest.class); assertEquals(methodExpected, definition.getMethod()); } - @Test(expected = NoMatchingActionMethodException.class) public void cannotFindMethodsWithNoName() throws Exception { // Mock HttpServletRequest @@ -295,11 +293,11 @@ // Mock StringTransmuter final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, null, methodNameResolver, stringTransmuter); - methodDefinitionFinder.find(sampleForMethodFinder, request, response); + methodDefinitionFinder.find(controller, request, response); } @Test @@ -322,10 +320,10 @@ // Mock StringTransmuter final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, null, methodNameResolver, stringTransmuter); - MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); + MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response); Method expectedMethod = FakeControllerWithMethodDefinitions.class.getMethod("methodDependsOnRequest", HttpServletRequest.class); @@ -353,10 +351,10 @@ // Mock StringTransmuter final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, null, methodNameResolver, stringTransmuter); - MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); + MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response); Method expectedMethod = FakeControllerWithMethodDefinitions.class.getMethod("methodDependsOnResponse", HttpServletResponse.class); @@ -399,11 +397,11 @@ } }); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver, methodNameResolver, stringTransmuter); - MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); + MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response); Method expectedMethod = FakeControllerWithMethodDefinitions.class.getMethod("methodDependsOnRequestAndInteger", HttpServletRequest.class, int.class); @@ -440,12 +438,13 @@ // Mock StringTransmuter final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, null, methodNameResolver, stringTransmuter); - MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); + MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response); - Method expectedMethod = FakeControllerWithMethodDefinitions.class.getMethod("methodDependsOnSession", HttpSession.class); + Method expectedMethod = FakeControllerWithMethodDefinitions.class.getMethod("methodDependsOnSession", + HttpSession.class); assertEquals(expectedMethod, methodDefinition.getMethod()); } @@ -470,7 +469,7 @@ // Mock HttpServletResponse final HttpServletResponse response = mockery.mock(HttpServletResponse.class); - // Mock ArgumentResolver + // Mock ArgumentResolver final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class); mockery.checking(new Expectations() { { @@ -478,7 +477,7 @@ will(returnValue(messageContext)); } }); - + // Mock MethodNameResolver final MethodNameResolver methodNameResolver = mockery.mock(MethodNameResolver.class); mockery.checking(new Expectations() { @@ -491,10 +490,10 @@ // Mock StringTransmuter final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); - MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver, methodNameResolver, - stringTransmuter); - MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); + MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver, + methodNameResolver, stringTransmuter); + MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response); Method expectedMethod = FakeControllerWithMethodDefinitions.class.getMethod("methodDependsOnMessagesContext", MessagesContext.class); @@ -525,10 +524,10 @@ // Mock StringTransmuter final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(servletContext, null, methodNameResolver, stringTransmuter); - MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); + MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response); Method expectedMethod = FakeControllerWithMethodDefinitions.class.getMethod("methodDependsOnServletContext", ServletContext.class); @@ -541,10 +540,10 @@ public void canUseCustomStringTransmuter() 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() { @@ -553,7 +552,7 @@ will(returnValue("methodListOfStrings|blah")); } }); - + // Mock ArgumentResolver final ArgumentResolver argumentResolver = mockery.mock(ArgumentResolver.class); mockery.checking(new Expectations() { @@ -562,27 +561,27 @@ will(returnValue("blah")); } }); - + // Mock StringTransmuter final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class); mockery.checking(new Expectations() { { - one(stringTransmuter).transmute("blah", parameterTypeForMethod(ControllerWithListMethods.class, "listOfStrings")); + one(stringTransmuter).transmute("blah", + parameterTypeForMethod(ControllerWithListMethods.class, "listOfStrings")); will(returnValue(Collections.EMPTY_LIST)); } }); // new OgnlValueConverterFinder(new OgnlValueConverter(typeConverter)) - - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver, methodNameResolver, stringTransmuter); - MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); - + MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response); + Method expectedMethod = FakeControllerWithMethodDefinitions.class.getMethod("methodListOfStrings", List.class); assertEquals(expectedMethod, methodDefinition.getMethod()); } - @Test public void canConvertStringToInteger() throws Exception { // Mock HttpServletRequest @@ -618,11 +617,11 @@ } }); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver, methodNameResolver, stringTransmuter); - MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); + MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response); assertEquals(45, methodDefinition.getMethodArguments().get(0)); } @@ -661,11 +660,11 @@ } }); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver, methodNameResolver, stringTransmuter); - MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); + MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response); assertEquals(45, methodDefinition.getMethodArguments().get(0)); } @@ -704,11 +703,11 @@ } }); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver, methodNameResolver, stringTransmuter); - MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); + MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response); assertEquals(99.99f, methodDefinition.getMethodArguments().get(0)); } @@ -748,11 +747,11 @@ } }); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver, methodNameResolver, stringTransmuter); - MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); + MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response); assertTrue((Boolean) methodDefinition.getMethodArguments().get(0)); }
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AnnotatedMethodDefinitionFinderTest.java (720 => 721)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AnnotatedMethodDefinitionFinderTest.java 2008-06-17 14:19:38 UTC (rev 720) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/action/AnnotatedMethodDefinitionFinderTest.java 2008-06-17 14:22:29 UTC (rev 721) @@ -31,11 +31,10 @@ protected MethodDefinitionFinder newMethodDefinitionFinder(ServletContext servletContext, final ArgumentResolver argumentResolver, final MethodNameResolver methodNameResolver, final StringTransmuter stringTransmuter) { - return new AnnotatedMethodDefinitionFinder(servletContext, argumentResolver, methodNameResolver, stringTransmuter, - new SilentMonitor()); + return new AnnotatedMethodDefinitionFinder(servletContext, argumentResolver, methodNameResolver, + stringTransmuter, new SilentMonitor()); } - @Test public void canFindMethodWhenParameterAssignable() throws Exception { // Mock HttpServletRequest @@ -65,10 +64,10 @@ // Mock StringTransmuter final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver, methodNameResolver, stringTransmuter); - MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); + MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response); Method expectedMethod = FakeControllerWithMethodDefinitions.class.getMethod("methodTwo", List.class); assertEquals(expectedMethod, methodDefinition.getMethod()); @@ -105,11 +104,11 @@ // Mock StringTransmuter final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver, methodNameResolver, stringTransmuter); - methodDefinitionFinder.find(sampleForMethodFinder, request, response); + methodDefinitionFinder.find(controller, request, response); } }
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinderTest.java (720 => 721)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinderTest.java 2008-06-17 14:19:38 UTC (rev 720) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/action/ParanamerMethodDefinitionFinderTest.java 2008-06-17 14:22:29 UTC (rev 721) @@ -63,10 +63,10 @@ // Mock StringTransmuter final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver, methodNameResolver, stringTransmuter); - MethodDefinition methodDefinition = methodDefinitionFinder.find(sampleForMethodFinder, request, response); + MethodDefinition methodDefinition = methodDefinitionFinder.find(controller, request, response); Method expectedMethod = FakeControllerWithMethodDefinitions.class.getMethod("methodTwo", List.class); assertEquals(expectedMethod, methodDefinition.getMethod()); @@ -103,11 +103,11 @@ // Mock StringTransmuter final StringTransmuter stringTransmuter = mockery.mock(StringTransmuter.class); - FakeControllerWithMethodDefinitions sampleForMethodFinder = new FakeControllerWithMethodDefinitions(); + FakeControllerWithMethodDefinitions controller = new FakeControllerWithMethodDefinitions(); MethodDefinitionFinder methodDefinitionFinder = newMethodDefinitionFinder(null, argumentResolver, methodNameResolver, stringTransmuter); - methodDefinitionFinder.find(sampleForMethodFinder, request, response); + methodDefinitionFinder.find(controller, request, response); } }
To unsubscribe from this list please visit:
