Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ public abstract class Status {
public enum StatusState {
SUCCESSFUL,
FAILED,
INPROGRESS
INPROGRESS,
CANCELLED,
UNKNOWN
}

public abstract long dateAdded();
Expand Down
16 changes: 11 additions & 5 deletions src/main/java/com/cdancy/bitbucket/rest/domain/build/Summary.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,22 @@
@AutoValue
public abstract class Summary {

public abstract long cancelled();

public abstract long failed();

public abstract long inProgress();

public abstract long successful();

@SerializedNames({"failed", "inProgress", "successful"})
public static Summary create(final long failed,
final long inProgress,
final long successful) {
return new AutoValue_Summary(failed, inProgress, successful);
public abstract long unknown();

@SerializedNames({"cancelled", "failed", "inProgress", "successful", "unknown"})
public static Summary create(final long cancelled,
final long failed,
final long inProgress,
final long successful,
final long unknown) {
return new AutoValue_Summary(cancelled, failed, inProgress, successful, unknown);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ public abstract class CreateBuildStatus {
public enum STATE {
SUCCESSFUL,
FAILED,
INPROGRESS
INPROGRESS,
CANCELLED,
UNKNOWN
}

public abstract String state();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,8 @@ public void testGetSummaryByCommit() {
assertThat(summary.successful() == 1).isTrue();
assertThat(summary.inProgress() == 0).isTrue();
assertThat(summary.failed() == 0).isTrue();
assertThat(summary.cancelled() == 0).isTrue();
assertThat(summary.unknown() == 0).isTrue();
}

@Test
Expand All @@ -114,6 +116,8 @@ public void testGetSummaryByNonExistentCommit() {
assertThat(summary.successful() == 0).isTrue();
assertThat(summary.inProgress() == 0).isTrue();
assertThat(summary.failed() == 0).isTrue();
assertThat(summary.cancelled() == 0).isTrue();
assertThat(summary.unknown() == 0).isTrue();
}

@AfterClass
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,11 @@ public void testGetSummary() throws Exception {

final Summary summary = baseApi.buildStatusApi().summary(commitHash);
assertThat(summary).isNotNull();
assertThat(summary.failed() == 1).isTrue();
assertThat(summary.inProgress() == 2).isTrue();
assertThat(summary.successful() == 3).isTrue();
assertThat(summary.cancelled() == 1).isTrue();
assertThat(summary.failed() == 2).isTrue();
assertThat(summary.inProgress() == 3).isTrue();
assertThat(summary.successful() == 4).isTrue();
assertThat(summary.unknown() == 5).isTrue();

assertSent(server, "GET", restBuildStatusPath + BitbucketApiMetadata.API_VERSION
+ "/commits/stats/306bcf274566f2e89f75ae6f7faf10beff38382012");
Expand Down
4 changes: 3 additions & 1 deletion src/test/resources/branch-list.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,11 @@
]
},
"com.atlassian.bitbucket.server.bitbucket-build:build-status-metadata": {
"cancelled": 0,
"successful": 1,
"inProgress": 0,
"failed": 0
"failed": 0,
"unknown": 0
}
}
}
Expand Down
8 changes: 5 additions & 3 deletions src/test/resources/build-summary.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
{
"failed": 1,
"inProgress": 2,
"successful": 3
"cancelled": 1,
"failed": 2,
"inProgress": 3,
"successful": 4,
"unknown": 5
}