Projects >> jbehave-core >>6c96ef1cd72615349025f1c0ac3bfe187839e037

Chunk
Conflicting content 
import org.jbehave.core.reporters.StoryReporterBuilder;
import org.jbehave.core.steps.SilentStepMonitor;
import org.jbehave.core.steps.ParameterConverters.DateConverter;
<<<<<<< HEAD
import org.jbehave.examples.trader.stories.AndStep.AndSteps;
import org.jbehave.examples.trader.stories.ClaimsWithNullCalendar.CalendarSteps;
import org.jbehave.examples.trader.stories.FailureFollowedByGivenStories.SandpitSteps;
import org.jbehave.examples.trader.stories.PriorityMatching.PriorityMatchingSteps;
=======
import org.jbehave.examples.trader.converters.TraderConverter;
>>>>>>> 5053281cdc77388fea163e7364cc85a5032bf605
import org.junit.Test;

@WithConfiguration(stepMonitor = SilentStepMonitor.class,
Solution content 
import org.jbehave.core.reporters.StoryReporterBuilder;
import org.jbehave.core.steps.SilentStepMonitor;
import org.jbehave.core.steps.ParameterConverters.DateConverter;
import org.jbehave.examples.trader.stories.AndStep.AndSteps;
import org.jbehave.examples.trader.stories.ClaimsWithNullCalendar.CalendarSteps;
import org.jbehave.examples.trader.stories.FailureFollowedByGivenStories.SandpitSteps;
import org.jbehave.examples.trader.stories.PriorityMatching.PriorityMatchingSteps;
import org.junit.Test;

@WithConfiguration(stepMonitor = SilentStepMonitor.class,
File
AnnotatedTraderStoryRunner.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
@WithConfiguration(stepMonitor = SilentStepMonitor.class, 
        stepPatternParser = AnnotatedTraderStoryRunner.MyRegexPrefixCapturingPatternParser.class, 
        storyLoader = AnnotatedTraderStoryRunner.MyStoryLoader.class, 
<<<<<<< HEAD
        storyReporterBuilder = AnnotatedTraderStoryRunner.MyReportBuilder.class, 
        parameterConverters = { AnnotatedTraderStoryRunner.MyDateConverter.class })
@WithCandidateSteps(candidateSteps = { TraderSteps.class, BeforeAfterSteps.class, AndSteps.class, CalendarSteps.class, 
        PriorityMatchingSteps.class, SandpitSteps.class })
=======
        storyReporterBuilder = AnnotatedTraderStoryRunner.MyReportBuilder.class,
        parameterConverters = { AnnotatedTraderStoryRunner.MyDateConverter.class, AnnotatedTraderStoryRunner.MyTraderConverter.class })
@WithCandidateSteps(candidateSteps = { TraderSteps.class })
>>>>>>> 5053281cdc77388fea163e7364cc85a5032bf605
public class AnnotatedTraderStoryRunner {

    @Test
Solution content 
@WithConfiguration(stepMonitor = SilentStepMonitor.class, 
        stepPatternParser = AnnotatedTraderStoryRunner.MyRegexPrefixCapturingPatternParser.class, 
        storyLoader = AnnotatedTraderStoryRunner.MyStoryLoader.class, 
        storyReporterBuilder = AnnotatedTraderStoryRunner.MyReportBuilder.class, 
        parameterConverters = { AnnotatedTraderStoryRunner.MyDateConverter.class })
@WithCandidateSteps(candidateSteps = { TraderSteps.class, BeforeAfterSteps.class, AndSteps.class, CalendarSteps.class, 
        PriorityMatchingSteps.class, SandpitSteps.class })
public class AnnotatedTraderStoryRunner {

    @Test
File
AnnotatedTraderStoryRunner.java
Developer's decision
Version 1
Kind of conflict
Annotation
Chunk
Conflicting content 
            super(new SimpleDateFormat("yyyy-MM-dd"));
        }
    }
<<<<<<< HEAD
=======
    
    public static class MyTraderConverter extends TraderConverter {
        public MyTraderConverter(){
            super(TraderSteps.mockTradePersister());
        }
    }
>>>>>>> 5053281cdc77388fea163e7364cc85a5032bf605

}
Solution content 
            super(new SimpleDateFormat("yyyy-MM-dd"));
        }
    }

}
File
AnnotatedTraderStoryRunner.java
Developer's decision
Version 1
Kind of conflict
Class declaration