|
24 | 24 | import jetbrains.buildServer.commitPublisher.gitea.data.GiteaRepoInfo; |
25 | 25 | import jetbrains.buildServer.messages.Status; |
26 | 26 | import jetbrains.buildServer.serverSide.*; |
| 27 | +import jetbrains.buildServer.serverSide.impl.PipelineInfo; |
27 | 28 | import jetbrains.buildServer.vcs.VcsRootInstance; |
28 | 29 | import org.apache.http.HttpRequest; |
29 | 30 | import org.apache.http.HttpResponse; |
@@ -140,19 +141,19 @@ public void should_calculate_correct_revision_status() { |
140 | 141 | } |
141 | 142 |
|
142 | 143 | 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); |
148 | 146 | buildTypeMock.stubs().method("getFullName").withNoArguments().will(returnValue("typeFullName")); |
| 147 | + buildTypeMock.stubs().method("getProject").withNoArguments().will(returnValue(myBuildType.getProject())); |
149 | 148 | 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(); |
152 | 153 |
|
153 | 154 | 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)); |
156 | 157 | } |
157 | 158 |
|
158 | 159 | @BeforeMethod |
|
0 commit comments