Skip to content

Commit

Permalink
Revert "Highlight newly added tests in TC bot visa (#158)"
Browse files Browse the repository at this point in the history
  • Loading branch information
@glukos
glukos committed May 8, 2020
1 parent 12a535e commit 173e4b7
Show file tree
Hide file tree
Showing 11 changed files with 8 additions and 424 deletions.
3 changes: 0 additions & 3 deletions ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/TcBotWebAppModule.java
View file
Expand Up @@ -44,8 +44,6 @@
import org.apache.ignite.tcbot.persistence.TcBotPersistenceModule;
import org.apache.ignite.tcbot.persistence.scheduler.SchedulerModule;
import org.apache.ignite.tcignited.TeamcityIgnitedModule;
import org.apache.ignite.tcservice.ITeamcityConn;
import org.apache.ignite.tcservice.TeamcityServiceConnection;

/**
*
Expand All @@ -72,7 +70,6 @@ public class TcBotWebAppModule extends AbstractModule {
}
});

bind(ITeamcityConn.class).toInstance(new TeamcityServiceConnection());
bind(TcUpdatePool.class).in(new SingletonScope());
bind(IssueDetector.class).in(new SingletonScope());
bind(ObserverTask.class).in(new SingletonScope());
Expand Down
84 changes: 3 additions & 81 deletions ...lper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/TcBotTriggerAndSignOffService.java
View file
Expand Up @@ -69,9 +69,7 @@
import org.apache.ignite.tcbot.engine.pr.BranchTicketMatcher;
import org.apache.ignite.tcbot.engine.pr.PrChainsProcessor;
import org.apache.ignite.tcbot.engine.ui.ShortSuiteUi;
import org.apache.ignite.tcbot.engine.ui.ShortSuiteNewTestsUi;
import org.apache.ignite.tcbot.engine.ui.ShortTestFailureUi;
import org.apache.ignite.tcbot.engine.ui.ShortTestUi;
import org.apache.ignite.tcbot.persistence.IStringCompactor;
import org.apache.ignite.tcignited.ITeamcityIgnited;
import org.apache.ignite.tcignited.ITeamcityIgnitedProvider;
Expand Down Expand Up @@ -830,17 +828,13 @@ public Visa notifyJira(
SyncMode.RELOAD_QUEUED,
baseBranch);

List<ShortSuiteNewTestsUi> newTestsStatuses = prChainsProcessor.getNewTestsSuitesStatuses(buildTypeId, build.branchName, srvCodeOrAlias, prov,
SyncMode.RELOAD_QUEUED,
baseBranch);

if (suitesStatuses == null)
return new Visa("JIRA wasn't commented - no finished builds to analyze." +
" Check builds availabiliy for branch: " + build.branchName + "/" + baseBranch);

blockers = suitesStatuses.stream().mapToInt(ShortSuiteUi::totalBlockers).sum();

String comment = generateJiraComment(suitesStatuses, newTestsStatuses, build.webUrl, buildTypeId, tcIgnited, blockers, build.branchName, baseBranch);
String comment = generateJiraComment(suitesStatuses, build.webUrl, buildTypeId, tcIgnited, blockers, build.branchName, baseBranch);


res = objMapper.readValue(jira.postJiraComment(ticket, comment), JiraCommentResponse.class);
Expand All @@ -867,7 +861,7 @@ public Visa notifyJira(
* @param baseBranch TC Base branch used for comment
* @return Comment, which should be sent to the JIRA ticket.
*/
private String generateJiraComment(List<ShortSuiteUi> suites, List<ShortSuiteNewTestsUi> newTestsStatuses, String webUrl, String buildTypeId,
private String generateJiraComment(List<ShortSuiteUi> suites, String webUrl, String buildTypeId,
ITeamcityIgnited tcIgnited, int blockers, String branchName, String baseBranch) {
BuildTypeRefCompacted bt = tcIgnited.getBuildTypeRef(buildTypeId);

Expand Down Expand Up @@ -915,61 +909,6 @@ private String generateJiraComment(List<ShortSuiteUi> suites, List<ShortSuiteNew
res.append("\\n");
}

StringBuilder newTests = new StringBuilder();

int newTestsCount = 0;

int failedNewTestsCount = 0;

for (ShortSuiteNewTestsUi suite : newTestsStatuses) {
newTests.append("{color:#00008b}");

newTests.append(jiraEscText(suite.name)).append("{color}");

int totalNewTests = suite.tests.size();
newTests.append(" [tests ").append(totalNewTests);

int cnt = 0;

newTestsCount += suite.tests().size();

newTests.append("]\\n");

for (ShortTestUi test : suite.tests()) {
String testColor;
if (test.status)
testColor = "#013220";
else {
testColor = "#8b0000";
failedNewTestsCount++;
}

newTests.append("* ");

newTests.append(String.format("{color:%s}", testColor));

if (test.suiteName != null && test.testName != null)
newTests.append(jiraEscText(test.suiteName)).append(": ").append(jiraEscText(test.testName));
else
newTests.append(jiraEscText(test.name));

newTests.append(" - ").append(jiraEscText(test.status ? "PASSED" : "FAILED"));

newTests.append("{color}");

newTests.append("\\n");

cnt++;
if (cnt > 10) {
newTests.append("... and ").append(totalNewTests - cnt).append(" tests blockers\\n");

break;
}
}

newTests.append("\\n");
}

String suiteNameForComment = jiraEscText(suiteNameUsedForVisa);

String branchNameForComment = jiraEscText("Branch: [" + branchName + "] ");
Expand All @@ -989,24 +928,7 @@ private String generateJiraComment(List<ShortSuiteUi> suites, List<ShortSuiteNew
.append("borderStyle=dashed|borderColor=#ccc|titleBGColor=#D6F7C1}{panel}");
}

if (newTests.length() > 0) {
String bgColor;
if (failedNewTestsCount > 0)
bgColor = "#F7D6C1";
else
bgColor = "#D6F7C1";
String hdrPanel = "{panel:title=" + branchVsBaseComment + ": New Tests (" + newTestsCount + ")|" +
"borderStyle=dashed|borderColor=#ccc|titleBGColor=" + bgColor + "}\\n";

newTests.insert(0, hdrPanel)
.append("{panel}");
}
else {
newTests.append("{panel:title=").append(branchVsBaseComment).append(": No new tests found!|")
.append("borderStyle=dashed|borderColor=#ccc|titleBGColor=#F7D6C1}{panel}");
}

res.append("\\n").append(newTests).append("\\n").append("[TeamCity *").append(suiteNameForComment).append("* Results|").append(webUrl).append(']');
res.append("\\n").append("[TeamCity *").append(suiteNameForComment).append("* Results|").append(webUrl).append(']');

return xmlEscapeText(res.toString());
}
Expand Down
49 changes: 3 additions & 46 deletions ignite-tc-helper-web/src/main/webapp/js/testfails-2.2.js
View file
Expand Up @@ -83,57 +83,11 @@ function showChainResultsWithSettings(result, settings) {
res += showChainCurrentStatusData(server, settings);
}

res += "<tr bgcolor='#F5F5FF'><th colspan='4' class='table-title'><b>New Tests</b></th></tr>"

for (var i = 0; i < result.servers.length; i++) {
var newTests = result.servers[i].newTestsUi;
res += showNewTestsData(newTests, settings);
}

res += "<tr><td colspan='4'>&nbsp;</td></tr>";
res += "</table>";

setTimeout(initMoreInfo, 100);

return res;
}

/**
* @param chain - see org.apache.ignite.ci.web.model.current.ChainAtServerCurrentStatus Java Class.
* @param settings - see Settings JavaScript class.
*/
function showNewTestsData(chain, settings) {
var res = "";

newTestRows = "";

res += "<table style='width:100%'>";

for (var i = 0; i < chain.length; i++) {
var newTests = chain[i].tests;
for (var j = 0; j < newTests.length; j++) {
newTestsFounded = true
var newTest = newTests[j];
testColor = newTest.status ? "#013220" : "#8b0000";
newTestRows += "<tr style='color:" + testColor + "'>";
newTestRows += "<td colspan='2' width='10%'></td>";
newTestRows += "<td width='5%'>" + (newTest.status ? "PASSED" : "FAILED") + "</td>";
if (isDefinedAndFilled(newTest.suiteName) && isDefinedAndFilled(newTest.testName))
newTestRows += "<td width='75%'>" + newTest.suiteName + ": " + newTest.testName + "</td>";
else
newTestRows += "<td width='75%'>" + newTest.name + "</td>";
newTestRows += "<td colspan='2' width='10%'></td>";
newTestRows += "</tr>";
}
}

res += newTestRows !== "" ? newTestRows : "<tr><td colspan='2' width='10%'></td><td width='90%'>No new tests</td></tr>"

res += "</table>";

return res;

}

/**
* @param chain - see org.apache.ignite.ci.web.model.current.ChainAtServerCurrentStatus Java Class.
Expand Down Expand Up @@ -366,6 +320,9 @@ function showChainCurrentStatusData(chain, settings) {
res += showSuiteData(subSuite, settings, chain.prNum);
}

res += "<tr><td colspan='4'>&nbsp;</td></tr>";
res += "</table>";

return res;
}

Expand Down
3 changes: 0 additions & 3 deletions ...te-tc-helper-web/src/test/java/org/apache/ignite/ci/tcbot/chain/MockBasedTcBotModule.java
View file
Expand Up @@ -50,7 +50,6 @@
import org.apache.ignite.tcbot.common.conf.IDataSourcesConfigSupplier;
import org.apache.ignite.tcbot.common.conf.TcBotWorkDir;
import org.apache.ignite.tcignited.buildlog.IBuildLogProcessor;
import org.apache.ignite.tcservice.ITeamcityConn;
import org.mockito.Mockito;

import static org.mockito.ArgumentMatchers.any;
Expand Down Expand Up @@ -79,8 +78,6 @@ public MockBasedTcBotModule() {

bind(IBuildLogProcessor.class).toInstance(Mockito.mock(IBuildLogProcessor.class));

bind(ITeamcityConn.class).toInstance(Mockito.mock(ITeamcityConn.class));

final IGitHubConnectionProvider ghProv = Mockito.mock(IGitHubConnectionProvider.class);
bind(IGitHubConnectionProvider.class).toInstance(ghProv);
when(ghProv.server(anyString())).thenReturn(Mockito.mock(IGitHubConnection.class));
Expand Down
10 changes: 1 addition & 9 deletions tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/chain/TestCompactedMult.java
View file
Expand Up @@ -64,15 +64,7 @@ public static void resetCached() {
public String getName() {
return occurrences.isEmpty() ? "" : occurrences.iterator().next().testName(compactor);
}

public Long getId() {
return occurrences.isEmpty() ? 0 : occurrences.iterator().next().getTestId();
}

public boolean isPassed() {
return occurrences.get(occurrences.size()-1).status() == STATUS_SUCCESS_CID;
}


public boolean isInvestigated() {
return occurrences.stream().anyMatch(ITest::isInvestigated);
}
Expand Down

0 comments on commit 173e4b7

Please sign in to comment.