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 2018/12/11 16:52:46 UTC
[ignite-teamcity-bot] branch master updated: IGNITE-10620 Issues
Storage interface added to make Unit Tests possible - Fixes #98.
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 6c87416 IGNITE-10620 Issues Storage interface added to make Unit Tests possible - Fixes #98.
6c87416 is described below
commit 6c8741640a10526367964000ef9d36c81f34be48
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Tue Dec 11 19:52:40 2018 +0300
IGNITE-10620 Issues Storage interface added to make Unit Tests possible - Fixes #98.
Signed-off-by: Dmitriy Pavlov <dp...@apache.org>
---
.../main/java/org/apache/ignite/ci/ITcHelper.java | 4 -
.../main/java/org/apache/ignite/ci/TcHelper.java | 12 --
.../org/apache/ignite/ci/conf/BranchesTracked.java | 5 +-
.../org/apache/ignite/ci/di/IgniteTcBotModule.java | 15 ++-
.../org/apache/ignite/ci/issue/IssuesStorage.java | 35 +++--
.../ci/tcbot/TcBotBusinessServicesModule.java | 40 ++++++
.../tcbot/chain/TrackedBranchChainsProcessor.java | 9 +-
.../apache/ignite/ci/tcbot/conf/ITcBotConfig.java | 45 +++++++
.../ci/tcbot/conf/LocalFilesBasedConfig.java | 30 +++++
.../ignite/ci/tcbot/issue/IIssuesStorage.java | 39 ++++++
.../ignite/ci/tcbot/issue/IssueDetector.java | 141 +++++++++++----------
.../apache/ignite/ci/tcbot/user/IUserStorage.java | 31 +++++
.../org/apache/ignite/ci/user/TcHelperUser.java | 4 +
.../ignite/ci/user/UserAndSessionsStorage.java | 10 +-
.../apache/ignite/ci/web/BackgroundUpdater.java | 8 +-
.../ignite/ci/web/rest/GetTrackedBranches.java | 3 +-
.../org/apache/ignite/ci/web/rest/login/Login.java | 4 +-
.../ignite/ci/web/rest/login/UserService.java | 8 +-
.../ci/tcbot/chain/MockBasedTcBotModule.java | 23 ++++
.../ci/tcbot/chain/PrChainsProcessorTest.java | 11 +-
.../ci/tcbot/chain/TrackedBranchProcessorTest.java | 103 ++++++++++++++-
.../ignite/ci/tcbot/issue/IssueDetectorTest.java | 51 ++++++--
22 files changed, 499 insertions(+), 132 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcHelper.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcHelper.java
index 27fd269..ba70533 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcHelper.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITcHelper.java
@@ -47,10 +47,6 @@ public interface ITcHelper extends ITcServerProvider {
String primaryServerId();
- Collection<String> getServerIds();
-
- List<String> getTrackedBranchesIds();
-
/** */
void setServerAuthorizerCreds(ICredentialsProv creds);
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
index a845409..c293e91 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/TcHelper.java
@@ -125,18 +125,6 @@ public class TcHelper implements ITcHelper {
return "apache"; //todo remove
}
- //todo get from persistence
- @Override public Collection<String> getServerIds() {
- return getTrackedBranches().getServerIds();
- }
-
- private BranchesTracked getTrackedBranches() {
- return HelperConfig.getTrackedBranches();
- }
-
- @Override public List<String> getTrackedBranchesIds() {
- return getTrackedBranches().getIds();
- }
/** {@inheritDoc} */
@Override public Visa notifyJira(
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/BranchesTracked.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/BranchesTracked.java
index 94d1b25..8dc92d0 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/BranchesTracked.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/conf/BranchesTracked.java
@@ -27,7 +27,6 @@ public class BranchesTracked {
/** Branches. */
private List<BranchTracked> branches = new ArrayList<>();
-
/**
* @return list of internal identifiers of branch.
*/
@@ -57,4 +56,8 @@ public class BranchesTracked {
public List<BranchTracked> getBranches() {
return Collections.unmodifiableList(branches);
}
+
+ public void addBranch(BranchTracked branch) {
+ branches.add(branch);
+ }
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/IgniteTcBotModule.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/IgniteTcBotModule.java
index b9eb2b8..bbb68ec 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/IgniteTcBotModule.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/di/IgniteTcBotModule.java
@@ -21,10 +21,6 @@ import com.google.inject.AbstractModule;
import com.google.inject.Injector;
import com.google.inject.internal.SingletonScope;
import com.google.inject.matcher.Matchers;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import javax.inject.Provider;
import org.apache.ignite.Ignite;
import org.apache.ignite.ci.ITcHelper;
import org.apache.ignite.ci.TcHelper;
@@ -32,11 +28,11 @@ import org.apache.ignite.ci.db.Ignite1Init;
import org.apache.ignite.ci.di.cache.GuavaCachedModule;
import org.apache.ignite.ci.di.scheduler.SchedulerModule;
import org.apache.ignite.ci.github.ignited.GitHubIgnitedModule;
-import org.apache.ignite.ci.tcbot.issue.IssueDetector;
import org.apache.ignite.ci.jira.JiraIntegrationModule;
import org.apache.ignite.ci.observer.BuildObserver;
import org.apache.ignite.ci.observer.ObserverTask;
-import org.apache.ignite.ci.tcbot.trends.MasterTrendsService;
+import org.apache.ignite.ci.tcbot.TcBotBusinessServicesModule;
+import org.apache.ignite.ci.tcbot.issue.IssueDetector;
import org.apache.ignite.ci.teamcity.ignited.TeamcityIgnitedModule;
import org.apache.ignite.ci.util.ExceptionUtil;
import org.apache.ignite.ci.web.BackgroundUpdater;
@@ -44,6 +40,11 @@ import org.apache.ignite.ci.web.TcUpdatePool;
import org.apache.ignite.ci.web.model.hist.VisasHistoryStorage;
import org.apache.ignite.ci.web.rest.exception.ServiceStartingException;
+import javax.inject.Provider;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
/**
*
*/
@@ -78,12 +79,12 @@ public class IgniteTcBotModule extends AbstractModule {
bind(VisasHistoryStorage.class).in(new SingletonScope());
bind(ITcHelper.class).to(TcHelper.class).in(new SingletonScope());
bind(BackgroundUpdater.class).in(new SingletonScope());
- bind(MasterTrendsService.class).in(new SingletonScope());
install(new TeamcityIgnitedModule());
install(new JiraIntegrationModule());
install(new GitHubIgnitedModule());
install(new SchedulerModule());
+ install(new TcBotBusinessServicesModule());
}
private void configProfiling() {
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssuesStorage.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssuesStorage.java
index d542709..ef0a243 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssuesStorage.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/issue/IssuesStorage.java
@@ -17,18 +17,19 @@
package org.apache.ignite.ci.issue;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCache;
-
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
import javax.cache.Cache;
import javax.inject.Inject;
import javax.inject.Provider;
-import java.util.ArrayList;
-import java.util.List;
-
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
import org.apache.ignite.ci.db.TcHelperDb;
+import org.apache.ignite.ci.tcbot.issue.IIssuesStorage;
-public class IssuesStorage {
+public class IssuesStorage implements IIssuesStorage {
public static final String BOT_DETECTED_ISSUES = "botDetectedIssues";
@Inject
@@ -37,7 +38,7 @@ public class IssuesStorage {
public IssuesStorage() {
}
- public IgniteCache<IssueKey, Issue> cache() {
+ private IgniteCache<IssueKey, Issue> cache() {
return botDetectedIssuesCache(getIgnite());
}
@@ -62,7 +63,8 @@ public class IssuesStorage {
return res;
}
- public boolean needNotify(IssueKey issueKey, String to) {
+ /** {@inheritDoc} */
+ @Override public boolean setNotified(IssueKey issueKey, String to) {
Issue issue = cache().get(issueKey);
if (issue == null)
return false;
@@ -74,4 +76,19 @@ public class IssuesStorage {
return add;
}
+
+ /** {@inheritDoc} */
+ @Override public boolean containsIssueKey(IssueKey issueKey) {
+ return cache().containsKey(issueKey);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void saveIssue(Issue issue) {
+ cache().put(issue.issueKey(), issue);
+ }
+
+ /** {@inheritDoc} */
+ @Override public Stream<Issue> allIssues() {
+ return StreamSupport.stream(cache().spliterator(), false).map(Cache.Entry::getValue);
+ }
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/TcBotBusinessServicesModule.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/TcBotBusinessServicesModule.java
new file mode 100644
index 0000000..cca872c
--- /dev/null
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/TcBotBusinessServicesModule.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ignite.ci.tcbot;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.internal.SingletonScope;
+import org.apache.ignite.ci.issue.IssuesStorage;
+import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
+import org.apache.ignite.ci.tcbot.conf.LocalFilesBasedConfig;
+import org.apache.ignite.ci.tcbot.issue.IIssuesStorage;
+import org.apache.ignite.ci.tcbot.trends.MasterTrendsService;
+import org.apache.ignite.ci.tcbot.user.IUserStorage;
+import org.apache.ignite.ci.user.UserAndSessionsStorage;
+
+/**
+ * TC Bot self services mapping (without 3rd party integrations configuration.
+ */
+public class TcBotBusinessServicesModule extends AbstractModule {
+ @Override
+ protected void configure() {
+ bind(ITcBotConfig.class).to(LocalFilesBasedConfig.class).in(new SingletonScope());
+ bind(IUserStorage.class).to(UserAndSessionsStorage.class).in(new SingletonScope());
+ bind(IIssuesStorage.class).to(IssuesStorage.class).in(new SingletonScope());
+ bind(MasterTrendsService.class).in(new SingletonScope());
+ }
+}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java
index fc9cf12..c90710a 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java
@@ -16,6 +16,7 @@
*/
package org.apache.ignite.ci.tcbot.chain;
+import com.google.common.base.Preconditions;
import java.util.Comparator;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@@ -27,6 +28,7 @@ import org.apache.ignite.ci.analysis.mode.LatestRebuildMode;
import org.apache.ignite.ci.analysis.mode.ProcessLogsMode;
import org.apache.ignite.ci.conf.BranchTracked;
import org.apache.ignite.ci.di.AutoProfiling;
+import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnited;
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnitedProvider;
import org.apache.ignite.ci.teamcity.ignited.SyncMode;
@@ -47,8 +49,13 @@ import static com.google.common.base.Strings.isNullOrEmpty;
public class TrackedBranchChainsProcessor {
/** TC Server prov. */
@Inject private ITcServerProvider srvProv;
+
+ /** TC ignited server provider. */
@Inject private ITeamcityIgnitedProvider tcIgnitedProv;
+ /** Tc Bot config. */
+ @Inject private ITcBotConfig tcBotConfig;
+
/** Chains processor. */
@Inject private BuildChainProcessor chainProc;
@@ -63,7 +70,7 @@ public class TrackedBranchChainsProcessor {
final AtomicInteger runningUpdates = new AtomicInteger();
final String branchNn = isNullOrEmpty(branch) ? FullQueryParams.DEFAULT_TRACKED_BRANCH_NAME : branch;
- final BranchTracked tracked = HelperConfig.getTrackedBranches().getBranchMandatory(branchNn);
+ final BranchTracked tracked = tcBotConfig.getTrackedBranches().getBranchMandatory(branchNn);
res.setTrackedBranch(branchNn);
tracked.chains.stream()
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/ITcBotConfig.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/ITcBotConfig.java
new file mode 100644
index 0000000..f5cf726
--- /dev/null
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/ITcBotConfig.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ignite.ci.tcbot.conf;
+
+import java.util.Collection;
+import java.util.List;
+import org.apache.ignite.ci.conf.BranchesTracked;
+
+/**
+ * Teamcity Bot configuration access inteface.
+ */
+public interface ITcBotConfig {
+ /**
+ * @return Tracked branches configuration for TC Bot.
+ */
+ public BranchesTracked getTrackedBranches();
+
+ /**
+ * @return list of internal TC Bot identifiers of all tracked branches.
+ */
+ public default List<String> getTrackedBranchesIds() {
+ return getTrackedBranches().getIds();
+ }
+
+ /**
+ * @return list of servers (services) identifiers involved into tracked branhes processing.
+ */
+ public default Collection<String> getServerIds() {
+ return getTrackedBranches().getServerIds();
+ }
+}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/LocalFilesBasedConfig.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/LocalFilesBasedConfig.java
new file mode 100644
index 0000000..f39ff47
--- /dev/null
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/conf/LocalFilesBasedConfig.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ignite.ci.tcbot.conf;
+
+import org.apache.ignite.ci.HelperConfig;
+import org.apache.ignite.ci.conf.BranchesTracked;
+
+/**
+ *
+ */
+public class LocalFilesBasedConfig implements ITcBotConfig {
+ /** {@inheritDoc} */
+ @Override public BranchesTracked getTrackedBranches() {
+ return HelperConfig.getTrackedBranches();
+ }
+}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/issue/IIssuesStorage.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/issue/IIssuesStorage.java
new file mode 100644
index 0000000..cd2772e
--- /dev/null
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/issue/IIssuesStorage.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ci.tcbot.issue;
+
+import java.util.stream.Stream;
+import org.apache.ignite.ci.issue.Issue;
+import org.apache.ignite.ci.issue.IssueKey;
+
+public interface IIssuesStorage {
+ /**
+ * Determines if the storage contains an entry for the specified issue key.
+ *
+ * @param issueKey Issue to be checked.
+ *
+ * @return true if issue
+ */
+ public boolean containsIssueKey(IssueKey issueKey);
+
+ void saveIssue(Issue issue);
+
+ Stream<Issue> allIssues();
+
+ boolean setNotified(IssueKey key, String addr);
+}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/issue/IssueDetector.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/issue/IssueDetector.java
index 1d20936..be26ec3 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/issue/IssueDetector.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/issue/IssueDetector.java
@@ -17,8 +17,8 @@
package org.apache.ignite.ci.tcbot.issue;
+import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
-
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
@@ -26,22 +26,31 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Function;
-import javax.cache.Cache;
import javax.inject.Inject;
import javax.inject.Provider;
-
import org.apache.ignite.ci.HelperConfig;
import org.apache.ignite.ci.IAnalyticsEnabledTeamcity;
-import org.apache.ignite.ci.ITcHelper;
import org.apache.ignite.ci.ITeamcity;
+import org.apache.ignite.ci.analysis.SuiteInBranch;
+import org.apache.ignite.ci.analysis.TestInBranch;
+import org.apache.ignite.ci.di.AutoProfiling;
+import org.apache.ignite.ci.di.MonitoredTask;
import org.apache.ignite.ci.issue.EventTemplate;
import org.apache.ignite.ci.issue.EventTemplates;
import org.apache.ignite.ci.issue.Issue;
import org.apache.ignite.ci.issue.IssueKey;
-import org.apache.ignite.ci.issue.IssuesStorage;
+import org.apache.ignite.ci.jobs.CheckQueueJob;
+import org.apache.ignite.ci.mail.EmailSender;
+import org.apache.ignite.ci.mail.SlackSender;
+import org.apache.ignite.ci.tcbot.chain.TrackedBranchChainsProcessor;
+import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
+import org.apache.ignite.ci.tcbot.user.IUserStorage;
import org.apache.ignite.ci.teamcity.ignited.IRunHistory;
import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnited;
@@ -49,17 +58,8 @@ import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnitedProvider;
import org.apache.ignite.ci.teamcity.ignited.change.ChangeCompacted;
import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildCompacted;
import org.apache.ignite.ci.teamcity.restcached.ITcServerProvider;
-import org.apache.ignite.ci.analysis.SuiteInBranch;
-import org.apache.ignite.ci.analysis.TestInBranch;
-import org.apache.ignite.ci.tcbot.chain.TrackedBranchChainsProcessor;
-import org.apache.ignite.ci.di.AutoProfiling;
-import org.apache.ignite.ci.di.MonitoredTask;
-import org.apache.ignite.ci.jobs.CheckQueueJob;
-import org.apache.ignite.ci.mail.EmailSender;
-import org.apache.ignite.ci.mail.SlackSender;
import org.apache.ignite.ci.user.ICredentialsProv;
import org.apache.ignite.ci.user.TcHelperUser;
-import org.apache.ignite.ci.user.UserAndSessionsStorage;
import org.apache.ignite.ci.web.model.current.ChainAtServerCurrentStatus;
import org.apache.ignite.ci.web.model.current.SuiteCurrentStatus;
import org.apache.ignite.ci.web.model.current.TestFailure;
@@ -80,8 +80,8 @@ public class IssueDetector {
/**Slack prefix, using this for email address will switch notifier to slack (if configured). */
private static final String SLACK = "slack:";
- @Inject private IssuesStorage issuesStorage;
- @Inject private UserAndSessionsStorage userStorage;
+ @Inject private IIssuesStorage issuesStorage;
+ @Inject private IUserStorage userStorage;
private final AtomicBoolean init = new AtomicBoolean();
private ICredentialsProv backgroundOpsCreds;
@@ -93,17 +93,18 @@ public class IssueDetector {
/** Tracked Branch Processor. */
@Inject private TrackedBranchChainsProcessor tbProc;
- /** Tc helper. */
- @Inject private ITcHelper tcHelper;
-
/** Server provider. */
@Inject private ITcServerProvider srvProvider;
/** Server provider. */
@Inject private ITeamcityIgnitedProvider tcProv;
+ /** String Compactor. */
@Inject private IStringCompactor compactor;
+ /** Config. */
+ @Inject private ITcBotConfig cfg;
+
/** Send notification guard. */
private final AtomicBoolean sndNotificationGuard = new AtomicBoolean();
@@ -140,56 +141,55 @@ public class IssueDetector {
@AutoProfiling
@MonitoredTask(name = "Send Notifications")
protected String sendNewNotificationsEx() throws IOException {
- Collection<TcHelperUser> userForPossibleNotifications = new ArrayList<>();
+ List<TcHelperUser> userForPossibleNotifications = new ArrayList<>();
- for(Cache.Entry<String, TcHelperUser> entry : userStorage.users()) {
- TcHelperUser tcHelperUser = entry.getValue();
-
- if (Strings.isNullOrEmpty(tcHelperUser.email))
- continue;
-
- if(tcHelperUser.hasSubscriptions())
- userForPossibleNotifications.add(tcHelperUser);
- }
+ userStorage.allUsers()
+ .filter(TcHelperUser::hasEmail)
+ .filter(TcHelperUser::hasSubscriptions)
+ .forEach(userForPossibleNotifications::add);
String slackCh = HelperConfig.loadEmailSettings().getProperty(HelperConfig.SLACK_CHANNEL);
+
Map<String, Notification> toBeSent = new HashMap<>();
- int issuesChecked = 0;
- for (Issue issue : issuesStorage.all()) {
- issuesChecked++;
- long detected = issue.detectedTs == null ? 0 : issue.detectedTs;
- long issueAgeMs = System.currentTimeMillis() - detected;
- if (issueAgeMs > TimeUnit.HOURS.toMillis(2))
- continue;
+ AtomicInteger issuesChecked = new AtomicInteger();
- List<String> addrs = new ArrayList<>();
+ issuesStorage.allIssues()
+ .peek(issue -> issuesChecked.incrementAndGet())
+ .filter(issue -> {
+ long detected = issue.detectedTs == null ? 0 : issue.detectedTs;
+ long issueAgeMs = System.currentTimeMillis() - detected;
- if (slackCh != null && FullQueryParams.DEFAULT_TRACKED_BRANCH_NAME.equals(issue.trackedBranchName))
- addrs.add(SLACK + "#" + slackCh);
+ return issueAgeMs <= TimeUnit.HOURS.toMillis(2);
+ })
+ .forEach(issue -> {
+ List<String> addrs = new ArrayList<>();
- for (TcHelperUser next : userForPossibleNotifications) {
- if (next.getCredentials(issue.issueKey().server) != null) {
- if (next.isSubscribed(issue.trackedBranchName)) {
- logger.info("User " + next + " is candidate for notification " + next.email
- + " for " + issue);
+ if (slackCh != null && FullQueryParams.DEFAULT_TRACKED_BRANCH_NAME.equals(issue.trackedBranchName))
+ addrs.add(SLACK + "#" + slackCh);
- addrs.add(next.email);
+ for (TcHelperUser next : userForPossibleNotifications) {
+ if (next.getCredentials(issue.issueKey().server) != null) {
+ if (next.isSubscribed(issue.trackedBranchName)) {
+ logger.info("User " + next + " is candidate for notification " + next.email
+ + " for " + issue);
+
+ addrs.add(next.email);
+ }
}
}
- }
- for (String nextAddr : addrs) {
- if (issuesStorage.needNotify(issue.issueKey, nextAddr)) {
- toBeSent.computeIfAbsent(nextAddr, addr -> {
- Notification notification = new Notification();
- notification.ts = System.currentTimeMillis();
- notification.addr = addr;
- return notification;
- }).addIssue(issue);
+ for (String nextAddr : addrs) {
+ if (issuesStorage.setNotified(issue.issueKey, nextAddr)) {
+ toBeSent.computeIfAbsent(nextAddr, addr -> {
+ Notification notification = new Notification();
+ notification.ts = System.currentTimeMillis();
+ notification.addr = addr;
+ return notification;
+ }).addIssue(issue);
+ }
}
- }
- }
+ });
if(toBeSent.isEmpty())
return "Noting to notify, " + issuesChecked + " issues checked";
@@ -218,7 +218,7 @@ public class IssueDetector {
}
}
- return res + ", " + issuesChecked + "issues checked";
+ return res + ", " + issuesChecked.get() + "issues checked";
}
/**
@@ -286,7 +286,7 @@ public class IssueDetector {
if (firstFailedBuildId != null && suiteFailure.hasCriticalProblem != null && suiteFailure.hasCriticalProblem) {
IssueKey issueKey = new IssueKey(srvId, firstFailedBuildId, suiteId);
- if (issuesStorage.cache().containsKey(issueKey))
+ if (issuesStorage.containsIssueKey(issueKey))
return false; //duplicate
Issue issue = new Issue(issueKey);
@@ -299,7 +299,7 @@ public class IssueDetector {
logger.info("Register new issue for suite fail: " + issue);
- issuesStorage.cache().put(issueKey, issue);
+ issuesStorage.saveIssue(issue);
issueFound = true;
}
@@ -371,7 +371,7 @@ public class IssueDetector {
IssueKey issueKey = new IssueKey(srvId, buildId, name);
- if (issuesStorage.cache().containsKey(issueKey))
+ if (issuesStorage.containsIssueKey(issueKey))
return false; //duplicate
Issue issue = new Issue(issueKey);
@@ -384,7 +384,7 @@ public class IssueDetector {
logger.info("Register new issue for test fail: " + issue);
- issuesStorage.cache().put(issueKey, issue);
+ issuesStorage.saveIssue(issue);
return true;
}
@@ -426,7 +426,7 @@ public class IssueDetector {
*
*/
private void checkFailures() {
- List<String> ids = tcHelper.getTrackedBranchesIds();
+ List<String> ids = cfg.getTrackedBranchesIds();
for (Iterator<String> iter = ids.iterator(); iter.hasNext(); ) {
String tbranchName = iter.next();
@@ -453,15 +453,20 @@ public class IssueDetector {
protected String checkFailuresEx(String brachName) {
int buildsToQry = EventTemplates.templates.stream().mapToInt(EventTemplate::cntEvents).max().getAsInt();
- TestFailuresSummary allHist = tbProc.getTrackedBranchTestFailures(brachName,
- false, buildsToQry, backgroundOpsCreds);
+ ICredentialsProv creds = Preconditions.checkNotNull(backgroundOpsCreds, "Server should be authorized");
+
+ TestFailuresSummary allHist = tbProc.getTrackedBranchTestFailures(
+ brachName,
+ false,
+ buildsToQry,
+ creds);
TestFailuresSummary failures =
- tbProc.getTrackedBranchTestFailures(brachName,
+ tbProc.getTrackedBranchTestFailures(brachName,
false,
1,
- backgroundOpsCreds
- );
+ creds
+ );
String issResult = registerIssuesAndNotifyLater(failures, backgroundOpsCreds);
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/user/IUserStorage.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/user/IUserStorage.java
new file mode 100644
index 0000000..9b87d8c
--- /dev/null
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/user/IUserStorage.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.ignite.ci.tcbot.user;
+
+import org.apache.ignite.ci.user.TcHelperUser;
+
+import java.util.stream.Stream;
+
+/**
+ * Teamcity Bot User and Sessions storage interface.
+ */
+public interface IUserStorage {
+ /**
+ * @return All users in storage stream.
+ */
+ public Stream<TcHelperUser> allUsers();
+}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/user/TcHelperUser.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/user/TcHelperUser.java
index 36e16b1..db73bfd 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/user/TcHelperUser.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/user/TcHelperUser.java
@@ -142,6 +142,10 @@ public class TcHelperUser implements IVersionedEntity {
return subscribedToAllFailures!=null && !subscribedToAllFailures.isEmpty();
}
+ public boolean hasEmail() {
+ return !Strings.isNullOrEmpty(email);
+ }
+
public static class Credentials {
String serverId;
String username;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/user/UserAndSessionsStorage.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/user/UserAndSessionsStorage.java
index 069b6a3..3312c2b 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/user/UserAndSessionsStorage.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/user/UserAndSessionsStorage.java
@@ -20,12 +20,16 @@ package org.apache.ignite.ci.user;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.ci.db.TcHelperDb;
+import org.apache.ignite.ci.tcbot.user.IUserStorage;
import org.jetbrains.annotations.Nullable;
+import javax.cache.Cache;
import javax.inject.Inject;
import javax.inject.Provider;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
-public class UserAndSessionsStorage {
+public class UserAndSessionsStorage implements IUserStorage {
public static final String USERS = "users";
public static final String USER_SESSIONS = "sessions";
@Inject
@@ -68,4 +72,8 @@ public class UserAndSessionsStorage {
users().put(username, user);
}
+ /** {@inheritDoc} */
+ @Override public Stream<TcHelperUser> allUsers() {
+ return StreamSupport.stream(users().spliterator(), false).map(Cache.Entry::getValue);
+ }
}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/BackgroundUpdater.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/BackgroundUpdater.java
index 585ef87..b029600 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/BackgroundUpdater.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/BackgroundUpdater.java
@@ -28,9 +28,9 @@ import java.util.concurrent.Future;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
-import org.apache.ignite.ci.ITcHelper;
import org.apache.ignite.ci.IgnitePersistentTeamcity;
import org.apache.ignite.ci.analysis.Expirable;
+import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
import org.apache.ignite.ci.user.ICredentialsProv;
import org.apache.ignite.ci.util.ExceptionUtil;
import org.apache.ignite.internal.util.typedef.T2;
@@ -79,8 +79,8 @@ public class BackgroundUpdater {
return thread;
});
- /** Tc helper. */
- @Inject private ITcHelper tcHelper;
+ /** Config. */
+ @Inject private ITcBotConfig cfg;
/**
@@ -90,7 +90,7 @@ public class BackgroundUpdater {
StringBuffer sb = new StringBuffer();
sb.append("[");
- tcHelper.getServerIds()
+ cfg.getServerIds()
.stream()
.filter(prov::hasAccess)
.forEach(s -> sb.append(s).append(" "));
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/GetTrackedBranches.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/GetTrackedBranches.java
index 3bff0ac..6b547ba 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/GetTrackedBranches.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/GetTrackedBranches.java
@@ -31,6 +31,7 @@ import javax.ws.rs.core.MediaType;
import org.apache.ignite.ci.HelperConfig;
import org.apache.ignite.ci.conf.ChainAtServer;
import org.apache.ignite.ci.tcbot.TcBotGeneralService;
+import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
import org.apache.ignite.ci.user.ICredentialsProv;
import org.apache.ignite.ci.web.CtxListener;
import org.apache.ignite.ci.web.model.Version;
@@ -59,7 +60,7 @@ public class GetTrackedBranches {
@GET
@Path("getIds")
public List<String> getIds() {
- return CtxListener.getTcHelper(ctx).getTrackedBranchesIds();
+ return CtxListener.getInjector(ctx).getInstance(ITcBotConfig.class).getTrackedBranchesIds();
}
@GET
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/Login.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/Login.java
index 7b29353..2e21e67 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/Login.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/Login.java
@@ -21,6 +21,7 @@ import com.google.common.base.Preconditions;
import com.google.inject.Injector;
import org.apache.ignite.ci.IAnalyticsEnabledTeamcity;
import org.apache.ignite.ci.ITcHelper;
+import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
import org.apache.ignite.ci.tcmodel.user.User;
import org.apache.ignite.ci.teamcity.pure.ITcLogin;
import org.apache.ignite.ci.user.TcHelperUser;
@@ -71,6 +72,7 @@ public class Login {
ITcHelper tcHelper = CtxListener.getTcHelper(ctx);
final Injector injector = CtxListener.getInjector(ctx);
+ ITcBotConfig cfg = injector.getInstance(ITcBotConfig.class);
final ITcLogin tcLogin = injector.getInstance(ITcLogin.class);
UserAndSessionsStorage users = tcHelper.users();
@@ -78,7 +80,7 @@ public class Login {
try {
return doLogin(username, pwd, users, primarySrvId,
- tcHelper.getServerIds(), tcLogin);
+ cfg.getServerIds(), tcLogin);
} catch (Exception e) {
e.printStackTrace();
throw e;
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/UserService.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/UserService.java
index 0b6e12a..596710a 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/UserService.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/login/UserService.java
@@ -32,6 +32,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.Form;
import javax.ws.rs.core.MediaType;
import org.apache.ignite.ci.ITcHelper;
+import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
import org.apache.ignite.ci.tcbot.issue.IssueDetector;
import org.apache.ignite.ci.tcbot.visa.TcBotTriggerAndSignOffService;
import org.apache.ignite.ci.tcmodel.user.User;
@@ -106,10 +107,13 @@ public class UserService {
public TcHelperUserUi getUserData(@Nullable @QueryParam("login") final String loginParm) {
final String currUserLogin = ICredentialsProv.get(req).getPrincipalId();
final String login = Strings.isNullOrEmpty(loginParm) ? currUserLogin : loginParm;
- ITcHelper helper = CtxListener.getTcHelper(ctx);
+ Injector injector = CtxListener.getInjector(ctx);
+ ITcBotConfig cfg = injector.getInstance(ITcBotConfig.class);
+
+ ITcHelper helper = injector.getInstance(ITcHelper.class);
final TcHelperUser user = helper.users().getUser(login);
- final TcHelperUserUi tcHelperUserUi = new TcHelperUserUi(user, helper.getTrackedBranchesIds());
+ final TcHelperUserUi tcHelperUserUi = new TcHelperUserUi(user, cfg.getTrackedBranchesIds());
//if principal is not null, can do only brief check of credentials.
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 960674e..26c9340 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
@@ -20,6 +20,7 @@ package org.apache.ignite.ci.tcbot.chain;
import com.google.inject.AbstractModule;
import com.google.inject.internal.SingletonScope;
import org.apache.ignite.ci.IAnalyticsEnabledTeamcity;
+import org.apache.ignite.ci.conf.BranchesTracked;
import org.apache.ignite.ci.github.PullRequest;
import org.apache.ignite.ci.github.ignited.IGitHubConnIgnited;
import org.apache.ignite.ci.github.ignited.IGitHubConnIgnitedProvider;
@@ -27,6 +28,9 @@ import org.apache.ignite.ci.github.pure.IGitHubConnection;
import org.apache.ignite.ci.github.pure.IGitHubConnectionProvider;
import org.apache.ignite.ci.jira.IJiraIntegration;
import org.apache.ignite.ci.jira.IJiraIntegrationProvider;
+import org.apache.ignite.ci.tcbot.conf.ITcBotConfig;
+import org.apache.ignite.ci.tcbot.issue.IIssuesStorage;
+import org.apache.ignite.ci.tcbot.user.IUserStorage;
import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnitedProvider;
import org.apache.ignite.ci.teamcity.ignited.InMemoryStringCompactor;
@@ -44,6 +48,16 @@ import static org.mockito.Mockito.when;
* - TC: {@link TeamcityIgnitedProviderMock}
*/
public class MockBasedTcBotModule extends AbstractModule {
+ private BranchesTracked tracked = new BranchesTracked();
+
+ public MockBasedTcBotModule(BranchesTracked tracked) {
+ this.tracked = tracked;
+ }
+
+ public MockBasedTcBotModule() {
+
+ }
+
/** {@inheritDoc} */
@Override protected void configure() {
bind(IStringCompactor.class).to(InMemoryStringCompactor.class).in(new SingletonScope());
@@ -81,6 +95,15 @@ public class MockBasedTcBotModule extends AbstractModule {
bind(ITcServerProvider.class).toInstance(tcSrvOldProv);
+ bind(ITcBotConfig.class).toInstance(new ITcBotConfig() {
+ @Override public BranchesTracked getTrackedBranches() {
+ return tracked;
+ }
+ });
+
+ bind(IIssuesStorage.class).toInstance(Mockito.mock(IIssuesStorage.class));
+ bind(IUserStorage.class).toInstance(Mockito.mock(IUserStorage.class));
+
super.configure();
}
}
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java
index 92545d8..03a7786 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java
@@ -215,7 +215,7 @@ public class PrChainsProcessorTest {
*
* @param c Compactor.
*/
- public void initHistory(IStringCompactor c) {
+ public Map<Integer, FatBuildCompacted> initHistory(IStringCompactor c) {
for (int i = 0; i < NUM_OF_TESTS_IN_MASTER; i++) {
FatBuildCompacted cache1InMaster = createFailedBuild(c, CACHE_1,
ITeamcity.DEFAULT, 500 + i, 100000 + (i * 10000))
@@ -274,6 +274,8 @@ public class PrChainsProcessorTest {
addBuildsToEmulatedStor(fatBuild);
}
+
+ return apacheBuilds();
}
/**
@@ -366,7 +368,7 @@ public class PrChainsProcessorTest {
return createTest(id, name, true);
}
- @NotNull private TestOccurrenceFull createTest(long id, String name, boolean passed) {
+ @NotNull public static TestOccurrenceFull createTest(long id, String name, boolean passed) {
TestOccurrenceFull tf = new TestOccurrenceFull();
tf.test = new TestRef();
@@ -382,7 +384,8 @@ public class PrChainsProcessorTest {
return createFatBuild(c, btId, branch, id, ageMs, false);
}
- @NotNull public FatBuildCompacted createFatBuild(IStringCompactor c, String btId, String branch, int id, long ageMs,
+ @NotNull public static FatBuildCompacted createFatBuild(IStringCompactor c, String btId, String branch, int id,
+ long ageMs,
boolean passed) {
final Build build = createJaxbBuild(btId, branch, id, ageMs, passed);
@@ -390,7 +393,7 @@ public class PrChainsProcessorTest {
}
@NotNull
- private Build createJaxbBuild(String btId, String branch, int id, long ageMs, boolean passed) {
+ private static Build createJaxbBuild(String btId, String branch, int id, long ageMs, boolean passed) {
final Build build = new Build();
build.buildTypeId = btId;
final BuildType type = new BuildType();
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchProcessorTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchProcessorTest.java
index b67cfaa..0035621 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchProcessorTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchProcessorTest.java
@@ -17,33 +17,59 @@
package org.apache.ignite.ci.tcbot.chain;
+import com.google.common.collect.Lists;
import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
import com.google.inject.Guice;
import com.google.inject.Injector;
import java.util.Map;
+import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.ignite.ci.ITeamcity;
+import org.apache.ignite.ci.conf.BranchTracked;
+import org.apache.ignite.ci.conf.BranchesTracked;
+import org.apache.ignite.ci.conf.ChainAtServerTracked;
+import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnitedProvider;
import org.apache.ignite.ci.teamcity.ignited.TeamcityIgnitedProviderMock;
import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildCompacted;
import org.apache.ignite.ci.user.ICredentialsProv;
+import org.apache.ignite.ci.web.model.current.ChainAtServerCurrentStatus;
+import org.apache.ignite.ci.web.model.current.SuiteCurrentStatus;
+import org.apache.ignite.ci.web.model.current.TestFailure;
import org.apache.ignite.ci.web.model.current.TestFailuresSummary;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
import org.junit.Test;
+import static org.apache.ignite.ci.tcbot.chain.PrChainsProcessorTest.CACHE_9;
+import static org.apache.ignite.ci.tcbot.chain.PrChainsProcessorTest.TEST_RARE_FAILED_WITHOUT_CHANGES;
+import static org.apache.ignite.ci.tcbot.chain.PrChainsProcessorTest.TEST_RARE_FAILED_WITH_CHANGES;
+import static org.apache.ignite.ci.tcbot.chain.PrChainsProcessorTest.createFatBuild;
+import static org.apache.ignite.ci.tcbot.chain.PrChainsProcessorTest.createTest;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
/**
* Tests {@link TrackedBranchChainsProcessor}
*/
public class TrackedBranchProcessorTest {
- public static final String SRV_ID = "apache";
+ public static final String SRV_ID = "apacheTest";
+ public static final String BRACH_NAME = "trackedMaster";
/** Builds emulated storage. */
private Map<Integer, FatBuildCompacted> apacheBuilds = new ConcurrentHashMap<>();
+ /** Branches tracked. */
+ private BranchesTracked branchesTracked = new BranchesTracked();
/**
* Injector.
*/
- private Injector injector = Guice.createInjector(new MockBasedTcBotModule());
+ private Injector injector = Guice.createInjector(new MockBasedTcBotModule(branchesTracked));
/** */
@Before
@@ -52,19 +78,84 @@ public class TrackedBranchProcessorTest {
instance.addServer(SRV_ID, apacheBuilds);
}
+ @NotNull public ChainAtServerTracked trackedChain(String suiteId) {
+ ChainAtServerTracked chain = new ChainAtServerTracked();
+
+ chain.serverId = SRV_ID;
+ chain.branchForRest = ITeamcity.DEFAULT;
+ chain.suiteId = suiteId;
+ return chain;
+ }
+
@Test
public void testTrackedBranchChainsProcessor() {
+ BranchTracked branch = new BranchTracked();
+ branch.id = BRACH_NAME;
+ branch.chains.add(trackedChain(CACHE_9));
+ branchesTracked.addBranch(branch);
+
+ IStringCompactor c = injector.getInstance(IStringCompactor.class);
+
+ apacheBuilds.putAll(new PrChainsProcessorTest().initHistory(c));
+
+ int buildCnt = 101;
+ FatBuildCompacted fatBuild = createFatBuild(c, CACHE_9, ITeamcity.DEFAULT, buildCnt + 9999, 1340020, false)
+ .addTests(c,
+ Lists.newArrayList(
+ createTest(1L, TEST_RARE_FAILED_WITHOUT_CHANGES, false),
+ createTest(2L, TEST_RARE_FAILED_WITH_CHANGES, false)));
+
+ fatBuild.changes(new int[] {1000000 + buildCnt, 1000020 + buildCnt});
+
+ apacheBuilds.put(fatBuild.id(), fatBuild);
+
TrackedBranchChainsProcessor tbProc = injector.getInstance(TrackedBranchChainsProcessor.class);
- String brachName = "master"; //todo https://issues.apache.org/jira/browse/IGNITE-10620 use separate branch e.g. masterForTests
- TestFailuresSummary failures = tbProc.getTrackedBranchTestFailures(brachName,
+ ICredentialsProv mock = mock(ICredentialsProv.class);
+ when(mock.hasAccess(anyString())).thenReturn(true);
+ TestFailuresSummary failures = tbProc.getTrackedBranchTestFailures(BRACH_NAME,
false,
1,
- mock(ICredentialsProv.class)
+ mock
);
- System.out.println(new Gson().toJson(failures));
+ Gson gson = new GsonBuilder().setPrettyPrinting().create();
+ System.out.println(gson.toJson(failures));
+
+ assertFalse(failures.servers.isEmpty());
+
+ ChainAtServerCurrentStatus apacheSrv = failures.servers.get(0);
+
+ assertTrue(apacheSrv.failedTests > 0);
+
+ assertFalse(apacheSrv.suites.isEmpty());
+
+ Optional<SuiteCurrentStatus> cache9 = findSuite(apacheSrv, CACHE_9);
+ assertTrue(cache9.isPresent());
+
+ SuiteCurrentStatus suiteFails = cache9.get();
+ assertFalse(suiteFails.testFailures.isEmpty());
+
+ Optional<TestFailure> tfOpt = findTestFailure(suiteFails, TEST_RARE_FAILED_WITH_CHANGES);
+ assertTrue(tfOpt.isPresent());
+ assertNull(tfOpt.get().histBaseBranch.flakyComments);
+ assertNull(tfOpt.get().problemRef);
+
+ Optional<TestFailure> tfFlakyOpt = findTestFailure(suiteFails, TEST_RARE_FAILED_WITHOUT_CHANGES);
+ assertTrue(tfFlakyOpt.isPresent());
+ assertNotNull(tfFlakyOpt.get().histBaseBranch.flakyComments);
+
+ assertNull(tfFlakyOpt.get().problemRef);
+ }
+
+ public Optional<SuiteCurrentStatus> findSuite(ChainAtServerCurrentStatus apacheSrv, String suiteName) {
+ return apacheSrv.suites.stream().filter(s -> {
+ return s.name.contains(suiteName);
+ }).findAny();
+ }
+ public Optional<TestFailure> findTestFailure(SuiteCurrentStatus suiteFails, String name) {
+ return suiteFails.testFailures.stream().filter(tf -> tf.name.equals(name)) .findAny();
}
}
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java
index 0037691..abf772c 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/issue/IssueDetectorTest.java
@@ -21,26 +21,42 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.ignite.ci.ITeamcity;
+import org.apache.ignite.ci.conf.BranchTracked;
+import org.apache.ignite.ci.conf.BranchesTracked;
+import org.apache.ignite.ci.conf.ChainAtServerTracked;
import org.apache.ignite.ci.tcbot.chain.MockBasedTcBotModule;
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnitedProvider;
+import org.apache.ignite.ci.teamcity.ignited.TeamcityIgnitedImpl;
import org.apache.ignite.ci.teamcity.ignited.TeamcityIgnitedProviderMock;
import org.apache.ignite.ci.teamcity.ignited.fatbuild.FatBuildCompacted;
+import org.apache.ignite.ci.user.ICredentialsProv;
+import org.apache.ignite.ci.web.rest.parms.FullQueryParams;
+import org.jetbrains.annotations.NotNull;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
/**
*
*/
public class IssueDetectorTest {
+ /** Server id. */
public static final String SRV_ID = "apache";
+
/** Builds emulated storage. */
private Map<Integer, FatBuildCompacted> apacheBuilds = new ConcurrentHashMap<>();
+
+ /** Config Branches tracked. */
+ private BranchesTracked branchesTracked = new BranchesTracked();
/**
* Injector.
*/
- private Injector injector = Guice.createInjector(new MockBasedTcBotModule());
+ private Injector injector = Guice.createInjector(new MockBasedTcBotModule(branchesTracked));
/** */
@Before
@@ -49,24 +65,37 @@ public class IssueDetectorTest {
instance.addServer(SRV_ID, apacheBuilds);
}
+ @NotNull public ChainAtServerTracked trackedChain(String suiteId) {
+ ChainAtServerTracked chain = new ChainAtServerTracked();
+
+ chain.serverId = SRV_ID;
+ chain.branchForRest = ITeamcity.DEFAULT;
+ chain.suiteId = suiteId;
+
+ return chain;
+ }
+
+
@Test
- @Ignore
public void testDetector() {
+ BranchTracked branch = new BranchTracked();
+ branch.id = FullQueryParams.DEFAULT_TRACKED_BRANCH_NAME;
+ branch.chains.add(trackedChain(TeamcityIgnitedImpl.DEFAULT_PROJECT_ID));
+ branchesTracked.addBranch(branch);
+
IssueDetector issueDetector = injector.getInstance(IssueDetector.class);
+ ICredentialsProv mock = mock(ICredentialsProv.class);
+ when(mock.hasAccess(anyString())).thenReturn(true);
+ issueDetector.startBackgroundCheck(mock);
+
String masterStatus = issueDetector.checkFailuresEx("master");
System.out.println(masterStatus);
- /* todo: https://issues.apache.org/jira/browse/IGNITE-10620 implement users/issue test only storeages
- 1) No implementation for org.apache.ignite.Ignite was bound.
- while locating com.google.inject.Provider<org.apache.ignite.Ignite>
- for field at org.apache.ignite.ci.issue.IssuesStorage.igniteProvider(IssuesStorage.java:37)
+ /* todo: https://issues.apache.org/jira/browse/IGNITE-10620
-2) No implementation for org.apache.ignite.ci.ITcHelper was bound.
- while locating org.apache.ignite.ci.ITcHelper
+ - Add examples of failed tests into history, validate notifications originated.
-3) No implementation for org.apache.ignite.Ignite was bound.
- while locating com.google.inject.Provider<org.apache.ignite.Ignite>
*/
}