You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2019/04/13 11:22:50 UTC
[ignite-teamcity-bot] branch master updated: TC Bot tests fixed
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/master by this push:
new b546a3f TC Bot tests fixed
b546a3f is described below
commit b546a3ff07e43afac59b1c244840de2ec53adad4
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Sat Apr 13 14:22:45 2019 +0300
TC Bot tests fixed
---
.../java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java | 4 +---
.../java/org/apache/ignite/ci/web/model/current/UpdateInfo.java | 6 +++---
.../org/apache/ignite/ci/tcbot/chain/MockBasedTcBotModule.java | 9 ++++++---
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java
index 0fd6a0b..51f5266 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessor.java
@@ -104,13 +104,11 @@ public class PrChainsProcessor {
IAnalyticsEnabledTeamcity teamcity = tcSrvProvider.server(srvCode, creds);
ITeamcityIgnited tcIgnited = tcIgnitedProvider.server(srvCode, creds);
- IGitHubConnection gitHubConn = gitHubConnProvider.server(srvCode);
-
IGitHubConnIgnited gitHubConnIgnited = gitHubConnIgnitedProvider.server(srvCode);
IJiraIgnited jiraIntegration = jiraIgnProv.server(srvCode);
- res.setJavaFlags(teamcity, gitHubConn, jiraIntegration);
+ res.setJavaFlags(teamcity, gitHubConnIgnited, jiraIntegration);
LatestRebuildMode rebuild;
if (FullQueryParams.HISTORY.equals(act))
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/UpdateInfo.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/UpdateInfo.java
index 9d51e28..036fc87 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/UpdateInfo.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/UpdateInfo.java
@@ -18,9 +18,8 @@
package org.apache.ignite.ci.web.model.current;
import org.apache.ignite.ci.IAnalyticsEnabledTeamcity;
-import org.apache.ignite.ci.github.pure.IGitHubConnection;
+import org.apache.ignite.ci.github.ignited.IGitHubConnIgnited;
import org.apache.ignite.ci.jira.ignited.IJiraIgnited;
-import org.apache.ignite.ci.jira.pure.IJiraIntegration;
/**
*
@@ -58,7 +57,8 @@ import org.apache.ignite.ci.jira.pure.IJiraIntegration;
* @param jiraIntegration JIRA Integration
*/
public void setJavaFlags(IAnalyticsEnabledTeamcity teamcity,
- IGitHubConnection gitHubConn, IJiraIgnited jiraIntegration) {
+ IGitHubConnIgnited gitHubConn,
+ IJiraIgnited jiraIntegration) {
if (teamcity.isTeamCityTokenAvailable())
javaFlags |= TEAMCITY_FLAG;
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/MockBasedTcBotModule.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/MockBasedTcBotModule.java
index 0284b13..dea1ed8 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/MockBasedTcBotModule.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/MockBasedTcBotModule.java
@@ -77,7 +77,8 @@ public class MockBasedTcBotModule extends AbstractModule {
bind(IGitHubConnectionProvider.class).toInstance(ghProv);
when(ghProv.server(anyString())).thenReturn(Mockito.mock(IGitHubConnection.class));
- mockGitHub();
+ final IGitHubConfig ghCfg = mock(IGitHubConfig.class);
+ mockGitHub(ghCfg);
IJiraServerConfig jiraCfg = mock(IJiraServerConfig.class);
mockJira(jiraCfg);
@@ -110,7 +111,7 @@ public class MockBasedTcBotModule extends AbstractModule {
}
@Override public IGitHubConfig getGitConfig(String srvCode) {
- return new GitHubConfig().code(srvCode).properties(loadOldProps(srvCode));
+ return ghCfg;
}
private Properties loadOldProps(String srvCode) {
@@ -128,7 +129,7 @@ public class MockBasedTcBotModule extends AbstractModule {
super.configure();
}
- private void mockGitHub() {
+ private void mockGitHub(IGitHubConfig ghCfg) {
final IGitHubConnIgnitedProvider gitHubConnIgnitedProvider = Mockito.mock(IGitHubConnIgnitedProvider.class);
bind(IGitHubConnIgnitedProvider.class).toInstance(gitHubConnIgnitedProvider);
@@ -142,6 +143,8 @@ public class MockBasedTcBotModule extends AbstractModule {
when(gitHubConnIgnited.getPullRequest(anyInt())).thenReturn(pullReq);
when(gitHubConnIgnitedProvider.server(anyString())).thenReturn(gitHubConnIgnited);
+
+ when(gitHubConnIgnited.config()).thenReturn(ghCfg);
}
/**