| Chunk |
|---|
| Conflicting content |
|---|
if (results.getTestList().size() > 0) {
//create an individual report for all of the results and add it to the build
<<<<<<< HEAD
TestNGTestResultBuildAction action = new TestNGTestResultBuildAction(build, results);
build.getActions().add(action);
if (failureOnFailedTestConfig && results.getFailedConfigCount() > 0) {
logger.println("Failed configuration methods found. Marking build as FAILURE.");
build.setResult(Result.FAILURE);
} else if (unstableOnSkippedTests && (results.getSkippedConfigCount() > 0 || results.getSkipCount() > 0)) {
=======
build.addAction(new TestNGTestResultBuildAction(results));
if (unstableOnSkippedTests && (results.getSkippedConfigCount() > 0 || results.getSkipCount() > 0)) {
>>>>>>> 0f3e1167c44ac3e3b5f41b63203d2a3f9c182058
logger.println("Skipped Tests/Configs found. Marking build as UNSTABLE.");
build.setResult(Result.UNSTABLE);
} else if (results.getFailedConfigCount() > 0 || results.getFailCount() > 0) { |
| Solution content |
|---|
if (results.getTestList().size() > 0) {
//create an individual report for all of the results and add it to the build
build.addAction(new TestNGTestResultBuildAction(results));
if (failureOnFailedTestConfig && results.getFailedConfigCount() > 0) {
logger.println("Failed configuration methods found. Marking build as FAILURE.");
build.setResult(Result.FAILURE);
} else if (unstableOnSkippedTests && (results.getSkippedConfigCount() > 0 || results.getSkipCount() > 0)) {
logger.println("Skipped Tests/Configs found. Marking build as UNSTABLE.");
build.setResult(Result.UNSTABLE);
} else if (results.getFailedConfigCount() > 0 || results.getFailCount() > 0) { |
| File |
|---|
| Publisher.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |