Mercurial > hg > mercurial

changeset 892:c28e68e22272

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix tests to support flow logger
author Dmitry Neverov <dmitry.neverov@jetbrains.com>
date Fri, 07 Nov 2014 16:04:52 +0100
parents d1a5fc6c1d6e
children 1558f8257474
files mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentMirrorCleanerTest.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutTest.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutWithSharedMirrorsTest.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutWithSubreposTest.java mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BaseAgentSideCheckoutTestCase.java
diffstat 5 files changed, 25 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentMirrorCleanerTest.java	Fri Nov 07 14:55:14 2014 +0100
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentMirrorCleanerTest.java	Fri Nov 07 16:04:52 2014 +0100
@@ -69,10 +69,13 @@
     AgentRepoFactory repoFactory = new AgentRepoFactory(pluginConfig, new CommandSettingsForRootImpl(new TestCommandSettingsFactory(), new ExtensionsWeaver(), new CommandlineViaFileWrapperWeaver()), new AgentHgPathProvider(agentConfig));
     myVcsSupport = new MercurialAgentSideVcsSupport(pluginConfig, myMirrorManager, repoFactory, new MercurialExtensionManager());
     myCleaner = new AgentMirrorCleaner(myMirrorManager);
-    myLogger = myContext.mock(BuildProgressLogger.class);
+    myLogger = myContext.mock(FlowLogger.class);
     myContext.checking(new Expectations() {{
       allowing(myLogger).message(with(any(String.class)));
       allowing(myLogger).warning(with(any(String.class)));
+      allowing(myLogger).activityStarted(with(any(String.class)), with(any(String.class)));
+      allowing(myLogger).activityFinished(with(any(String.class)), with(any(String.class)));
+      allowing(myLogger).getFlowLogger(with(any(String.class))); will(returnValue(myLogger));
     }});
   }
 
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutTest.java	Fri Nov 07 14:55:14 2014 +0100
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutTest.java	Fri Nov 07 16:04:52 2014 +0100
@@ -18,6 +18,7 @@
 import jetbrains.buildServer.agent.AgentRunningBuild;
 import jetbrains.buildServer.agent.BuildAgentConfiguration;
 import jetbrains.buildServer.agent.BuildProgressLogger;
+import jetbrains.buildServer.agent.FlowLogger;
 import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandSettingsForRootImpl;
 import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandlineViaFileWrapperWeaver;
 import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.ExtensionsWeaver;
@@ -82,9 +83,13 @@
             new AgentRepoFactory(pluginConfig, new CommandSettingsForRootImpl(new TestCommandSettingsFactory(), new ExtensionsWeaver(), new CommandlineViaFileWrapperWeaver()), new AgentHgPathProvider(agentConfig)),
             new MercurialExtensionManager());
 
-    myLogger = myContext.mock(BuildProgressLogger.class);
+    myLogger = myContext.mock(FlowLogger.class);
     myContext.checking(new Expectations() {{
       allowing(myLogger).message(with(any(String.class)));
+      allowing(myLogger).getFlowLogger(with(any(String.class))); will(returnValue(myLogger));
+      allowing(myLogger).activityStarted(with(any(String.class)), with(any(String.class)));
+      allowing(myLogger).activityFinished(with(any(String.class)), with(any(String.class)));
+      allowing(myLogger).getFlowLogger(with(any(String.class))); will(returnValue(myLogger));
     }});
 
     myWorkDir = myTempFiles.createTempDir();
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutWithSharedMirrorsTest.java	Fri Nov 07 14:55:14 2014 +0100
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutWithSharedMirrorsTest.java	Fri Nov 07 16:04:52 2014 +0100
@@ -19,6 +19,7 @@
 import jetbrains.buildServer.agent.AgentRunningBuild;
 import jetbrains.buildServer.agent.BuildAgentConfiguration;
 import jetbrains.buildServer.agent.BuildProgressLogger;
+import jetbrains.buildServer.agent.FlowLogger;
 import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandSettingsForRootImpl;
 import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandlineViaFileWrapperWeaver;
 import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.ExtensionsWeaver;
@@ -78,9 +79,12 @@
                     new CommandlineViaFileWrapperWeaver()), new AgentHgPathProvider(agentConfig)),
             new MercurialExtensionManager());
 
-    myLogger = myContext.mock(BuildProgressLogger.class);
+    myLogger = myContext.mock(FlowLogger.class);
     myContext.checking(new Expectations() {{
       allowing(myLogger).message(with(any(String.class)));
+      allowing(myLogger).activityStarted(with(any(String.class)), with(any(String.class)));
+      allowing(myLogger).activityFinished(with(any(String.class)), with(any(String.class)));
+      allowing(myLogger).getFlowLogger(with(any(String.class))); will(returnValue(myLogger));
     }});
 
     myWorkDir = myTempFiles.createTempDir();
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutWithSubreposTest.java	Fri Nov 07 14:55:14 2014 +0100
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/AgentSideCheckoutWithSubreposTest.java	Fri Nov 07 16:04:52 2014 +0100
@@ -19,6 +19,7 @@
 import jetbrains.buildServer.agent.AgentRunningBuild;
 import jetbrains.buildServer.agent.BuildAgentConfiguration;
 import jetbrains.buildServer.agent.BuildProgressLogger;
+import jetbrains.buildServer.agent.FlowLogger;
 import jetbrains.buildServer.agent.vcs.UpdateByIncludeRules2;
 import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.*;
 import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.exception.ConnectionRefusedException;
@@ -87,10 +88,13 @@
                     new AgentHgPathProvider(agentConfig)),
             new MercurialExtensionManager());
 
-    myLogger = myContext.mock(BuildProgressLogger.class);
+    myLogger = myContext.mock(FlowLogger.class);
     myContext.checking(new Expectations() {{
       allowing(myLogger).message(with(any(String.class)));
       allowing(myLogger).warning(with(any(String.class)));
+      allowing(myLogger).activityStarted(with(any(String.class)), with(any(String.class)));
+      allowing(myLogger).activityFinished(with(any(String.class)), with(any(String.class)));
+      allowing(myLogger).getFlowLogger(with(any(String.class))); will(returnValue(myLogger));
     }});
   }
 
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BaseAgentSideCheckoutTestCase.java	Fri Nov 07 14:55:14 2014 +0100
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/BaseAgentSideCheckoutTestCase.java	Fri Nov 07 16:04:52 2014 +0100
@@ -19,6 +19,7 @@
 import jetbrains.buildServer.agent.AgentRunningBuild;
 import jetbrains.buildServer.agent.BuildAgentConfiguration;
 import jetbrains.buildServer.agent.BuildProgressLogger;
+import jetbrains.buildServer.agent.FlowLogger;
 import jetbrains.buildServer.agent.vcs.UpdateByIncludeRules2;
 import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandSettingsForRootImpl;
 import jetbrains.buildServer.buildTriggers.vcs.mercurial.command.CommandlineViaFileWrapperWeaver;
@@ -64,10 +65,13 @@
     myVcsSupport = new MercurialAgentSideVcsSupport(pluginConfig, mirrorManager, new AgentRepoFactory(pluginConfig, commandSettingsFactory, new AgentHgPathProvider(agentConfig)),
             new MercurialExtensionManager());
 
-    myLogger = myContext.mock(BuildProgressLogger.class);
+    myLogger = myContext.mock(FlowLogger.class);
     myContext.checking(new Expectations() {{
       allowing(myLogger).message(with(any(String.class)));
       allowing(myLogger).warning(with(any(String.class)));
+      allowing(myLogger).activityStarted(with(any(String.class)), with(any(String.class)));
+      allowing(myLogger).activityFinished(with(any(String.class)), with(any(String.class)));
+      allowing(myLogger).getFlowLogger(with(any(String.class))); will(returnValue(myLogger));
     }});
 
     myWorkDir = myTempFiles.createTempDir();