# HG changeset patch
# User Dmitry Neverov <dmitry.neverov@jetbrains.com>
# Date 1330938516 -14400
# Node ID 5a26330117bc1e9d4c4e54b5194c8070c1cdb6d7
# Parent  0b0a9c0ced8fbcbc94f2b63f613047ccbd04bd80# Parent  aa016c34fede1bf98274c09c3f30d281cee9e55d
Merge branch Faradi-7.0.x

diff -r 0b0a9c0ced8f -r 5a26330117bc mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/UnrelatedResitoriesTest.java
--- a/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/UnrelatedResitoriesTest.java	Fri Mar 02 15:33:14 2012 +0400
+++ b/mercurial-tests/src/jetbrains/buildServer/buildTriggers/vcs/mercurial/UnrelatedResitoriesTest.java	Mon Mar 05 13:08:36 2012 +0400
@@ -8,7 +8,6 @@
 import jetbrains.buildServer.vcs.VcsException;
 import jetbrains.buildServer.vcs.impl.VcsRootImpl;
 import org.jetbrains.annotations.NotNull;
-import org.jmock.Expectations;
 import org.jmock.Mockery;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -68,16 +67,7 @@
 
 
   public void should_return_no_changes_when_fromRevision_is_from_unrelated_repository() throws Exception {
-//    final CommandFactory factory = myContext.mock(CommandFactory.class);
-//    final CollectChangesCommand commandExecutedWithException = myContext.mock(CollectChangesCommand.class);
     myVcs = createVcs();
-    myContext.checking(new Expectations(){{
-//      allowing(factory).getCollectChangesCommand(with(any(Settings.class)), with(any(File.class)));
-//      will(returnValue(commandExecutedWithException));
-//      allowing(commandExecutedWithException).call(with(any(String.class)), with(any(String.class)));
-//      will(throwException(new UnknownRevisionException("1234")));
-    }});
-
     String currentVersionOfOldRepo = syncRepository();
     repositoryBecamesUnrelated();
     String currentVersionOfNewRepo = syncRepository();
@@ -101,8 +91,4 @@
   private MercurialVcsSupport createVcs() throws IOException {
     return Util.createMercurialServerSupport(myContext, myPluginConfig);
   }
-
-//  private MercurialVcsSupport createVcs(/*@NotNull final CommandFactory factory*/) throws IOException {
-//    return Util.createMercurialServerSupport(myContext, myPluginConfig, new CommandFactoryImpl(myPluginConfig));
-//  }
 }