Return-Path: X-Original-To: apmail-continuum-commits-archive@www.apache.org Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1075010672 for ; Wed, 11 Feb 2015 21:28:17 +0000 (UTC) Received: (qmail 57696 invoked by uid 500); 11 Feb 2015 21:28:17 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 57670 invoked by uid 500); 11 Feb 2015 21:28:17 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 57661 invoked by uid 99); 11 Feb 2015 21:28:16 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Feb 2015 21:28:16 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id BA6DDAC010E for ; Wed, 11 Feb 2015 21:28:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1659094 - in /continuum/trunk: ./ continuum-buildagent/continuum-buildagent-webdav/ continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ Date: Wed, 11 Feb 2015 21:28:16 -0000 To: commits@continuum.apache.org From: batkinson@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150211212816.BA6DDAC010E@hades.apache.org> Author: batkinson Date: Wed Feb 11 21:28:16 2015 New Revision: 1659094 URL: http://svn.apache.org/r1659094 Log: Converted webdav-buildagent tests from easymock to mockito. Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/pom.xml continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceFactoryTest.java continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavSessionProviderTest.java continuum/trunk/pom.xml Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/pom.xml?rev=1659094&r1=1659093&r2=1659094&view=diff ============================================================================== --- continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/pom.xml (original) +++ continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/pom.xml Wed Feb 11 21:28:16 2015 @@ -85,9 +85,8 @@ test - easymock - easymock - test + org.mockito + mockito-all Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceFactoryTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceFactoryTest.java?rev=1659094&r1=1659093&r2=1659094&view=diff ============================================================================== --- continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceFactoryTest.java (original) +++ continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavResourceFactoryTest.java Wed Feb 11 21:28:16 2015 @@ -22,27 +22,23 @@ package org.apache.continuum.webdav; import org.apache.commons.io.FileUtils; import org.apache.continuum.buildagent.configuration.BuildAgentConfigurationService; import org.apache.jackrabbit.webdav.DavException; +import org.apache.jackrabbit.webdav.DavResource; import org.apache.jackrabbit.webdav.DavResourceLocator; import org.apache.jackrabbit.webdav.DavServletRequest; import org.apache.jackrabbit.webdav.DavServletResponse; import org.codehaus.plexus.spring.PlexusInSpringTestCase; -import org.easymock.MockControl; import java.io.File; +import static org.mockito.Mockito.*; + public class ContinuumBuildAgentDavResourceFactoryTest extends PlexusInSpringTestCase { - private MockControl requestControl; - private DavServletRequest request; - private MockControl responseControl; - private DavServletResponse response; - private MockControl buildAgentConfigurationServiceControl; - private BuildAgentConfigurationService buildAgentConfigurationService; private ContinuumBuildAgentDavResourceFactory resourceFactory; @@ -55,17 +51,9 @@ public class ContinuumBuildAgentDavResou { super.setUp(); - requestControl = MockControl.createControl( DavServletRequest.class ); - request = (DavServletRequest) requestControl.getMock(); - - responseControl = MockControl.createControl( DavServletResponse.class ); - response = (DavServletResponse) responseControl.getMock(); - responseControl.setDefaultMatcher( MockControl.ALWAYS_MATCHER ); - - buildAgentConfigurationServiceControl = MockControl. - createControl( BuildAgentConfigurationService.class ); - buildAgentConfigurationService = - (BuildAgentConfigurationService) buildAgentConfigurationServiceControl.getMock(); + request = mock( DavServletRequest.class ); + response = mock( DavServletResponse.class ); + buildAgentConfigurationService = mock( BuildAgentConfigurationService.class ); resourceFactory = new ContinuumBuildAgentDavResourceFactory(); resourceFactory.setBuildAgentConfigurationService( buildAgentConfigurationService ); @@ -101,18 +89,14 @@ public class ContinuumBuildAgentDavResou try { - requestControl.expectAndReturn( request.getMethod(), "GET" ); - buildAgentConfigurationServiceControl. - expectAndReturn( buildAgentConfigurationService.getWorkingDirectory( 1 ), getWorkingDirectory( 1 ) ); - requestControl.expectAndReturn( request.getDavSession(), new ContinuumBuildAgentDavSession() ); + when( request.getMethod() ).thenReturn( "GET" ); + when( buildAgentConfigurationService.getWorkingDirectory( 1 ) ).thenReturn( getWorkingDirectory( 1 ) ); + when( request.getDavSession() ).thenReturn( new ContinuumBuildAgentDavSession() ); - requestControl.replay(); - buildAgentConfigurationServiceControl.replay(); + DavResource resource = resourceFactory.createResource( locator, request, response ); - resourceFactory.createResource( locator, request, response ); - - requestControl.verify(); - buildAgentConfigurationServiceControl.verify(); + assertNotNull( resource ); + assertEquals( locator.getRepositoryPath(), locator.getRepositoryPath() ); } catch ( DavException e ) { @@ -130,18 +114,11 @@ public class ContinuumBuildAgentDavResou try { - requestControl.expectAndReturn( request.getMethod(), "GET", 1 ); - buildAgentConfigurationServiceControl. - expectAndReturn( buildAgentConfigurationService.getWorkingDirectory( 1 ), getWorkingDirectory( 1 ) ); - - requestControl.replay(); - buildAgentConfigurationServiceControl.replay(); + when( request.getMethod() ).thenReturn( "GET" ); + when( buildAgentConfigurationService.getWorkingDirectory( 1 ) ).thenReturn( getWorkingDirectory( 1 ) ); resourceFactory.createResource( locator, request, response ); - requestControl.verify(); - buildAgentConfigurationServiceControl.verify(); - fail( "A DavException with 404 error code should have been thrown." ); } catch ( DavException e ) Modified: continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavSessionProviderTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavSessionProviderTest.java?rev=1659094&r1=1659093&r2=1659094&view=diff ============================================================================== --- continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavSessionProviderTest.java (original) +++ continuum/trunk/continuum-buildagent/continuum-buildagent-webdav/src/test/java/org/apache/continuum/webdav/ContinuumBuildAgentDavSessionProviderTest.java Wed Feb 11 21:28:16 2015 @@ -25,7 +25,6 @@ import org.apache.jackrabbit.webdav.DavS import org.apache.jackrabbit.webdav.WebdavRequest; import org.apache.jackrabbit.webdav.WebdavRequestImpl; import org.codehaus.plexus.util.Base64; -import org.easymock.MockControl; import org.junit.Before; import org.junit.Test; @@ -45,6 +44,7 @@ import java.util.Map; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.*; public class ContinuumBuildAgentDavSessionProviderTest { @@ -52,26 +52,18 @@ public class ContinuumBuildAgentDavSessi private WebdavRequest request; - private MockControl buildAgentConfigurationServiceControl; - private BuildAgentConfigurationService buildAgentConfigurationService; @Before public void setUp() throws Exception { - buildAgentConfigurationServiceControl = MockControl.createControl( BuildAgentConfigurationService.class ); - buildAgentConfigurationService = - (BuildAgentConfigurationService) buildAgentConfigurationServiceControl.getMock(); + buildAgentConfigurationService = mock( BuildAgentConfigurationService.class ); sessionProvider = new ContinuumBuildAgentDavSessionProvider( buildAgentConfigurationService ); request = new WebdavRequestImpl( new HttpServletRequestMock(), null ); - buildAgentConfigurationServiceControl.expectAndReturn( buildAgentConfigurationService.getSharedSecretPassword(), - "secret", 2 ); - - buildAgentConfigurationServiceControl.replay(); - + when( buildAgentConfigurationService.getSharedSecretPassword() ).thenReturn( "secret" ); } @Test @@ -82,8 +74,6 @@ public class ContinuumBuildAgentDavSessi sessionProvider.attachSession( request ); - buildAgentConfigurationServiceControl.verify(); - assertNotNull( request.getDavSession() ); } @@ -95,8 +85,6 @@ public class ContinuumBuildAgentDavSessi sessionProvider.attachSession( request ); - buildAgentConfigurationServiceControl.verify(); - assertNotNull( request.getDavSession() ); sessionProvider.releaseSession( request ); Modified: continuum/trunk/pom.xml URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=1659094&r1=1659093&r2=1659094&view=diff ============================================================================== --- continuum/trunk/pom.xml (original) +++ continuum/trunk/pom.xml Wed Feb 11 21:28:16 2015 @@ -1573,18 +1573,6 @@ - easymock - easymock - 1.2_Java1.3 - test - - - easymock - easymockclassextension - 1.2 - test - - org.codehaus.plexus plexus-action 1.0-alpha-6