Mercurial > hg > mercurial
changeset 310:7bb3cf4e18f8
Use jmock-2.x
author | Dmitry Neverov <dmitry.neverov@jetbrains.com> |
---|---|
date | Wed, 14 Sep 2011 15:17:57 +0400 |
parents | 33305b2022c2 |
children | 7f45db81af21 |
files | mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BaseMercurialTestCase.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/Util.java |
diffstat | 3 files changed, 24 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BaseMercurialTestCase.java Wed Sep 14 15:00:30 2011 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BaseMercurialTestCase.java Wed Sep 14 15:17:57 2011 +0400 @@ -15,7 +15,6 @@ */ package jetbrains.buildServer.buildTriggers.vcs.mercurial; -import jetbrains.buildServer.MockSupport; import jetbrains.buildServer.TempFiles; import jetbrains.buildServer.vcs.impl.VcsRootImpl; import jetbrains.buildServer.vcs.patches.PatchTestCase; @@ -32,21 +31,16 @@ */ public abstract class BaseMercurialTestCase extends PatchTestCase { protected TempFiles myTempFiles; - protected MockSupport myMockSupport; @Override @BeforeMethod protected void setUp() throws Exception { super.setUp(); - - myMockSupport = new MockSupport(); - myMockSupport.setUpMocks(); myTempFiles = new TempFiles(); } @AfterMethod protected void tearDown() throws Exception { - myMockSupport.tearDownMocks(); myTempFiles.cleanup(); }
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Wed Sep 14 15:00:30 2011 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/MercurialVcsSupportTest.java Wed Sep 14 15:17:57 2011 +0400 @@ -19,16 +19,12 @@ import jetbrains.buildServer.ExecResult; import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandUtil; import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.Settings; -import jetbrains.buildServer.serverSide.BuildServerListener; -import jetbrains.buildServer.serverSide.SBuildServer; -import jetbrains.buildServer.serverSide.ServerPaths; -import jetbrains.buildServer.util.EventDispatcher; import jetbrains.buildServer.vcs.*; import jetbrains.buildServer.vcs.impl.VcsRootImpl; import jetbrains.buildServer.vcs.patches.PatchBuilderImpl; import junit.framework.Assert; import org.jetbrains.annotations.NotNull; -import org.jmock.Mock; +import org.jmock.Mockery; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -37,8 +33,6 @@ import java.io.FilenameFilter; import java.io.IOException; import java.util.*; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; @Test public class MercurialVcsSupportTest extends BaseMercurialTestCase { @@ -50,20 +44,12 @@ @BeforeMethod protected void setUp() throws Exception { super.setUp(); - - Mock vcsManagerMock = new Mock(VcsManager.class); - vcsManagerMock.stubs().method("registerVcsSupport"); - Mock serverMock = new Mock(SBuildServer.class); - ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(); - serverMock.stubs().method("getExecutor").will(myMockSupport.returnValue(executor)); - - EventDispatcher<BuildServerListener> dispatcher = EventDispatcher.create(BuildServerListener.class); - + Mockery context = new Mockery(); myPluginConfig = new ServerPluginConfigBuilder() .cachesDir(myTempFiles.createTempDir()) .pluginDataDir(myTempFiles.createTempDir()) .build(); - myVcs = new MercurialVcsSupport((VcsManager)vcsManagerMock.proxy(), (SBuildServer)serverMock.proxy(), dispatcher, myPluginConfig, new ServerHgPathProvider(myPluginConfig), new CommandFactory(myPluginConfig)); + myVcs = Util.createMercurialServerSupport(context, myPluginConfig); } protected String getTestDataPath() {
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/Util.java Wed Sep 14 15:00:30 2011 +0400 +++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/Util.java Wed Sep 14 15:17:57 2011 +0400 @@ -1,7 +1,17 @@ package jetbrains.buildServer.buildTriggers.vcs.mercurial; +import jetbrains.buildServer.serverSide.BuildServerListener; +import jetbrains.buildServer.serverSide.SBuildServer; +import jetbrains.buildServer.util.EventDispatcher; +import jetbrains.buildServer.vcs.VcsManager; +import org.jetbrains.annotations.NotNull; +import org.jmock.Expectations; +import org.jmock.Mockery; + import java.io.File; import java.io.IOException; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; /** * @author dmitry.neverov @@ -19,4 +29,15 @@ } } + + public static MercurialVcsSupport createMercurialServerSupport(@NotNull Mockery context, ServerPluginConfig config) throws IOException { + VcsManager vcsManager = context.mock(VcsManager.class); + final SBuildServer server = context.mock(SBuildServer.class); + final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(); + context.checking(new Expectations() {{ + allowing(server).getExecutor(); will(returnValue(executor)); + }}); + EventDispatcher<BuildServerListener> dispatcher = EventDispatcher.create(BuildServerListener.class); + return new MercurialVcsSupport(vcsManager, server, dispatcher, config, new ServerHgPathProvider(config), new CommandFactory(config)); + } }