[waffle-scm] [334] trunk/core/src/test/java/org/codehaus/waffle/view: Migrated or completed migration of other unit tests to jMock 2.

Sat, 03 Nov 2007 04:29:40 -0800

Title: [waffle-scm] [334] trunk/core/src/test/java/org/codehaus/waffle/view: Migrated or completed migration of other unit tests to jMock 2.
Revision
334
Author
mauro
Date
2007-11-03 07:29:36 -0500 (Sat, 03 Nov 2007)

Log Message

Migrated or completed migration of other unit tests to jMock 2.

Modified Paths



Removed Paths

Diff

Modified: trunk/core/src/test/java/org/codehaus/waffle/registrar/RegistrarAssistantTest.java (333 => 334)

--- trunk/core/src/test/java/org/codehaus/waffle/registrar/RegistrarAssistantTest.java	2007-11-03 11:46:15 UTC (rev 333)
+++ trunk/core/src/test/java/org/codehaus/waffle/registrar/RegistrarAssistantTest.java	2007-11-03 12:29:36 UTC (rev 334)
@@ -1,27 +1,26 @@
-/*****************************************************************************
- * 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                                            *
- *****************************************************************************/
+/***********************************************************************************************************************
+ * 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.registrar;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.Hashtable;
+
 import org.codehaus.waffle.WaffleException;
 import org.codehaus.waffle.context.ContextLevel;
 import org.codehaus.waffle.registrar.pico.PicoRegistrar;
 import org.codehaus.waffle.testmodel.CustomRegistrar;
+import org.junit.Test;
 import org.picocontainer.defaults.DefaultPicoContainer;
 
-import java.util.Hashtable;
+public class RegistrarAssistantTest {
 
-public class RegistrarAssistantTest extends TestCase {
-
-    public void testExecutionSuccessful() {
+    @Test
+    public void canExecute() {
         DefaultPicoContainer picoContainer = new DefaultPicoContainer();
         PicoRegistrar picoRegistrar = new PicoRegistrar(picoContainer);
         RegistrarAssistant registrarAssistant = new RegistrarAssistant(CustomRegistrar.class);
@@ -35,13 +34,8 @@
         assertNotNull(picoContainer.getComponentInstance("request"));
     }
 
-    public void testConstructorFailsForBadClass() {
-        try {
-            new RegistrarAssistant(Hashtable.class); // bad class
-            fail("WaffleException expected");
-        } catch (WaffleException expected) {
-            assertTrue("Message should display offending class name.",
-                    expected.getMessage().contains(Hashtable.class.getName()));
-        }
+    @Test(expected = WaffleException.class)
+    public void cannotCreateForBadClass() {
+        new RegistrarAssistant(Hashtable.class); // bad class
     }
 }

Modified: trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/AbstractWaffleParameterTest.java (333 => 334)

--- trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/AbstractWaffleParameterTest.java	2007-11-03 11:46:15 UTC (rev 333)
+++ trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/AbstractWaffleParameterTest.java	2007-11-03 12:29:36 UTC (rev 334)
@@ -1,27 +1,39 @@
 package org.codehaus.waffle.registrar.pico;
 
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.picocontainer.ComponentAdapter;
 import org.picocontainer.PicoContainer;
 import org.picocontainer.PicoVisitor;
 
-public class AbstractWaffleParameterTest extends MockObjectTestCase {
+/**
+ * 
+ * @author Michael Ward
+ * @author Mauro Talevi
+ */
[EMAIL PROTECTED](JMock.class)
+public class AbstractWaffleParameterTest {
 
-    public void testAccept() {
-        AbstractWaffleParameter parameter = new AbstractWaffleParameter("foobar") {
+    private Mockery mockery = new Mockery();
+
+    @Test
+    public void canAcceptParameter() {
+        final AbstractWaffleParameter parameter = new AbstractWaffleParameter("foobar") {
             public Object resolveInstance(PicoContainer picoContainer, ComponentAdapter componentAdapter, Class aClass) {
                 throw new UnsupportedOperationException("don't call");
             }
         };
 
         // Mock PicoVisitor
-        Mock mockPicoVisitor = mock(PicoVisitor.class);
-        mockPicoVisitor.expects(once())
-                .method("visitParameter")
-                .with(same(parameter));
-        PicoVisitor visitor = (PicoVisitor) mockPicoVisitor.proxy();
-
+        final PicoVisitor visitor = mockery.mock(PicoVisitor.class);
+        mockery.checking(new Expectations() {
+            {
+                one(visitor).visitParameter(with(same(parameter)));
+            }
+        });
         parameter.accept(visitor);
     }
 }

Modified: trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/HttpSessionAttributeParameterTest.java (333 => 334)

--- trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/HttpSessionAttributeParameterTest.java	2007-11-03 11:46:15 UTC (rev 333)
+++ trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/HttpSessionAttributeParameterTest.java	2007-11-03 12:29:36 UTC (rev 334)
@@ -1,26 +1,41 @@
 package org.codehaus.waffle.registrar.pico;
 
+import static org.junit.Assert.assertEquals;
+
+import javax.servlet.http.HttpSession;
+
 import org.codehaus.waffle.testmodel.DependsOnValue;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.picocontainer.MutablePicoContainer;
 import org.picocontainer.Parameter;
 import org.picocontainer.defaults.DefaultPicoContainer;
 
-import javax.servlet.http.HttpSession;
+/**
+ * 
+ * @author Michael Ward
+ * @author Mauro Talevi
+ */
[EMAIL PROTECTED](JMock.class)
+public class HttpSessionAttributeParameterTest {
+    private Mockery mockery = new Mockery();
 
-public class HttpSessionAttributeParameterTest extends MockObjectTestCase {
+    @Test
+    public void componentDependsOnSessionAttribute() {
+        // Mock HttpSession
+        final HttpSession session = mockery.mock(HttpSession.class);
+        mockery.checking(new Expectations() {
+            {
+                exactly(2).of(session).getAttribute("foobar");
+                will(returnValue("helloWorld"));
+            }
+        });
 
-    public void testComponentDependsOnHttpSessionAttribute() {
-        Mock mockSession = mock(HttpSession.class);
-        mockSession.expects(exactly(2))
-                .method("getAttribute")
-                .with(eq("foobar"))
-                .will(returnValue("helloWorld"));
-        HttpSession session = (HttpSession) mockSession.proxy();
+        Parameter[] parameters = { new HttpSessionAttributeParameter("foobar") };
 
-        Parameter[] parameters = {new HttpSessionAttributeParameter("foobar")};
-
         MutablePicoContainer pico = new DefaultPicoContainer();
         pico.registerComponentInstance(session);
         pico.registerComponentImplementation("x", DependsOnValue.class, parameters);

Modified: trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/PicoRegistrarTest.java (333 => 334)

--- trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/PicoRegistrarTest.java	2007-11-03 11:46:15 UTC (rev 333)
+++ trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/PicoRegistrarTest.java	2007-11-03 12:29:36 UTC (rev 334)
@@ -10,14 +10,18 @@
  *****************************************************************************/
 package org.codehaus.waffle.registrar.pico;
 
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+
 import org.codehaus.waffle.testmodel.FakeController;
-import junit.framework.TestCase;
+import org.junit.Test;
 import org.picocontainer.MutablePicoContainer;
 import org.picocontainer.defaults.ConstructorInjectionComponentAdapter;
 import org.picocontainer.defaults.DefaultPicoContainer;
 
-public class PicoRegistrarTest extends TestCase {
+public class PicoRegistrarTest {
 
+    @Test
     public void testRegister() {
         MutablePicoContainer pico = new DefaultPicoContainer();
         PicoRegistrar picoRegistrar = new PicoRegistrar(pico);
@@ -29,6 +33,7 @@
         assertSame(controllerOne, controllerTwo);
     }
 
+    @Test
     public void testRegisterWithKey() {
         MutablePicoContainer pico = new DefaultPicoContainer();
         PicoRegistrar picoRegistrar = new PicoRegistrar(pico);
@@ -41,6 +46,7 @@
         assertSame(controllerOne, pico.getComponentInstanceOfType(FakeController.class));
     }
 
+    @Test
     public void testRegisterInstance() {
         MutablePicoContainer pico = new DefaultPicoContainer();
         PicoRegistrar picoRegistrar = new PicoRegistrar(pico);
@@ -51,6 +57,7 @@
         assertSame(fakeController, pico.getComponentInstanceOfType(FakeController.class));
     }
 
+    @Test
     public void testRegisterInstanceWithKey() {
         MutablePicoContainer pico = new DefaultPicoContainer();
         PicoRegistrar picoRegistrar = new PicoRegistrar(pico);
@@ -62,6 +69,7 @@
         assertSame(fakeController, pico.getComponentInstanceOfType(FakeController.class));
     }
 
+    @Test
     public void testNonCachingRegistration() {
         MutablePicoContainer pico = new DefaultPicoContainer();
         PicoRegistrar picoRegistrar = new PicoRegistrar(pico);
@@ -74,6 +82,7 @@
         assertNotSame(controllerOne, controllerTwo);
     }
 
+    @Test
     public void testNonCachingRegistrationWithKey() {
         MutablePicoContainer pico = new DefaultPicoContainer();
         PicoRegistrar picoRegistrar = new PicoRegistrar(pico);
@@ -86,6 +95,7 @@
         assertNotSame(controllerOne, controllerTwo);
     }
 
+    @Test
     public void testRegisterComponentAdapter() {
         MutablePicoContainer pico = new DefaultPicoContainer();
         PicoRegistrar picoRegistrar = new PicoRegistrar(pico);

Modified: trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/RequestAttributeParameterTest.java (333 => 334)

--- trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/RequestAttributeParameterTest.java	2007-11-03 11:46:15 UTC (rev 333)
+++ trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/RequestAttributeParameterTest.java	2007-11-03 12:29:36 UTC (rev 334)
@@ -1,24 +1,39 @@
 package org.codehaus.waffle.registrar.pico;
 
+import static org.junit.Assert.assertEquals;
+
+import javax.servlet.http.HttpServletRequest;
+
 import org.codehaus.waffle.testmodel.DependsOnValue;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.picocontainer.MutablePicoContainer;
 import org.picocontainer.Parameter;
 import org.picocontainer.defaults.DefaultPicoContainer;
 
-import javax.servlet.http.HttpServletRequest;
+/**
+ * 
+ * @author Michael Ward
+ * @author Mauro Talevi
+ */
[EMAIL PROTECTED](JMock.class)
+public class RequestAttributeParameterTest {
+    private Mockery mockery = new Mockery();
 
-public class RequestAttributeParameterTest extends MockObjectTestCase {
-
-    public void testComponentDependsOnRequestAttribute() {
-        Mock mockRequest = mock(HttpServletRequest.class);
-        mockRequest.expects(exactly(2))
-                .method("getAttribute")
-                .with(eq("foobar"))
-                .will(returnValue("helloWorld"));
-        HttpServletRequest request = (HttpServletRequest) mockRequest.proxy();
-
+    @Test
+    public void componentDependsOnRequestAttribute() {
+        // Mock HttpServletRequest
+        final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
+        mockery.checking(new Expectations() {
+            {
+                exactly(2).of(request).getAttribute("foobar");
+                will(returnValue("helloWorld"));
+            }
+        });
+        
         Parameter[] parameters = {new RequestAttributeParameter("foobar")};
 
         MutablePicoContainer pico = new DefaultPicoContainer();

Modified: trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapterTest.java (333 => 334)

--- trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapterTest.java	2007-11-03 11:46:15 UTC (rev 333)
+++ trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/RubyScriptComponentAdapterTest.java	2007-11-03 12:29:36 UTC (rev 334)
@@ -1,15 +1,18 @@
 package org.codehaus.waffle.registrar.pico;
 
-import org.jmock.MockObjectTestCase;
+import static org.junit.Assert.assertEquals;
+
+import org.jruby.Ruby;
+import org.jruby.javasupport.JavaUtil;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.junit.Test;
 import org.picocontainer.ComponentAdapter;
 import org.picocontainer.MutablePicoContainer;
 import org.picocontainer.defaults.DefaultPicoContainer;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.Ruby;
-import org.jruby.javasupport.JavaUtil;
 
-public class RubyScriptComponentAdapterTest extends MockObjectTestCase {
+public class RubyScriptComponentAdapterTest {
 
+    @Test
     public void testComponentKeyAndImplementationMethods() {
         ComponentAdapter componentAdapter = new RubyScriptComponentAdapter("foobar", "'ruby script'");
         assertEquals("foobar", componentAdapter.getComponentKey());

Modified: trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/ServletContextAttributeParameterTest.java (333 => 334)

--- trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/ServletContextAttributeParameterTest.java	2007-11-03 11:46:15 UTC (rev 333)
+++ trunk/core/src/test/java/org/codehaus/waffle/registrar/pico/ServletContextAttributeParameterTest.java	2007-11-03 12:29:36 UTC (rev 334)
@@ -1,24 +1,39 @@
 package org.codehaus.waffle.registrar.pico;
 
+import javax.servlet.ServletContext;
+
 import org.codehaus.waffle.testmodel.DependsOnValue;
-import org.jmock.Mock;
+import org.jmock.Expectations;
 import org.jmock.MockObjectTestCase;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.picocontainer.MutablePicoContainer;
 import org.picocontainer.Parameter;
 import org.picocontainer.defaults.DefaultPicoContainer;
 
-import javax.servlet.ServletContext;
-
+/**
+ * 
+ * @author Michael Ward
+ * @author Mauro Talevi
+ */
[EMAIL PROTECTED](JMock.class)
 public class ServletContextAttributeParameterTest extends MockObjectTestCase {
 
-    public void testComponentDependsOnServletContextAttribute() {
-        Mock mockServletContext = mock(ServletContext.class);
-        mockServletContext.expects(exactly(2))
-                .method("getAttribute")
-                .with(eq("foobar"))
-                .will(returnValue("helloWorld"));
-        ServletContext servletContext = (ServletContext) mockServletContext.proxy();
+    private Mockery mockery = new Mockery();
 
+    @Test
+    public void componentDependsOnServletContextAttribute() {
+        // Mock ServletContext
+        final ServletContext servletContext = mockery.mock(ServletContext.class);
+        mockery.checking(new Expectations() {
+            {
+                exactly(2).of(servletContext).getAttribute("foobar");
+                will(returnValue("helloWorld"));
+            }
+        });
+        
         Parameter[] parameters = {new ServletContextAttributeParameter("foobar")};
 
         MutablePicoContainer pico = new DefaultPicoContainer();

Modified: trunk/core/src/test/java/org/codehaus/waffle/servlet/ServletContextHelperTest.java (333 => 334)

--- trunk/core/src/test/java/org/codehaus/waffle/servlet/ServletContextHelperTest.java	2007-11-03 11:46:15 UTC (rev 333)
+++ trunk/core/src/test/java/org/codehaus/waffle/servlet/ServletContextHelperTest.java	2007-11-03 12:29:36 UTC (rev 334)
@@ -1,44 +1,58 @@
 package org.codehaus.waffle.servlet;
 
+import javax.servlet.ServletContext;
+
 import org.codehaus.waffle.ComponentRegistry;
 import org.codehaus.waffle.WaffleException;
 import org.codehaus.waffle.testmodel.StubComponentRegistry;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-import javax.servlet.ServletContext;
+/**
+ * 
+ * @author Michael Ward
+ * @author Mauro Talevi
+ */
[EMAIL PROTECTED](JMock.class)
+public class ServletContextHelperTest {
 
-public class ServletContextHelperTest extends MockObjectTestCase {
+    private Mockery mockery = new Mockery();
 
-    public void testGetWaffleComponentManager() {
-        Mock mockServletContext = mock(ServletContext.class);
-        ServletContext servletContext = (ServletContext) mockServletContext.proxy();
-        mockServletContext.expects(once())
-                .method("getInitParameterNames")
-                .will(returnValue(null));
-        mockServletContext.expects(atLeastOnce())
-                .method("getInitParameter")
-                .will(returnValue(null));
-        mockServletContext.expects(once()).method("getAttribute")
-                .with(eq(ComponentRegistry.class.getName()))
-                .will(returnValue(new StubComponentRegistry(servletContext)));
+    @Test
+    public void canGetComponentRegistry() {
 
+        // Mock ServletContext
+        final ServletContext servletContext = mockery.mock(ServletContext.class);
+        mockery.checking(new Expectations() {
+            {
+                one(servletContext).getInitParameterNames();
+                will(returnValue(null));
+                atLeast(1).of(servletContext).getInitParameter(with(any(String.class)));
+                will(returnValue(null));
+            }
+        });
+        mockery.checking(new Expectations() {
+            {
+                one(servletContext).getAttribute(ComponentRegistry.class.getName());
+                will(returnValue(new StubComponentRegistry(servletContext)));
+            }
+        });
         ServletContextHelper.getComponentRegistry(servletContext);
     }
 
-    public void testWaffleComponentManagerRegistrationRequired() {
-        Mock mockServletContext = mock(ServletContext.class);
-        mockServletContext.expects(once())
-                .method("getAttribute")
-                .with(eq(ComponentRegistry.class.getName()))
-                .will(returnValue(null));
-        ServletContext servletContext = (ServletContext) mockServletContext.proxy();
-
-        try {
-            ServletContextHelper.getComponentRegistry(servletContext);
-            fail("WaffleException expected");
-        } catch (WaffleException expected) {
-            // expected
-        }
+    @Test(expected = WaffleException.class)
+    public void cannotGetComponentRegistryIfNotRegistered() {
+        // Mock ServletContext
+        final ServletContext servletContext = mockery.mock(ServletContext.class);
+        mockery.checking(new Expectations() {
+            {
+                one(servletContext).getAttribute(ComponentRegistry.class.getName());
+                will(returnValue(null));
+            }
+        });
+        ServletContextHelper.getComponentRegistry(servletContext);
     }
 }

Modified: trunk/core/src/test/java/org/codehaus/waffle/servlet/WaffleServletTest.java (333 => 334)

--- trunk/core/src/test/java/org/codehaus/waffle/servlet/WaffleServletTest.java	2007-11-03 11:46:15 UTC (rev 333)
+++ trunk/core/src/test/java/org/codehaus/waffle/servlet/WaffleServletTest.java	2007-11-03 12:29:36 UTC (rev 334)
@@ -51,12 +51,18 @@
 import java.util.Enumeration;
 import java.util.List;
 
+/**
+ * 
+ * @author Michael Ward
+ * @author Mauro Talevi
+ */
 @RunWith(JMock.class)
 public class WaffleServletTest {
     private final Mockery mockery = new JUnit4Mockery();
 
+    @SuppressWarnings("serial")
     @Test
-    public void testInitSetsAttributeOnServletContext() throws ServletException {
+    public void canInitSetsAttributeOnServletContext() throws ServletException {
         // Mock ServletConfig
         final ServletConfig servletConfig = mockery.mock(ServletConfig.class);
         final ServletContext servletContext = mockery.mock(ServletContext.class);
@@ -93,12 +99,13 @@
         servlet.init();
     }
 
+    @SuppressWarnings("serial")
     @Test
-    public void testServiceForNonDispatchingController() throws Exception {
+    public void canServiceForNonDispatchingController() throws Exception {
         RequestLevelContainer.set(new PicoContextContainer(new DefaultPicoContainer()));
         final NonDispatchingController nonDispatchingController = new NonDispatchingController();
         List<?> list = Collections.EMPTY_LIST;
-        final Enumeration enumeration = Collections.enumeration(list);
+        final Enumeration<?> enumeration = Collections.enumeration(list);
 
         // Mock HttpServletRequest
         final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
@@ -151,12 +158,13 @@
         Assert.assertEquals(1, nonDispatchingController.getCount());
     }
 
+    @SuppressWarnings("serial")
     @Test // Testing Post/Redirect/Get - see http://en.wikipedia.org/wiki/Post/Redirect/Get
     public void serviceShouldCreateRedirectViewWhenReturnValueIsNullAndRequestWasAPost() throws Exception {
         RequestLevelContainer.set(new PicoContextContainer(new DefaultPicoContainer()));
         final NonDispatchingController nonDispatchingController = new NonDispatchingController();
         List<?> list = Collections.EMPTY_LIST;
-        final Enumeration enumeration = Collections.enumeration(list);
+        final Enumeration<?> enumeration = Collections.enumeration(list);
 
         // Mock HttpServletRequest
         final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
@@ -212,7 +220,7 @@
     }
 
     @Test(expected = ServletException.class)
-    public void testControllerNotFound() throws Exception {
+    public void cannotServiceIfControllerNotFound() throws Exception {
         // Mock HttpServletRequest
         final HttpServletRequest request = mockery.mock(HttpServletRequest.class);
         mockery.checking(new Expectations() {{
@@ -238,11 +246,12 @@
         waffleServlet.service(request, null);
     }
 
+    @SuppressWarnings("serial")
     @Test
-    public void testMethodDefinitionIsNull() throws Exception {
+    public void cannotServiceIfMethodDefinitionIsNull() throws Exception {
         final NonDispatchingController nonDispatchingController = new NonDispatchingController();
         List<?> list = Collections.EMPTY_LIST;
-        final Enumeration enumeration = Collections.enumeration(list);
+        final Enumeration<?> enumeration = Collections.enumeration(list);
 
         // Mock HttpServletRequest
         final HttpServletRequest request  = mockery.mock(HttpServletRequest.class);
@@ -294,12 +303,12 @@
         waffleServlet.service(request, response);
     }
 
-    @SuppressWarnings({"ThrowableInstanceNeverThrown"})
+    @SuppressWarnings({"serial"})
     @Test
-    public void testMethodInvocationExceptionThrown() throws Exception {
+    public void canThrowExceptionInMethodInvocation() throws Exception {
         final NonDispatchingController nonDispatchingController = new NonDispatchingController();
         List<?> list = Collections.EMPTY_LIST;
-        final Enumeration enumeration = Collections.enumeration(list);
+        final Enumeration<?> enumeration = Collections.enumeration(list);
 
         // Mock HttpServletRequest
         final HttpServletRequest request  = mockery.mock(HttpServletRequest.class);
@@ -358,7 +367,7 @@
     }
 
     @Test
-    public void testBuildViewToReferrer() throws Exception {
+    public void canBuildViewToReferrer() throws Exception {
         WaffleServlet waffleServlet = new WaffleServlet();
 
         Field viewPrefixField = WaffleServlet.class.getDeclaredField("viewPrefix");
@@ -375,8 +384,9 @@
         Assert.assertEquals("prefix-foobar-suffix", view.getValue());
     }
 
+    @SuppressWarnings("serial")
     @Test(expected = WaffleException.class)
-    public void testInitRequiresInitParameter() throws ServletException {
+    public void cannotInitWithoutParameter() throws ServletException {
         final ServletContext servletContext = mockery.mock(ServletContext.class);
         mockery.checking(new Expectations() {{
             one(servletContext).getAttribute(ComponentRegistry.class.getName());

Modified: trunk/core/src/test/java/org/codehaus/waffle/servlet/WaffleXMLServletTest.java (333 => 334)

--- trunk/core/src/test/java/org/codehaus/waffle/servlet/WaffleXMLServletTest.java	2007-11-03 11:46:15 UTC (rev 333)
+++ trunk/core/src/test/java/org/codehaus/waffle/servlet/WaffleXMLServletTest.java	2007-11-03 12:29:36 UTC (rev 334)
@@ -1,21 +1,22 @@
 package org.codehaus.waffle.servlet;
 
+import static org.junit.Assert.assertTrue;
+
 import org.codehaus.waffle.action.ActionMethodResponse;
+import org.codehaus.waffle.view.View;
 import org.codehaus.waffle.view.XMLView;
-import org.codehaus.waffle.view.View;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class WaffleXMLServletTest {
 
     @Test
-    public void testOverridenActionMethodResponse() {
+    public void canOverridActionMethodResponse() {
         ActionMethodResponse response = new ActionMethodResponse();
         response.setReturnValue("a value that will be overriden....");
 
         WaffleXMLServlet servlet = new WaffleXMLServlet();
         View view = servlet.buildViewToReferrer(null);
-        Assert.assertTrue(view instanceof XMLView);
+        assertTrue(view instanceof XMLView);
     }
 
 }

Modified: trunk/core/src/test/java/org/codehaus/waffle/validation/DefaultErrorsContextTest.java (333 => 334)

--- trunk/core/src/test/java/org/codehaus/waffle/validation/DefaultErrorsContextTest.java	2007-11-03 11:46:15 UTC (rev 333)
+++ trunk/core/src/test/java/org/codehaus/waffle/validation/DefaultErrorsContextTest.java	2007-11-03 12:29:36 UTC (rev 334)
@@ -1,10 +1,19 @@
 package org.codehaus.waffle.validation;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-public class DefaultErrorsContextTest extends TestCase {
+import org.junit.Test;
 
-    public void testEachCountMethod() {
+/**
+ * 
+ * @author Michael Ward
+ */
+public class DefaultErrorsContextTest {
+
+    @Test
+    public void canGetEachCountMethod() {
         ErrorsContext context = new DefaultErrorsContext();
         context.addErrorMessage(new BindErrorMessage("bind.error", "foobar", null));
         context.addErrorMessage(new FieldErrorMessage("field.error", "foobaz", null));
@@ -17,7 +26,8 @@
         assertEquals(1, context.getGlobalErrorMessageCount());
     }
 
-    public void testHasErrors() {
+    @Test
+    public void hasErrors() {
         ErrorsContext context = new DefaultErrorsContext();
         assertFalse(context.hasErrorMessages());
 
@@ -36,7 +46,8 @@
         assertTrue(context.hasErrorMessages());
     }
 
-    public void testHasBindErrorMessages() {
+    @Test
+    public void hasBindErrorMessages() {
         ErrorsContext context = new DefaultErrorsContext();
         assertFalse(context.hasBindErrorMessages("fieldName"));
 
@@ -44,7 +55,8 @@
         assertTrue(context.hasBindErrorMessages("fieldName"));
     }
 
-    public void testHasFieldErrorMessages() {
+    @Test
+    public void hasFieldErrorMessages() {
         ErrorsContext context = new DefaultErrorsContext();
         assertFalse(context.hasFieldErrorMessages("fieldName"));
 
@@ -52,7 +64,8 @@
         assertTrue(context.hasFieldErrorMessages("fieldName"));
     }
 
-    public void testHasGlobalErrorMessages() {
+    @Test
+    public void hasGlobalErrorMessages() {
         ErrorsContext context = new DefaultErrorsContext();
         assertFalse(context.hasGlobalErrorMessages());
 
@@ -60,7 +73,8 @@
         assertTrue(context.hasGlobalErrorMessages());
     }
 
-    public void testGetAllErrorMessages() {
+    @Test
+    public void canGetAllErrorMessages() {
         ErrorsContext context = new DefaultErrorsContext();
         assertEquals(0, context.getAllErrorMessages().size());
 
@@ -71,7 +85,8 @@
         assertEquals(3, context.getAllErrorMessages().size());
     }
 
-    public void testGetAllBindErrorMessages() {
+    @Test
+    public void canGetAllBindErrorMessages() {
         ErrorsContext context = new DefaultErrorsContext();
         assertEquals(0, context.getAllBindErrorMessages().size());
 
@@ -79,7 +94,8 @@
         assertEquals(1, context.getAllBindErrorMessages().size());
     }
 
-    public void testGetAllFieldErrorMessages() {
+    @Test
+    public void canGetAllFieldErrorMessages() {
         ErrorsContext context = new DefaultErrorsContext();
         assertEquals(0, context.getAllFieldErrorMessages().size());
 
@@ -87,7 +103,8 @@
         assertEquals(1, context.getAllFieldErrorMessages().size());
     }
 
-    public void testGetAllGlobalErrorMessages() {
+    @Test
+    public void canGetAllGlobalErrorMessages() {
         ErrorsContext context = new DefaultErrorsContext();
         assertEquals(0, context.getAllGlobalErrorMessages().size());
 
@@ -95,15 +112,17 @@
         assertEquals(1, context.getAllGlobalErrorMessages().size());
     }
 
-    public void testGetBindErrorMessages() {
+    @Test
+    public void canGetBindErrorMessages() {
         ErrorsContext context = new DefaultErrorsContext();
         assertEquals(0, context.getBindErrorMessages("fieldName").size());
 
         context.addErrorMessage(new BindErrorMessage("fieldName", null, null));
         assertEquals(1, context.getBindErrorMessages("fieldName").size());
     }
-    
-    public void testGetFieldErrorMessages() {
+
+    @Test
+    public void canGetFieldErrorMessages() {
         ErrorsContext context = new DefaultErrorsContext();
         assertEquals(0, context.getFieldErrorMessages("fieldName").size());

Modified: trunk/core/src/test/java/org/codehaus/waffle/validation/DefaultValidatorTest.java (333 => 334)

--- trunk/core/src/test/java/org/codehaus/waffle/validation/DefaultValidatorTest.java	2007-11-03 11:46:15 UTC (rev 333)
+++ trunk/core/src/test/java/org/codehaus/waffle/validation/DefaultValidatorTest.java	2007-11-03 12:29:36 UTC (rev 334)
@@ -1,33 +1,53 @@
 package org.codehaus.waffle.validation;
 
-import org.codehaus.waffle.controller.ControllerDefinition;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+import java.lang.reflect.Method;
+
 import org.codehaus.waffle.action.MethodDefinition;
 import org.codehaus.waffle.context.ContextContainer;
 import org.codehaus.waffle.context.RequestLevelContainer;
+import org.codehaus.waffle.controller.ControllerDefinition;
 import org.codehaus.waffle.testmodel.FakeController;
 import org.codehaus.waffle.testmodel.FakeControllerValidator;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
-import java.lang.reflect.Method;
+/**
+ * 
+ * @author Michael Ward
+ * @author Mauro Talevi
+ */
[EMAIL PROTECTED](JMock.class)
+public class DefaultValidatorTest {
 
-public class DefaultValidatorTest extends MockObjectTestCase {
+    private Mockery mockery = new Mockery();
 
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         RequestLevelContainer.set(null);
     }
 
-    public void testValidate() throws Exception {
-        FakeControllerValidator fakeControllerValidator = new FakeControllerValidator();
+    @Test
+    public void canValidate() throws Exception {
+        final FakeControllerValidator fakeControllerValidator = new FakeControllerValidator();
 
         // Mock ContextContainer
-        Mock mockContextContainer = mock(ContextContainer.class);
-        mockContextContainer.expects(once())
-                .method("getComponentInstance")
-                .with(eq("theControllerValidator"))
-                .will(returnValue(fakeControllerValidator));
-        RequestLevelContainer.set((ContextContainer) mockContextContainer.proxy());
+        final ContextContainer contextContainer = mockery.mock(ContextContainer.class);
+        mockery.checking(new Expectations() {
+            {
+                one(contextContainer).getComponentInstance("theControllerValidator");
+                will(returnValue(fakeControllerValidator));
+            }
+        });
+        RequestLevelContainer.set(contextContainer);
 
+
         Method method = FakeController.class.getMethod("sayHello", String.class);
         MethodDefinition methodDefinition = new MethodDefinition(method);
         methodDefinition.addMethodArgument("foobar");
@@ -43,16 +63,19 @@
         assertEquals("foobar", fakeControllerValidator.value);
     }
 
-    public void testValidateWhenControllerDefinitionHasANullMethodDefinition() {
-        FakeControllerValidator fakeControllerValidator = new FakeControllerValidator();
+    @Test
+    public void canValidateWhenControllerDefinitionHasANullMethodDefinition() {
+        final FakeControllerValidator fakeControllerValidator = new FakeControllerValidator();
 
         // Mock ContextContainer
-        Mock mockContextContainer = mock(ContextContainer.class);
-        mockContextContainer.expects(once())
-                .method("getComponentInstance")
-                .with(eq("theControllerValidator"))
-                .will(returnValue(fakeControllerValidator));
-        RequestLevelContainer.set((ContextContainer) mockContextContainer.proxy());
+        final ContextContainer contextContainer = mockery.mock(ContextContainer.class);
+        mockery.checking(new Expectations() {
+            {
+                one(contextContainer).getComponentInstance("theControllerValidator");
+                will(returnValue(fakeControllerValidator));
+            }
+        });
+        RequestLevelContainer.set(contextContainer);
 
         FakeController fakeController = new FakeController();
         ControllerDefinition controllerDefinition = new ControllerDefinition("theController", fakeController, null);

Modified: trunk/core/src/test/java/org/codehaus/waffle/view/BeanPropertyConverterTest.java (333 => 334)

--- trunk/core/src/test/java/org/codehaus/waffle/view/BeanPropertyConverterTest.java	2007-11-03 11:46:15 UTC (rev 333)
+++ trunk/core/src/test/java/org/codehaus/waffle/view/BeanPropertyConverterTest.java	2007-11-03 12:29:36 UTC (rev 334)
@@ -1,45 +1,41 @@
 package org.codehaus.waffle.view;
 
-import com.thoughtworks.xstream.XStream;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import org.codehaus.waffle.testmodel.FakeBean;
-import org.junit.Assert;
 import org.junit.Test;
 
+import com.thoughtworks.xstream.XStream;
+
 public class BeanPropertyConverterTest {
 
-    @Test
-    public void unmarshalShouldThrowUnsupportedOperationException() {
+    @Test(expected = UnsupportedOperationException.class)
+    public void cannotUnmarshalNullObjects() {
         BeanPropertyConverter beanPropertyConverter = new BeanPropertyConverter();
-
-        try {
-            beanPropertyConverter.unmarshal(null, null);
-            Assert.fail("UnsupportedOperationException expected");
-        } catch (UnsupportedOperationException expected) {
-            // expected    
-        }
+        beanPropertyConverter.unmarshal(null, null);
     }
 
     @Test
     public void convertShouldAlwaysBeTrue() {
         BeanPropertyConverter beanPropertyConverter = new BeanPropertyConverter();
-        Assert.assertTrue(beanPropertyConverter.canConvert(this.getClass()));
+        assertTrue(beanPropertyConverter.canConvert(this.getClass()));
     }
 
     @Test
     public void testMarshall() {
-        XStream xStream = new XStream();
-        xStream.registerConverter(new BeanPropertyConverter(), -19);
+        XStream xstream = new XStream();
+        xstream.registerConverter(new BeanPropertyConverter(), -19);
 
         FakeBean fakeBean = new FakeBean();
-        String xml = xStream.toXML(fakeBean);
+        String xml = xstream.toXML(fakeBean);
 
-        String expected =
-                "<org.codehaus.waffle.testmodel.FakeBean>\n" +
-                "  <count>0</count>\n" +
-                "  <list/>\n" +
-                "</org.codehaus.waffle.testmodel.FakeBean>";
+        String expected = "<org.codehaus.waffle.testmodel.FakeBean>\n" 
+                + "  <count>0</count>\n" 
+                + "  <list/>\n"
+                + "</org.codehaus.waffle.testmodel.FakeBean>";
 
-        Assert.assertEquals(expected, xml);
+        assertEquals(expected, xml);
     }
 
 }

Modified: trunk/core/src/test/java/org/codehaus/waffle/view/DefaultViewResolverTest.java (333 => 334)

--- trunk/core/src/test/java/org/codehaus/waffle/view/DefaultViewResolverTest.java	2007-11-03 11:46:15 UTC (rev 333)
+++ trunk/core/src/test/java/org/codehaus/waffle/view/DefaultViewResolverTest.java	2007-11-03 12:29:36 UTC (rev 334)
@@ -1,10 +1,13 @@
 package org.codehaus.waffle.view;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
 
-public class DefaultViewResolverTest extends TestCase {
+import org.junit.Test;
 
-    public void testResolve() {
+public class DefaultViewResolverTest {
+
+    @Test
+    public void canResolve() {
         View view = new View("/helloWorld.jsp", null);
         ViewResolver viewResolver = new DefaultViewResolver();

Deleted: trunk/core/src/test/java/org/codehaus/waffle/view/ViewTest.java (333 => 334)

--- trunk/core/src/test/java/org/codehaus/waffle/view/ViewTest.java	2007-11-03 11:46:15 UTC (rev 333)
+++ trunk/core/src/test/java/org/codehaus/waffle/view/ViewTest.java	2007-11-03 12:29:36 UTC (rev 334)
@@ -1,10 +0,0 @@
-package org.codehaus.waffle.view;
-
-import junit.framework.TestCase;
-
-public class ViewTest extends TestCase {
-
-    public void testConstructor() {
-        
-    }
-}

Modified: trunk/core/src/test/java/org/codehaus/waffle/view/XMLViewTest.java (333 => 334)

--- trunk/core/src/test/java/org/codehaus/waffle/view/XMLViewTest.java	2007-11-03 11:46:15 UTC (rev 333)
+++ trunk/core/src/test/java/org/codehaus/waffle/view/XMLViewTest.java	2007-11-03 12:29:36 UTC (rev 334)
@@ -141,10 +141,6 @@
 
         private String d;
 
-        private String e;
-
-        private String f;
-
         public String getA() {
             return a;
         }
@@ -174,13 +170,12 @@
         }
 
         public void setE(String e) {
-            this.e = e;
         }
     }
 
     @Test
     public void testListsFieldsInClassInDefinitionOrder() {
-        Iterator properties = new PropertyDictionary()
+        Iterator<?> properties = new PropertyDictionary()
                 .serializablePropertiesFor(SomeClass.class);
         assertEquals("URL", ((BeanProperty) properties.next()).getName());
         assertEquals("a", ((BeanProperty) properties.next()).getName());

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to