Skip to content

Commit 312a1f0

Browse files
committed
Fix compile for 2025.07
1 parent 8eb44ce commit 312a1f0

File tree

2 files changed

+10
-25
lines changed

2 files changed

+10
-25
lines changed

commit-status-publisher-server/src/main/java/jetbrains/buildServer/commitPublisher/gitea/GiteaPublisher.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -115,22 +115,6 @@ public boolean buildInterrupted(@NotNull SBuild build, @NotNull BuildRevision re
115115
return true;
116116
}
117117

118-
@Override
119-
public RevisionStatus getRevisionStatusForRemovedBuild(@NotNull SQueuedBuild removedBuild, @NotNull BuildRevision revision) throws PublisherException {
120-
SBuildType buildType = removedBuild.getBuildType();
121-
GiteaCommitStatus commitStatus = getLatestCommitStatusForBuild(revision, buildType.getFullName(), removedBuild.getBuildPromotion());
122-
return getRevisionStatusForRemovedBuild(removedBuild, commitStatus);
123-
}
124-
125-
RevisionStatus getRevisionStatusForRemovedBuild(@NotNull SQueuedBuild removedBuild, @Nullable GiteaCommitStatus commitStatus) {
126-
if(commitStatus == null) {
127-
return null;
128-
}
129-
Event event = getTriggeredEvent(commitStatus);
130-
boolean isSameBuildType = StringUtil.areEqual(getBuildName(removedBuild.getBuildPromotion()), commitStatus.context);
131-
return new RevisionStatus(event, commitStatus.description, isSameBuildType, getBuildIdFromViewUrl(commitStatus.target_url));
132-
}
133-
134118
private String getBuildName(BuildPromotion promotion) {
135119
SBuildType buildType = promotion.getBuildType();
136120
return buildType != null ? buildType.getFullName() : promotion.getBuildTypeExternalId();

commit-status-publisher-server/src/test/java/jetbrains/buildServer/commitPublisher/gitea/GiteaPublisherTest.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import jetbrains.buildServer.commitPublisher.gitea.data.GiteaRepoInfo;
2525
import jetbrains.buildServer.messages.Status;
2626
import jetbrains.buildServer.serverSide.*;
27+
import jetbrains.buildServer.serverSide.impl.PipelineInfo;
2728
import jetbrains.buildServer.vcs.VcsRootInstance;
2829
import org.apache.http.HttpRequest;
2930
import org.apache.http.HttpResponse;
@@ -140,19 +141,19 @@ public void should_calculate_correct_revision_status() {
140141
}
141142

142143
public void should_allow_queued_depending_on_build_type() {
143-
Mock removedBuildMock = new Mock(SQueuedBuild.class);
144-
removedBuildMock.stubs().method("getBuildTypeId").withNoArguments().will(returnValue("buildType"));
145-
removedBuildMock.stubs().method("getItemId").withNoArguments().will(returnValue("123"));
146-
Mock buildPromotionMock = new Mock(BuildPromotion.class);
147-
Mock buildTypeMock = new Mock(SBuildType.class);
144+
Mock buildPromotionMock = new Mock(BuildPromotionEx.class);
145+
Mock buildTypeMock = new Mock(BuildTypeEx.class);
148146
buildTypeMock.stubs().method("getFullName").withNoArguments().will(returnValue("typeFullName"));
147+
buildTypeMock.stubs().method("getProject").withNoArguments().will(returnValue(myBuildType.getProject()));
149148
buildPromotionMock.stubs().method("getBuildType").withNoArguments().will(returnValue(buildTypeMock.proxy()));
150-
removedBuildMock.stubs().method("getBuildPromotion").withNoArguments().will(returnValue(buildPromotionMock.proxy()));
151-
SQueuedBuild removedBuild = (SQueuedBuild)removedBuildMock.proxy();
149+
buildPromotionMock.stubs().method("getAttribute").withAnyArguments().will(returnValue(null));
150+
PipelineInfo pipelineInfo = new PipelineInfo((BuildPromotionEx)buildPromotionMock.proxy());
151+
buildPromotionMock.stubs().method("getPipelineInfo").withNoArguments().will(returnValue(pipelineInfo));
152+
BuildPromotion removedBuild = (BuildPromotion)buildPromotionMock.proxy();
152153

153154
GiteaPublisher publisher = (GiteaPublisher)myPublisher;
154-
assertTrue(publisher.getRevisionStatusForRemovedBuild(removedBuild, new GiteaCommitStatus(null, GiteaBuildStatus.PENDING.getName(), DefaultStatusMessages.BUILD_QUEUED, "typeFullName", "http://localhost:8111/viewQueued.html?itemId=123")).isEventAllowed(CommitStatusPublisher.Event.REMOVED_FROM_QUEUE, Long.MAX_VALUE));
155-
assertFalse(publisher.getRevisionStatusForRemovedBuild(removedBuild, new GiteaCommitStatus(null, GiteaBuildStatus.PENDING.getName(), DefaultStatusMessages.BUILD_QUEUED, "anotherTypeFullName", "http://localhost:8111/viewQueued.html?itemId=321")).isEventAllowed(CommitStatusPublisher.Event.REMOVED_FROM_QUEUE, Long.MAX_VALUE));
155+
assertTrue(publisher.getRevisionStatus(removedBuild, new GiteaCommitStatus(null, GiteaBuildStatus.PENDING.getName(), DefaultStatusMessages.BUILD_QUEUED, "typeFullName", "http://localhost:8111/viewQueued.html?itemId=123")).isEventAllowed(CommitStatusPublisher.Event.REMOVED_FROM_QUEUE, Long.MAX_VALUE));
156+
assertFalse(publisher.getRevisionStatus(removedBuild, new GiteaCommitStatus(null, GiteaBuildStatus.PENDING.getName(), DefaultStatusMessages.BUILD_QUEUED, "anotherTypeFullName", "http://localhost:8111/viewQueued.html?itemId=321")).isEventAllowed(CommitStatusPublisher.Event.REMOVED_FROM_QUEUE, Long.MAX_VALUE));
156157
}
157158

158159
@BeforeMethod

0 commit comments

Comments
 (0)