Projects >> gradle >>599b556be57f28ef7bca9ed6b02e153c155e6ca9

Chunk
Conflicting content 
package org.gradle.api.internal.tasks.testing.junit;

import org.gradle.api.internal.tasks.testing.TestDescriptorInternal;
<<<<<<< HEAD
import org.gradle.api.internal.tasks.testing.junit.result.XmlTestsuite;
import org.gradle.api.internal.tasks.testing.junit.result.XmlTestsuiteFactory;
=======
import org.gradle.api.internal.tasks.testing.junit.result.XmlTestSuiteFactory;
import org.gradle.api.internal.tasks.testing.junit.result.XmlTestSuite;
>>>>>>> bfcce45ac0f7ab4af405c9c2673a741d7def0fe2
import org.gradle.api.internal.tasks.testing.results.StateTrackingTestResultProcessor;
import org.gradle.api.internal.tasks.testing.results.TestState;
import org.gradle.api.tasks.testing.TestDescriptor;
Solution content 
package org.gradle.api.internal.tasks.testing.junit;

import org.gradle.api.internal.tasks.testing.TestDescriptorInternal;
import org.gradle.api.internal.tasks.testing.junit.result.XmlTestsuite;
import org.gradle.api.internal.tasks.testing.junit.result.XmlTestsuiteFactory;
import org.gradle.api.internal.tasks.testing.results.StateTrackingTestResultProcessor;
import org.gradle.api.internal.tasks.testing.results.TestState;
import org.gradle.api.tasks.testing.TestDescriptor;
File
JUnitXmlReportGenerator.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    private final File testResultsDir;
    private final XmlTestSuiteFactory testSuiteFactory = new XmlTestSuiteFactory();
    private TestState testSuite;
<<<<<<< HEAD
    private XmlTestsuiteFactory factory = new XmlTestsuiteFactory();

    private XmlTestsuite xmlTestsuite;
=======
    private XmlTestSuite xmlTestSuite;
>>>>>>> bfcce45ac0f7ab4af405c9c2673a741d7def0fe2

    public JUnitXmlReportGenerator(File testResultsDir) {
        this.testResultsDir = testResultsDir;
Solution content 
    private final File testResultsDir;
    private TestState testSuite;
    private XmlTestsuiteFactory factory = new XmlTestsuiteFactory();

    private XmlTestsuite xmlTestsuite;

    public JUnitXmlReportGenerator(File testResultsDir) {
        this.testResultsDir = testResultsDir;
File
JUnitXmlReportGenerator.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        if (test.getName().equals(test.getClassName())) {
<<<<<<< HEAD
    protected void started(TestState state) {
        TestDescriptorInternal test = state.test;
            xmlTestsuite = factory.newSuite(testResultsDir, test.getClassName(), state.getStartTime());
=======
            xmlTestSuite = testSuiteFactory.create(testResultsDir, test.getClassName(), state.getStartTime());
>>>>>>> bfcce45ac0f7ab4af405c9c2673a741d7def0fe2
            testSuite = state;
        }
    }
Solution content 
    protected void started(TestState state) {
        TestDescriptorInternal test = state.test;
        if (test.getName().equals(test.getClassName())) {
            xmlTestsuite = factory.newSuite(testResultsDir, test.getClassName(), state.getStartTime());
            testSuite = state;
        }
    }
File
JUnitXmlReportGenerator.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
import org.gradle.api.internal.tasks.testing.TestDescriptorInternal;
import org.gradle.api.internal.tasks.testing.TestResultProcessor;
import org.gradle.api.internal.tasks.testing.TestStartEvent;
<<<<<<< HEAD
import org.gradle.api.internal.tasks.testing.junit.result.XmlTestsuite;
import org.gradle.api.internal.tasks.testing.junit.result.XmlTestsuiteFactory;
=======
import org.gradle.api.internal.tasks.testing.junit.result.XmlTestSuite;
import org.gradle.api.internal.tasks.testing.junit.result.XmlTestSuiteFactory;
>>>>>>> bfcce45ac0f7ab4af405c9c2673a741d7def0fe2
import org.gradle.api.tasks.testing.TestOutputEvent;
import org.gradle.internal.TimeProvider;
import org.gradle.internal.TrueTimeProvider;
Solution content 
import org.gradle.api.internal.tasks.testing.TestDescriptorInternal;
import org.gradle.api.internal.tasks.testing.TestResultProcessor;
import org.gradle.api.internal.tasks.testing.TestStartEvent;
import org.gradle.api.internal.tasks.testing.junit.result.XmlTestsuite;
import org.gradle.api.internal.tasks.testing.junit.result.XmlTestsuiteFactory;
import org.gradle.api.tasks.testing.TestOutputEvent;
import org.gradle.internal.TimeProvider;
import org.gradle.internal.TrueTimeProvider;
File
TestNGJUnitXmlReportGenerator.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    //this one probably deserves some unit testing

    private final File testResultsDir;
<<<<<<< HEAD
    private final XmlTestsuiteFactory xmlTestsuiteFactory = new XmlTestsuiteFactory();
=======
    private final XmlTestSuiteFactory testSuiteFactory = new XmlTestSuiteFactory();
>>>>>>> bfcce45ac0f7ab4af405c9c2673a741d7def0fe2

    private Map tests = new HashMap();
    private Map testSuites = new HashMap();
Solution content 
    //this one probably deserves some unit testing

    private final File testResultsDir;
    private final XmlTestsuiteFactory xmlTestsuiteFactory = new XmlTestsuiteFactory();

    private Map tests = new HashMap();
File
TestNGJUnitXmlReportGenerator.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
        tests.put(test.getId(), new TestInfo(test, event.getStartTime()));
        if (!test.isComposite()) { //test method
            if (!testSuites.containsKey(test.getClassName())) {
<<<<<<< HEAD
                testSuites.put(test.getClassName(), xmlTestsuiteFactory.newSuite(testResultsDir, test.getClassName(), timeProvider.getCurrentTime()));
=======
                testSuites.put(test.getClassName(), testSuiteFactory.create(testResultsDir, test.getClassName(), timeProvider.getCurrentTime()));
>>>>>>> bfcce45ac0f7ab4af405c9c2673a741d7def0fe2
            }
        }
    }
Solution content 
        tests.put(test.getId(), new TestInfo(test, event.getStartTime()));
        if (!test.isComposite()) { //test method
            if (!testSuites.containsKey(test.getClassName())) {
                testSuites.put(test.getClassName(), xmlTestsuiteFactory.newSuite(testResultsDir, test.getClassName(), timeProvider.getCurrentTime()));
            }
        }
    }
File
TestNGJUnitXmlReportGenerator.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
    private long failedCount;
    private long testCount;

<<<<<<< HEAD:subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/result/XmlTestsuite.java
    XmlTestsuite(Document testSuiteReport, File testResultsDir, String className, long startTime) {
        this.className = className;
        this.startTime = startTime;
        this.hostname = getHostname();
        this.testSuiteReport = testSuiteReport;
=======
    public XmlTestSuite(File testResultsDir, String className, long startTime, String hostname, Document document) {
        this.className = className;
        this.startTime = startTime;
        this.hostname = hostname;
        testSuiteReport = document;
>>>>>>> bfcce45ac0f7ab4af405c9c2673a741d7def0fe2:subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/result/XmlTestSuite.java
        rootElement = testSuiteReport.createElement("testsuite");
        testSuiteReport.appendChild(rootElement);
        // Add an empty properties element for compatibility
Solution content 
    private long failedCount;
    private long testCount;

    public XmlTestSuite(File testResultsDir, String className, long startTime, String hostname, Document document) {
        this.className = className;
        this.startTime = startTime;
        this.hostname = hostname;
        testSuiteReport = document;
        rootElement = testSuiteReport.createElement("testsuite");
        testSuiteReport.appendChild(rootElement);
        // Add an empty properties element for compatibility
File
XmlTestSuite.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Method signature
Variable