Projects >> cucumber-jvm >>80773f08fbdfbb0ba94c3d760f0d8bdd9c742113

Chunk
Conflicting content 
package cucumber.runtime.formatter;

<<<<<<< HEAD
import cucumber.runtime.Backend;
import cucumber.runtime.Runtime;
import cucumber.runtime.RuntimeGlue;
import cucumber.runtime.RuntimeOptions;
import cucumber.runtime.StepDefinitionMatch;
import cucumber.runtime.io.ClasspathResourceLoader;
=======
import cucumber.runtime.TestHelper;
>>>>>>> c5914261427a8f43cd5d788f558008abac89020e
import cucumber.runtime.model.CucumberFeature;
import org.junit.Test;
Solution content 
package cucumber.runtime.formatter;

import cucumber.runtime.TestHelper;
import cucumber.runtime.model.CucumberFeature;
import org.junit.Test;
File
CucumberPrettyFormatterTest.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
                        "    Then third step       # path/step_definitions.java:11\n"));
    }

<<<<<<< HEAD
    private String runFeatureWithPrettyFormatter(final CucumberFeature feature, final Map stepsToLocation) throws IOException {
        final RuntimeOptions runtimeOptions = new RuntimeOptions("");
        final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
        final ClasspathResourceLoader resourceLoader = new ClasspathResourceLoader(classLoader);
        final RuntimeGlue glue = createMockedRuntimeGlueThatMatchesTheSteps(stepsToLocation);
        final Runtime runtime = new Runtime(resourceLoader, classLoader, asList(mock(Backend.class)), runtimeOptions, glue);
=======
    private String runFeatureWithPrettyFormatter(final CucumberFeature feature, final Map stepsToLocation) throws Throwable {
>>>>>>> c5914261427a8f43cd5d788f558008abac89020e
        final StringBuilder out = new StringBuilder();
        final CucumberPrettyFormatter prettyFormatter = new CucumberPrettyFormatter(out);
        prettyFormatter.setMonochrome(true);
Solution content 
                        "    Then third step       # path/step_definitions.java:11\n"));
    }

    private String runFeatureWithPrettyFormatter(final CucumberFeature feature, final Map stepsToLocation) throws Throwable {
        final StringBuilder out = new StringBuilder();
        final CucumberPrettyFormatter prettyFormatter = new CucumberPrettyFormatter(out);
        prettyFormatter.setMonochrome(true);
File
CucumberPrettyFormatterTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Method signature
Variable
Chunk
Conflicting content 
package cucumber.runtime.formatter;

import cucumber.runtime.Backend;
<<<<<<< HEAD
import cucumber.runtime.HookDefinition;
=======
import cucumber.runtime.Env;
>>>>>>> c5914261427a8f43cd5d788f558008abac89020e
import cucumber.runtime.Runtime;
import cucumber.runtime.RuntimeOptions;
import cucumber.runtime.TestHelper;
Solution content 
package cucumber.runtime.formatter;

import cucumber.runtime.Backend;
import cucumber.runtime.Runtime;
import cucumber.runtime.RuntimeOptions;
import cucumber.runtime.TestHelper;
File
JUnitFormatterTest.java
Developer's decision
None
Kind of conflict
Import
Chunk
Conflicting content 
    private String runFeatureWithJUnitFormatter(final CucumberFeature feature, final Map stepsToResult,
                                                final List> hooks, final long stepHookDuration) throws Throwable {
<<<<<<< HEAD
        final RuntimeOptions runtimeOptions = new RuntimeOptions(Collections.emptyList());
        final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
        final ClasspathResourceLoader resourceLoader = new ClasspathResourceLoader(classLoader);
        final RuntimeGlue glue = createMockedRuntimeGlueThatMatchesTheSteps(stepsToResult, hooks);
        final Runtime runtime = new Runtime(resourceLoader, classLoader, asList(mock(Backend.class)), runtimeOptions, new StopWatch.Stub(stepHookDuration), glue);
=======
>>>>>>> c5914261427a8f43cd5d788f558008abac89020e
        final File report = File.createTempFile("cucumber-jvm-junit", ".xml");
        final JUnitFormatter junitFormatter = createJUnitFormatter(report);
        TestHelper.runFeatureWithFormatter(feature, stepsToResult, hooks, stepHookDuration, junitFormatter, junitFormatter);
Solution content 
    private String runFeatureWithJUnitFormatter(final CucumberFeature feature, final Map stepsToResult,
                                                final List> hooks, final long stepHookDuration) throws Throwable {
        final File report = File.createTempFile("cucumber-jvm-junit", ".xml");
        final JUnitFormatter junitFormatter = createJUnitFormatter(report);
        TestHelper.runFeatureWithFormatter(feature, stepsToResult, hooks, stepHookDuration, junitFormatter, junitFormatter);
File
JUnitFormatterTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable