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/03/15 17:35:01 UTC
[ignite-teamcity-bot] 01/02: VCS changes state extracted to be
standalone class.
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
commit 0d652d04957e052efb4c219699a284176248ef5f
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Fri Mar 15 19:48:39 2019 +0300
VCS changes state extracted to be standalone class.
---
.../org/apache/ignite/ci/analysis/RunStat.java | 11 +--------
.../ci/teamcity/ignited/runhist/ChangesState.java | 27 ++++++++++++++++++++++
.../ci/teamcity/ignited/runhist/Invocation.java | 19 ++++++++++-----
.../teamcity/ignited/runhist/RunHistCompacted.java | 4 ++--
.../ignite/ci/issue/DetectingFailureTest.java | 5 ++--
5 files changed, 46 insertions(+), 20 deletions(-)
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/RunStat.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/RunStat.java
index d8dd61c..5d388eb 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/RunStat.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/analysis/RunStat.java
@@ -33,6 +33,7 @@ import org.apache.ignite.ci.issue.EventTemplate;
import org.apache.ignite.ci.tcmodel.result.Build;
import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrence;
import org.apache.ignite.ci.teamcity.ignited.IRunHistory;
+import org.apache.ignite.ci.teamcity.ignited.runhist.ChangesState;
import org.jetbrains.annotations.NotNull;
import static org.apache.ignite.ci.analysis.RunStat.RunStatus.RES_CRITICAL_FAILURE;
@@ -362,16 +363,6 @@ public class RunStat implements IRunHistory {
}
}
- /** Changes state for run. */
- public enum ChangesState {
- /** Unknown number of changes for run. */
- UNKNOWN,
- /** Run without changes. */
- NONE,
- /** Run with changes. */
- EXIST
- }
-
/**
* Run info for storage in cache.
*/
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/ChangesState.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/ChangesState.java
new file mode 100644
index 0000000..13a0257
--- /dev/null
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/ChangesState.java
@@ -0,0 +1,27 @@
+/*
+ * 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.teamcity.ignited.runhist;
+
+/** Changes state for run. */
+public enum ChangesState {
+ /** Unknown number of changes for run. */
+ UNKNOWN,
+ /** Run without changes. */
+ NONE,
+ /** Run with changes. */
+ EXIST
+}
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
index 5d294ba..0a5c67e 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/Invocation.java
@@ -20,15 +20,18 @@ package org.apache.ignite.ci.teamcity.ignited.runhist;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
-import org.apache.ignite.ci.analysis.RunStat;
/**
* Run history element: invocation of build or test.
*/
public class Invocation {
- /** Change not filled. */
+ /** VCS Change not filled. */
public static final int CHANGE_NOT_FILLED = 2;
+
+ /** VCS Change present. */
public static final int CHANGE_PRESENT = 1;
+
+ /** No changes in VCS. */
public static final int NO_CHANGES = 0;
/** Build id. */
@@ -41,6 +44,10 @@ public class Invocation {
/** Build Start date as timestamp. */
private long startDate;
+ /**
+ * Creates invocation.
+ * @param buildId Build id.
+ */
public Invocation(Integer buildId) {
this.buildId = buildId;
this.changePresent = CHANGE_NOT_FILLED;
@@ -84,13 +91,13 @@ public class Invocation {
return this;
}
- public RunStat.ChangesState changesState() {
+ public ChangesState changesState() {
if (changePresent == NO_CHANGES)
- return RunStat.ChangesState.NONE;
+ return ChangesState.NONE;
else if (changePresent == CHANGE_PRESENT)
- return RunStat.ChangesState.EXIST;
+ return ChangesState.EXIST;
else
- return RunStat.ChangesState.UNKNOWN;
+ return ChangesState.UNKNOWN;
}
public boolean isFailure() {
diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
index 8f3ef33..73e7e21 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/runhist/RunHistCompacted.java
@@ -97,8 +97,8 @@ public class RunHistCompacted implements IVersionedEntity, IRunHistory {
for (Invocation cur : latestRuns) {
if (prev != null && cur != null) {
if (prev.status() != cur.status()
- && cur.changesState() == RunStat.ChangesState.NONE
- && prev.changesState() != RunStat.ChangesState.UNKNOWN)
+ && cur.changesState() == ChangesState.NONE
+ && prev.changesState() != ChangesState.UNKNOWN)
statusChange++;
}
prev = cur;
diff --git a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/issue/DetectingFailureTest.java b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/issue/DetectingFailureTest.java
index 14496df..8797812 100644
--- a/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/issue/DetectingFailureTest.java
+++ b/ignite-tc-helper-web/src/test/java/org/apache/ignite/ci/issue/DetectingFailureTest.java
@@ -17,13 +17,14 @@
package org.apache.ignite.ci.issue;
+import org.apache.ignite.ci.teamcity.ignited.runhist.ChangesState;
import org.apache.ignite.ci.analysis.RunStat;
import org.apache.ignite.ci.tcmodel.result.Build;
import org.apache.ignite.ci.tcmodel.result.tests.TestOccurrence;
import org.jetbrains.annotations.NotNull;
import org.junit.Test;
-import static org.apache.ignite.ci.analysis.RunStat.ChangesState.UNKNOWN;
+import static org.apache.ignite.ci.teamcity.ignited.runhist.ChangesState.UNKNOWN;
import static org.apache.ignite.ci.tcmodel.result.tests.TestOccurrence.STATUS_SUCCESS;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -105,7 +106,7 @@ public class DetectingFailureTest {
for (int i = 0; i < 50; i++) {
occurrence.status = ints[i] == 0 ? Build.STATUS_SUCCESS : "FAILURE";
- stat.addTestRunToLatest(occurrence.setId(fakeTestId(100 + i)), RunStat.ChangesState.NONE);
+ stat.addTestRunToLatest(occurrence.setId(fakeTestId(100 + i)), ChangesState.NONE);
}
occurrence.status = "FAILED";