[waffle-scm] [363] trunk: Removed jMock 1.x support, rendered obsolete by jMock 2.x.

Tue, 13 Nov 2007 01:13:11 -0800

Title: [waffle-scm] [363] trunk: Removed jMock 1.x support, rendered obsolete by jMock 2.x.

Diff

Modified: trunk/core/src/test/java/org/codehaus/waffle/bind/IntrospectingRequestAttributeBinderTest.java (362 => 363)

--- trunk/core/src/test/java/org/codehaus/waffle/bind/IntrospectingRequestAttributeBinderTest.java	2007-11-13 09:04:23 UTC (rev 362)
+++ trunk/core/src/test/java/org/codehaus/waffle/bind/IntrospectingRequestAttributeBinderTest.java	2007-11-13 09:13:08 UTC (rev 363)
@@ -7,7 +7,6 @@
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
 import org.jruby.Ruby;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.junit.Test;
@@ -15,7 +14,7 @@
 
 @RunWith(JMock.class)
 public class IntrospectingRequestAttributeBinderTest {
-    private final Mockery context = new JUnit4Mockery();
+    private final Mockery context = new Mockery();
 
     @Test
     public void allControllerPropertiesShouldBeBoundAsRequestAttributes() {

Modified: trunk/core/src/test/java/org/codehaus/waffle/context/pico/RubyScriptLoaderTest.java (362 => 363)

--- trunk/core/src/test/java/org/codehaus/waffle/context/pico/RubyScriptLoaderTest.java	2007-11-13 09:04:23 UTC (rev 362)
+++ trunk/core/src/test/java/org/codehaus/waffle/context/pico/RubyScriptLoaderTest.java	2007-11-13 09:13:08 UTC (rev 363)
@@ -1,20 +1,19 @@
 package org.codehaus.waffle.context.pico;
 
+import javax.servlet.ServletContext;
+
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
 import org.jruby.Ruby;
 import org.jruby.javasupport.JavaUtil;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import javax.servlet.ServletContext;
-
 @RunWith(JMock.class)
 public class RubyScriptLoaderTest {
-    private final Mockery context = new JUnit4Mockery();
+    private final Mockery context = new Mockery();
 
     @Test
     public void startShouldFindAllResourcesAndLoadScriptsIntoRubyRuntime() {

Modified: trunk/core/src/test/java/org/codehaus/waffle/monitor/AbstractWritingMonitorTest.java (362 => 363)

--- trunk/core/src/test/java/org/codehaus/waffle/monitor/AbstractWritingMonitorTest.java	2007-11-13 09:04:23 UTC (rev 362)
+++ trunk/core/src/test/java/org/codehaus/waffle/monitor/AbstractWritingMonitorTest.java	2007-11-13 09:13:08 UTC (rev 363)
@@ -20,7 +20,6 @@
 import org.codehaus.waffle.action.MethodDefinition;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -30,7 +29,7 @@
 @RunWith(JMock.class)
 public class AbstractWritingMonitorTest {
 
-    private final Mockery mockery = new JUnit4Mockery();
+    private final Mockery mockery = new Mockery();
 
     @Test
     public void canWriteMessages() {

Modified: trunk/core/src/test/java/org/codehaus/waffle/monitor/CommonsLoggingMonitorTest.java (362 => 363)

--- trunk/core/src/test/java/org/codehaus/waffle/monitor/CommonsLoggingMonitorTest.java	2007-11-13 09:04:23 UTC (rev 362)
+++ trunk/core/src/test/java/org/codehaus/waffle/monitor/CommonsLoggingMonitorTest.java	2007-11-13 09:13:08 UTC (rev 363)
@@ -17,7 +17,6 @@
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -28,7 +27,7 @@
 @RunWith(JMock.class)
 public class CommonsLoggingMonitorTest {
 
-    private final Mockery mockery = new JUnit4Mockery();
+    private final Mockery mockery = new Mockery();
 
     @Test
     public void canInstantiateUsingDefaultConstructor() {

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

--- trunk/core/src/test/java/org/codehaus/waffle/servlet/WaffleServletTest.java	2007-11-13 09:04:23 UTC (rev 362)
+++ trunk/core/src/test/java/org/codehaus/waffle/servlet/WaffleServletTest.java	2007-11-13 09:13:08 UTC (rev 363)
@@ -49,7 +49,6 @@
 import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.jmock.integration.junit4.JMock;
-import org.jmock.integration.junit4.JUnit4Mockery;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -62,7 +61,7 @@
  */
 @RunWith(JMock.class)
 public class WaffleServletTest {
-    private final Mockery mockery = new JUnit4Mockery();
+    private final Mockery mockery = new Mockery();
 
     @SuppressWarnings("serial")
     @Test

Modified: trunk/extensions/mock/pom.xml (362 => 363)

--- trunk/extensions/mock/pom.xml	2007-11-13 09:04:23 UTC (rev 362)
+++ trunk/extensions/mock/pom.xml	2007-11-13 09:13:08 UTC (rev 363)
@@ -18,11 +18,6 @@
       <version>${pom.version}</version>
     </dependency>
     <dependency>
-      <groupId>jmock</groupId>
-      <artifactId>jmock</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
       <groupId>org.jmock</groupId>
       <artifactId>jmock-junit4</artifactId>
       <scope>compile</scope>

Deleted: trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractPicoRegistrarTestCase.java (362 => 363)

--- trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractPicoRegistrarTestCase.java	2007-11-13 09:04:23 UTC (rev 362)
+++ trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractPicoRegistrarTestCase.java	2007-11-13 09:13:08 UTC (rev 363)
@@ -1,24 +0,0 @@
-package org.codehaus.waffle.mock;
-
-import org.picocontainer.MutablePicoContainer;
-
-import org.codehaus.waffle.context.ContextContainer;
-import org.codehaus.waffle.context.pico.PicoContextContainer;
-import org.codehaus.waffle.registrar.Registrar;
-import org.codehaus.waffle.registrar.pico.PicoRegistrar;
-
-/**
- * Abstract TestCase that uses PicoContainer as the ContextContainer
- * 
- * @author Mauro Talevi
- */
-public abstract class AbstractPicoRegistrarTestCase extends AbstractRegistrarTestCase {
-
-    protected ContextContainer createContextContainer() {        
-        return new PicoContextContainer();
-    }
-
-    protected Registrar createRegistrar(ContextContainer container) {
-        return new PicoRegistrar((MutablePicoContainer) container.getDelegate());
-    }
-}

Deleted: trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractRegistrarTestCase.java (362 => 363)

--- trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractRegistrarTestCase.java	2007-11-13 09:04:23 UTC (rev 362)
+++ trunk/extensions/mock/src/main/java/org/codehaus/waffle/mock/AbstractRegistrarTestCase.java	2007-11-13 09:13:08 UTC (rev 363)
@@ -1,124 +0,0 @@
-/*****************************************************************************
- * 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.mock;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
-
-import org.codehaus.waffle.context.ContextContainer;
-import org.codehaus.waffle.context.ContextLevel;
-import org.codehaus.waffle.i18n.MessageResources;
-import org.codehaus.waffle.registrar.Registrar;
-import org.codehaus.waffle.registrar.RegistrarAssistant;
-
-/**
- * Abstract jMock 1.x MockObjectTestCase used for asserting Registrars are defined correctly. 
- * Concrete subclasses need to define method to create the ContextContainer and the Registrar.
- * 
- * @author Michael Ward
- * @author Mauro Talevi
- */
-public abstract class AbstractRegistrarTestCase extends MockObjectTestCase {
-    private Mock mockServletContext = mock(ServletContext.class);
-    private Mock mockHttpSession = mock(HttpSession.class);
-    private Mock mockHttpServletRequest = mock(HttpServletRequest.class);
-    private Mock mockHttpServletResponse = mock(HttpServletResponse.class);
-    private Mock mockMessageResources = mock(MessageResources.class);
-
-    public Mock getMockServletContext() {
-        return mockServletContext;
-    }
-
-    public Mock getMockHttpSession() {
-        return mockHttpSession;
-    }
-
-    public Mock getMockHttpServletRequest() {
-        return mockHttpServletRequest;
-    }
-
-    public Mock getMockHttpServletResponse() {
-        return mockHttpServletResponse;
-    }
-
-    public void setMockHttpServletResponse(Mock mockHttpServletResponse) {
-        this.mockHttpServletResponse = mockHttpServletResponse;
-    }
-
-    public void assertConfiguration(Class<?> registrarClass) {
-        assertApplicationContext(registrarClass);
-        assertSessionContext(registrarClass);
-        assertRequestContext(registrarClass);
-    }
-
-    public void assertApplicationContext(Class<?> customRegistrarClass) {
-        ServletContext servletContext = (ServletContext) mockServletContext.proxy();
-
-        ContextContainer container = createContextContainer();
-        container.registerComponentInstance(servletContext);
-        container.registerComponentInstance(mockMessageResources.proxy());
-        Registrar registrar = createRegistrar(container);
-
-        RegistrarAssistant registrarAssistant = new RegistrarAssistant(customRegistrarClass);
-        registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.APPLICATION);
-
-        container.validateComponentInstances(); // ensure dependencies are satisfied
-    }
-
-    public void assertSessionContext(Class<?> customRegistrarClass) {
-        ServletContext servletContext = (ServletContext) mockServletContext.proxy();
-        HttpSession httpSession = (HttpSession) mockHttpSession.proxy();
-
-        ContextContainer container = createContextContainer();
-        container.registerComponentInstance(servletContext);
-        container.registerComponentInstance(httpSession);
-        container.registerComponentInstance(mockMessageResources.proxy());
-        Registrar registrar = createRegistrar(container);
-
-        RegistrarAssistant registrarAssistant = new RegistrarAssistant(customRegistrarClass);
-        registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.APPLICATION);
-        registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.SESSION);
-
-        container.validateComponentInstances(); // ensure dependencies are satisfied
-    }
-
-    public void assertRequestContext(Class<?> customRegistrarClass) {
-        ServletContext servletContext = (ServletContext) mockServletContext.proxy();
-        HttpSession httpSession = (HttpSession) mockHttpSession.proxy();
-        HttpServletRequest request = (HttpServletRequest) mockHttpServletRequest.proxy();
-        HttpServletResponse response = (HttpServletResponse) mockHttpServletResponse.proxy();
-
-        ContextContainer container = createContextContainer();
-        container.registerComponentInstance(servletContext);
-        container.registerComponentInstance(httpSession);
-        container.registerComponentInstance(request);
-        container.registerComponentInstance(response);
-        container.registerComponentInstance(mockMessageResources.proxy());
-        Registrar registrar = createRegistrar(container);
-
-        RegistrarAssistant registrarAssistant = new RegistrarAssistant(customRegistrarClass);
-        registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.APPLICATION);
-        registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.SESSION);
-        registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.REQUEST);
-
-        container.validateComponentInstances(); // ensure dependencies are satisfied
-    }
-    
-    protected abstract ContextContainer createContextContainer();
-
-    protected abstract Registrar createRegistrar(ContextContainer container);
-
-}

Modified: trunk/pom.xml (362 => 363)

--- trunk/pom.xml	2007-11-13 09:04:23 UTC (rev 362)
+++ trunk/pom.xml	2007-11-13 09:13:08 UTC (rev 363)
@@ -104,12 +104,6 @@
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>jmock</groupId>
-        <artifactId>jmock</artifactId>
-        <version>1.2.0</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
         <groupId>org.jmock</groupId>
         <artifactId>jmock-junit4</artifactId>
         <version>2.4.0</version>

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to