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 b67b298 IGNITE-10568 Replace type for test id from long to String -
Fixes #91.
b67b298 is described below
commit b67b298be77112d5f3fb39c81ba23d9f9517e065
Author: Dmitrii Ryabov <[email protected]>
AuthorDate: Thu Dec 6 14:26:56 2018 +0300
IGNITE-10568 Replace type for test id from long to String - Fixes #91.
Signed-off-by: Dmitriy Pavlov <[email protected]>
---
.../main/java/org/apache/ignite/ci/tcmodel/result/tests/TestRef.java | 2 +-
.../org/apache/ignite/ci/teamcity/ignited/fatbuild/TestCompacted.java | 4 ++--
.../main/java/org/apache/ignite/ci/web/model/current/TestFailure.java | 4 +++-
.../java/org/apache/ignite/ci/tcbot/chain/PrChainsProcessorTest.java | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/result/tests/TestRef.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/result/tests/TestRef.java
index 76f6a13..9752963 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/result/tests/TestRef.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcmodel/result/tests/TestRef.java
@@ -26,6 +26,6 @@ import org.apache.ignite.ci.tcmodel.result.AbstractRef;
*/
@XmlRootElement(name = "test")
public class TestRef extends AbstractRef {
- @XmlAttribute public Long id;
+ @XmlAttribute public String id;
@XmlAttribute public String name;
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/TestCompacted.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/TestCompacted.java
index d7b1a99..d03f9f1 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/TestCompacted.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/fatbuild/TestCompacted.java
@@ -111,7 +111,7 @@ public class TestCompacted {
actualBuildId = testOccurrence.build.getId();
if (testOccurrence.test != null && testOccurrence.test.id != null)
- testId = testOccurrence.test.id;
+ testId = Long.valueOf(testOccurrence.test.id);
setDetails(testOccurrence.details);
}
@@ -166,7 +166,7 @@ public class TestCompacted {
if (testId != 0) {
TestRef test = new TestRef();
- test.id = testId;
+ test.id = String.valueOf(testId);
occurrence.test = test;
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/TestFailure.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/TestFailure.java
index 9748911..cf24ebe 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/TestFailure.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/current/TestFailure.java
@@ -174,11 +174,13 @@ import static
org.apache.ignite.ci.web.model.current.SuiteCurrentStatus.branchFo
}
}
- private static String buildWebLink(ITeamcityIgnited tcIgn, Long id,
+ private static String buildWebLink(ITeamcityIgnited tcIgn, String id,
@Nullable String projectId, @Nullable String branchName) {
if (projectId == null)
return null;
+
final String branch = branchForLink(branchName);
+
return tcIgn.host() + "project.html"
+ "?projectId=" + projectId
+ "&testNameId=" + id
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 453f88f..6b99340 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
@@ -295,7 +295,7 @@ public class PrChainsProcessorTest {
tf.test = new TestRef();
- tf.test.id = id;
+ tf.test.id = String.valueOf(id);
tf.name = name;
tf.status = passed ? TestOccurrence.STATUS_SUCCESS :
TestOccurrence.STATUS_FAILURE;
return tf;