Fixed the broken compilation

This commit is contained in:
Marcin Grzejszczak
2020-01-22 15:53:27 +01:00
parent 188c079bd6
commit 99dd179e13
5 changed files with 25 additions and 5 deletions

View File

@@ -19,6 +19,7 @@ package releaser;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import releaser.internal.options.Parser;
import releaser.internal.spring.BuildReportHandler;
import releaser.internal.spring.ExecutionResultHandler;
import releaser.internal.spring.SpringReleaser;
@@ -49,6 +50,11 @@ class ReleaserApplicationTests {
return Mockito.mock(ExecutionResultHandler.class);
}
@Bean
BuildReportHandler mockBuildReportHandler() {
return Mockito.mock(BuildReportHandler.class);
}
@Bean
Parser mockParser() {
return Mockito.mock(Parser.class);

View File

@@ -19,6 +19,7 @@ package releaser;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import releaser.internal.options.Parser;
import releaser.internal.spring.BuildReportHandler;
import releaser.internal.spring.ExecutionResultHandler;
import releaser.internal.spring.SpringReleaser;
@@ -49,6 +50,11 @@ class ReleaserApplicationTests {
return Mockito.mock(ExecutionResultHandler.class);
}
@Bean
BuildReportHandler mockBuildReportHandler() {
return Mockito.mock(BuildReportHandler.class);
}
@Bean
Parser mockParser() {
return Mockito.mock(Parser.class);

View File

@@ -369,7 +369,8 @@ public class SpringMetaReleaseAcceptanceTests
.getBean(TestExecutionResultHandler.class);
FirstTask firstTask = context.getBean(FirstTask.class);
SecondTask secondTask = context.getBean(SecondTask.class);
PostReleaseTask postReleaseTask = context.getBean(PostReleaseTask.class);
PostReleaseTask postReleaseTask = context
.getBean(PostReleaseTask.class);
ExecutionResult result = releaser
.release(new OptionsBuilder().metaRelease(true).options());

View File

@@ -56,8 +56,15 @@ class BatchConfiguration {
@Bean
@ConditionalOnMissingBean
SpringBatchExecutionResultHandler springBatchExecutionResultHandler(
JobExplorer jobExplorer, ConfigurableApplicationContext context) {
BuildReportHandler springBuildReportHandler(JobExplorer jobExplorer,
ConfigurableApplicationContext context) {
return new SpringBatchExecutionResultHandler(jobExplorer, context);
}
@Bean
@ConditionalOnMissingBean
ExecutionResultHandler springBatchExecutionResultHandler(JobExplorer jobExplorer,
ConfigurableApplicationContext context) {
return new SpringBatchExecutionResultHandler(jobExplorer, context);
}

View File

@@ -378,10 +378,10 @@ public abstract class AbstractSpringAcceptanceTests {
ProjectsToRunFactory projectsToRunFactory, JobLauncher jobLauncher,
FlowRunnerTaskExecutorSupplier flowRunnerTaskExecutorSupplier,
ConfigurableApplicationContext context,
ReleaserProperties releaserProperties) {
ReleaserProperties releaserProperties, BuildReportHandler reportHandler) {
return new SpringBatchFlowRunner(stepBuilderFactory, jobBuilderFactory,
projectsToRunFactory, jobLauncher, flowRunnerTaskExecutorSupplier,
context, releaserProperties) {
context, releaserProperties, reportHandler) {
@Override
Decision decide(Options options, ReleaserTask task) {
return Decision.CONTINUE;