From: Mikhail Khorkov <mikhail.khorkov@jetbrains.com>
Date: Wed, 14 Nov 2018 08:34:36 +0000 (+0700)
Subject: TW-57802 Fix tests
X-Git-Url: https://git.jetbrains.org/?p=teamcity%2Fgit-plugin.git;a=commitdiff_plain;h=c29ce218db21f34ee7822118169f111b2327f60b;hp=c673928cc2a3762d711574fe40289f5e8fc48e2d

TW-57802 Fix tests
---

diff --git a/git-tests/src/jetbrains/buildServer/buildTriggers/vcs/git/tests/LoggingGitMetaFactory.java b/git-tests/src/jetbrains/buildServer/buildTriggers/vcs/git/tests/LoggingGitMetaFactory.java
index b6650163..c94cf270 100644
--- a/git-tests/src/jetbrains/buildServer/buildTriggers/vcs/git/tests/LoggingGitMetaFactory.java
+++ b/git-tests/src/jetbrains/buildServer/buildTriggers/vcs/git/tests/LoggingGitMetaFactory.java
@@ -58,8 +58,9 @@ public class LoggingGitMetaFactory implements GitMetaFactory {
       return 0;
     int result = 0;
     for (String method : methods) {
-      if ("call".equals(method))
+      if ("call".equals(method) || "callWithIgnoreExitCode".equals(method)) {
         result++;
+      }
     }
     return result;
   }
diff --git a/git-tests/src/jetbrains/buildServer/buildTriggers/vcs/git/tests/SSLInvestigatorTest.java b/git-tests/src/jetbrains/buildServer/buildTriggers/vcs/git/tests/SSLInvestigatorTest.java
index 87e3ce81..6550cbd2 100644
--- a/git-tests/src/jetbrains/buildServer/buildTriggers/vcs/git/tests/SSLInvestigatorTest.java
+++ b/git-tests/src/jetbrains/buildServer/buildTriggers/vcs/git/tests/SSLInvestigatorTest.java
@@ -136,10 +136,10 @@ public class SSLInvestigatorTest {
     }
 
     final String alreadyInProperties = alreadySet ? "something" : "";
-    myLoggingFactory.addCallback(GetConfigCommand.class.getName() + ".call",
-                                 (method, args) -> Optional.of(alreadyInProperties));
-    myLoggingFactory.addCallback(SetConfigCommand.class.getName() + ".call",
-                                 (method, args) -> Optional.empty());
+    final GitCommandProxyCallback gitCommandProxyCallback = (method, args) -> Optional.of(alreadyInProperties);
+    myLoggingFactory.addCallback(GetConfigCommand.class.getName() + ".call", gitCommandProxyCallback);
+    myLoggingFactory.addCallback(GetConfigCommand.class.getName() + ".callWithIgnoreExitCode", gitCommandProxyCallback);
+    myLoggingFactory.addCallback(SetConfigCommand.class.getName() + ".call", (method, args) -> Optional.empty());
 
     final SSLInvestigator instance = createInstance();