[waffle-scm] [902] sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/view: Cleanup of core tests.

Sun, 18 Jan 2009 07:04:57 -0800

Title: [waffle-scm] [902] sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/view: Cleanup of core tests.
Revision
902
Author
mauro
Date
2009-01-18 09:04:56 -0600 (Sun, 18 Jan 2009)

Log Message

Cleanup of core tests.

Modified Paths

Diff

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/action/DefaultActionMethodResponseHandlerTest.java (901 => 902)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/action/DefaultActionMethodResponseHandlerTest.java	2009-01-18 14:54:26 UTC (rev 901)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/action/DefaultActionMethodResponseHandlerTest.java	2009-01-18 15:04:56 UTC (rev 902)
@@ -42,7 +42,7 @@
 
     @Test
     public void canDelegateResponseValueOfTypeViewToDispatcher() throws IOException, ServletException {
-        final View view = new View("foobar", null);
+        final View view = new View("foobar");
         ActionMethodResponse actionMethodResponse = new ActionMethodResponse();
         actionMethodResponse.setReturnValue(view);

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/action/InterceptingActionMethodExecutorTest.java (901 => 902)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/action/InterceptingActionMethodExecutorTest.java	2009-01-18 14:54:26 UTC (rev 901)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/action/InterceptingActionMethodExecutorTest.java	2009-01-18 15:04:56 UTC (rev 902)
@@ -10,13 +10,11 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 
+import org.codehaus.waffle.action.intercept.MethodInterceptor;
 import org.codehaus.waffle.controller.ControllerDefinition;
 import org.codehaus.waffle.monitor.SilentMonitor;
 import org.codehaus.waffle.testmodel.FakeController;
-import org.codehaus.waffle.action.intercept.MethodInterceptor;
-import org.junit.After;
 import org.junit.Assert;
-import org.junit.Before;
 import org.junit.Test;
 
 public class InterceptingActionMethodExecutorTest {

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/DefaultStringTransmuterTest.java (901 => 902)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/DefaultStringTransmuterTest.java	2009-01-18 14:54:26 UTC (rev 901)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/DefaultStringTransmuterTest.java	2009-01-18 15:04:56 UTC (rev 902)
@@ -11,10 +11,11 @@
 public class DefaultStringTransmuterTest {
     private final Mockery mockery = new Mockery();
 
+    private ValueConverterFinder valueConverterFinder = mockery.mock(ValueConverterFinder.class);
+    private ValueConverter valueConverter = mockery.mock(ValueConverter.class);
+
     @Test
     public void canFindCorrectValueConverter() {
-        final ValueConverterFinder valueConverterFinder = mockery.mock(ValueConverterFinder.class);
-        final ValueConverter valueConverter = mockery.mock(ValueConverter.class);
         mockery.checking(new Expectations() {
             {
                 one(valueConverterFinder).findConverter(Float.class);
@@ -30,8 +31,6 @@
 
     @Test
     public void canHandleEmptyStringValue() {
-        final ValueConverterFinder valueConverterFinder = mockery.mock(ValueConverterFinder.class);
-        final ValueConverter valueConverter = mockery.mock(ValueConverter.class);
         mockery.checking(new Expectations() {
             {
                 one(valueConverterFinder).findConverter(Integer.class);
@@ -47,8 +46,6 @@
     
     @Test
     public void canHandleEmptyStringValueForPrimitiveType() {
-        final ValueConverterFinder valueConverterFinder = mockery.mock(ValueConverterFinder.class);
-        final ValueConverter valueConverter = mockery.mock(ValueConverter.class);
         mockery.checking(new Expectations() {
             {
                 one(valueConverterFinder).findConverter(float.class);

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/IntrospectingViewDataBinderTest.java (901 => 902)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/IntrospectingViewDataBinderTest.java	2009-01-18 14:54:26 UTC (rev 901)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/IntrospectingViewDataBinderTest.java	2009-01-18 15:04:56 UTC (rev 902)
@@ -51,7 +51,6 @@
     }
 
     class ControllerWithMissingReadMethod {
-        @SuppressWarnings({"UnusedDeclaration"})
         public void setName(String name) {
             // do nothing
         }

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/OgnlBindErrorMessageResolverTest.java (901 => 902)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/OgnlBindErrorMessageResolverTest.java	2009-01-18 14:54:26 UTC (rev 901)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/OgnlBindErrorMessageResolverTest.java	2009-01-18 15:04:56 UTC (rev 902)
@@ -27,11 +27,10 @@
 public class OgnlBindErrorMessageResolverTest {
 
     private Mockery mockery = new Mockery();
+    private MessageResources messageResources  = mockery.mock(MessageResources.class);
 
     @Test
     public void canResolveFirstCheckForCustomFieldMessage() {
-        // Mock MessageResources
-        final MessageResources messageResources = mockery.mock(MessageResources.class);
         final String message = "My Error Message";
         mockery.checking(new Expectations() {
             {
@@ -46,11 +45,8 @@
         assertEquals(message, messageResolver.resolve(new FakeBean(), "decimal", "bad-value"));
     }
 
-    @SuppressWarnings({"ThrowableInstanceNeverThrown"})
     @Test
     public void canResolveToTypeBasedBindErrorMessage() {
-        // Mock MessageResources
-        final MessageResources messageResources = mockery.mock(MessageResources.class);
         final String message = "The error message";
         mockery.checking(new Expectations() {
             {
@@ -68,11 +64,8 @@
         assertEquals(message, messageResolver.resolve(new FakeBean(), "count", "bad-value"));
     }
     
-    @SuppressWarnings({"ThrowableInstanceNeverThrown"})
     @Test
     public void canResolveToDefaultBindErrorMessage() {
-     // Mock MessageResources
-        final MessageResources messageResources = mockery.mock(MessageResources.class);
         final String message = "The default error message";
         mockery.checking(new Expectations() {
             {
@@ -92,11 +85,8 @@
         assertEquals(message, messageResolver.resolve(new FakeBean(), "count", "bad-value"));
     }
     
-    @SuppressWarnings({"ThrowableInstanceNeverThrown"})
     @Test
     public void canResolveToDefaultBindErrorMessageWhenKeyIsMissing() {
-     // Mock MessageResources
-        final MessageResources messageResources = mockery.mock(MessageResources.class);
         final String defaultMessage = MessageFormat.format(DEFAULT_MESSAGE, "my.field.name", "bad-value");
         mockery.checking(new Expectations() {
             {

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/OgnlControllerDataBinderTest.java (901 => 902)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/OgnlControllerDataBinderTest.java	2009-01-18 14:54:26 UTC (rev 901)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/OgnlControllerDataBinderTest.java	2009-01-18 15:04:56 UTC (rev 902)
@@ -3,7 +3,6 @@
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/OgnlValueConverterFinderTest.java (901 => 902)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/OgnlValueConverterFinderTest.java	2009-01-18 14:54:26 UTC (rev 901)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/bind/ognl/OgnlValueConverterFinderTest.java	2009-01-18 15:04:56 UTC (rev 902)
@@ -24,7 +24,8 @@
 
     @Test
     public void canFindDifferentListConvertersRegisteredAtInstantiation() throws IntrospectionException {
-        ValueConverterFinder finder = new OgnlValueConverterFinder(new StringListValueConverter(RESOURCES), new NumberListValueConverter(RESOURCES));
+        ValueConverterFinder finder = new OgnlValueConverterFinder(new StringListValueConverter(RESOURCES),
+                new NumberListValueConverter(RESOURCES));
         assertListCovertersCanBeFound(finder);
     }
 
@@ -37,12 +38,14 @@
     }
 
     private void assertListCovertersCanBeFound(ValueConverterFinder finder) throws IntrospectionException {
-        assertConverterType(finder, List.class, OgnlValueConverter.class); // List.class is not parameterized and matches default converter
+        assertConverterType(finder, List.class, OgnlValueConverter.class); // List.class is not parameterized and
+                                                                           // matches default converter
         assertConverterType(finder, methodParameterType("listOfStrings"), StringListValueConverter.class);
         assertConverterType(finder, methodParameterType("listOfIntegers"), NumberListValueConverter.class);
     }
-    
-    private void assertConverterType(ValueConverterFinder finder, Type type, Class<? extends ValueConverter> expectedConverterType) {
+
+    private void assertConverterType(ValueConverterFinder finder, Type type,
+            Class<? extends ValueConverter> expectedConverterType) {
         assertEquals(expectedConverterType, finder.findConverter(type).getClass());
     }

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/controller/ContextControllerDefinitionFactoryTest.java (901 => 902)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/controller/ContextControllerDefinitionFactoryTest.java	2009-01-18 14:54:26 UTC (rev 901)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/controller/ContextControllerDefinitionFactoryTest.java	2009-01-18 15:04:56 UTC (rev 902)
@@ -98,7 +98,7 @@
         ControllerDefinitionFactory controllerDefinitionFactory = new ContextControllerDefinitionFactory(finder,
                 new ContextPathControllerNameResolver(new SilentMonitor()), new SilentMonitor(), new DefaultMessageResources());
 
-        ControllerDefinition definition = controllerDefinitionFactory.getControllerDefinition(request, response, context, pico);
+        controllerDefinitionFactory.getControllerDefinition(request, response, context, pico);
     }
 
 }

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/servlet/WaffleServletTest.java (901 => 902)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/servlet/WaffleServletTest.java	2009-01-18 14:54:26 UTC (rev 901)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/servlet/WaffleServletTest.java	2009-01-18 15:04:56 UTC (rev 902)
@@ -72,10 +72,6 @@
     @Test
     public void canConfigureComponentsViaInitAttributes() throws ServletException {
 
-        final StringBuilder sb = new StringBuilder();
-
-        final ViewResolver viewResolver = mockery.mock(ViewResolver.class);
-
         final ServletContext servletContext = mockery.mock(ServletContext.class);
 
         final MutablePicoContainer mpc = mockery.mock(MutablePicoContainer.class);

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/testmodel/FakeController.java (901 => 902)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/testmodel/FakeController.java	2009-01-18 14:54:26 UTC (rev 901)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/testmodel/FakeController.java	2009-01-18 15:04:56 UTC (rev 902)
@@ -96,7 +96,7 @@
     }
 
     public View returnsView(String message) {
-        return new View(message, this);
+        return new View(message);
     }
 
     public HttpServletRequest getRequest() {

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubParameterResolver.java (901 => 902)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubParameterResolver.java	2009-01-18 14:54:26 UTC (rev 901)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubParameterResolver.java	2009-01-18 15:04:56 UTC (rev 902)
@@ -4,7 +4,6 @@
 package org.codehaus.waffle.testmodel;
 
 import org.codehaus.waffle.registrar.pico.ParameterResolver;
-import org.codehaus.waffle.bind.StringTransmuter;
 import org.picocontainer.Parameter;
 
 public class StubParameterResolver extends ParameterResolver {

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/view/DefaultViewDispatcherTest.java (901 => 902)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/view/DefaultViewDispatcherTest.java	2009-01-18 14:54:26 UTC (rev 901)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/view/DefaultViewDispatcherTest.java	2009-01-18 15:04:56 UTC (rev 902)
@@ -66,7 +66,7 @@
     
     @Test
     public void canDispatchRedirectView() throws IOException, ServletException {
-        RedirectView redirectView = new RedirectView(PATH, null);
+        RedirectView redirectView = new RedirectView(PATH);
         ViewResolver viewResolver = mockViewResolver(redirectView, PATH);
 
         mockery.checking(new Expectations() {{
@@ -80,7 +80,7 @@
 
     @Test
     public void canDispatchStandardView() throws IOException, ServletException {
-        View view = new View(PATH, null);
+        View view = new View(PATH);
         ViewResolver viewResolver = mockViewResolver(view, PATH);
 
         final RequestDispatcher requestDispatcher = mockery.mock(RequestDispatcher.class);

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/view/DefaultViewResolverTest.java (901 => 902)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/view/DefaultViewResolverTest.java	2009-01-18 14:54:26 UTC (rev 901)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/view/DefaultViewResolverTest.java	2009-01-18 15:04:56 UTC (rev 902)
@@ -9,7 +9,7 @@
     @Test
     public void canResolve() {
         String path = "/helloWorld.jsp";
-        View view = new View(path, null);
+        View view = new View(path);
         ViewResolver viewResolver = new DefaultViewResolver();
         assertEquals(path, viewResolver.resolve(view));
     }

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/view/RedirectViewTest.java (901 => 902)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/view/RedirectViewTest.java	2009-01-18 14:54:26 UTC (rev 901)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/view/RedirectViewTest.java	2009-01-18 15:04:56 UTC (rev 902)
@@ -9,7 +9,7 @@
 
     @Test
     public void defaultStatusCodeShouldBe303() {
-        RedirectView redirectView = new RedirectView("foo", null);
+        RedirectView redirectView = new RedirectView("foo");
         Assert.assertEquals(HttpServletResponse.SC_SEE_OTHER, redirectView.getStatusCode());
     }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to