Index: subprojects/testing-base/src/main/java/org/gradle/api/internal/tasks/testing/operations/TestListenerBuildOperationAdapter.java =================================================================== diff -u -N -r0feded0416d926d96ccce82cee467572e9b17b0b -rda11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b --- subprojects/testing-base/src/main/java/org/gradle/api/internal/tasks/testing/operations/TestListenerBuildOperationAdapter.java (.../TestListenerBuildOperationAdapter.java) (revision 0feded0416d926d96ccce82cee467572e9b17b0b) +++ subprojects/testing-base/src/main/java/org/gradle/api/internal/tasks/testing/operations/TestListenerBuildOperationAdapter.java (.../TestListenerBuildOperationAdapter.java) (revision da11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b) @@ -111,20 +111,20 @@ public static class OutputProgress implements ExecuteTestBuildOperationType.Output { private final TestOutputEvent event; - private final Object testId; + private final Object testDescriptorId; - private OutputProgress(TestOutputEvent event, Object testId) { + private OutputProgress(TestOutputEvent event, Object testDescriptorId) { this.event = event; - this.testId = testId; + this.testDescriptorId = testDescriptorId; } @Override public TestOutputEvent getOutput() { return event; } - public Object getTestId() { - return testId; + public Object getTestDescriptorId() { + return testDescriptorId; } } Index: subprojects/testing-base/src/main/java/org/gradle/api/tasks/testing/AbstractTestTask.java =================================================================== diff -u -N -r4b3e8fb30295dbc286695f45996b2df589d2270b -rda11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b --- subprojects/testing-base/src/main/java/org/gradle/api/tasks/testing/AbstractTestTask.java (.../AbstractTestTask.java) (revision 4b3e8fb30295dbc286695f45996b2df589d2270b) +++ subprojects/testing-base/src/main/java/org/gradle/api/tasks/testing/AbstractTestTask.java (.../AbstractTestTask.java) (revision da11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b) @@ -455,11 +455,9 @@ TestOutputStore.Writer outputWriter = testOutputStore.writer(); TestReportDataCollector testReportDataCollector = new TestReportDataCollector(results, outputWriter); - addTestListener(testReportDataCollector); addTestOutputListener(testReportDataCollector); - TestCountLogger testCountLogger = new TestCountLogger(getProgressLoggerFactory()); addTestListener(testCountLogger); Index: subprojects/tooling-api-builders/src/main/java/org/gradle/tooling/internal/provider/runner/ClientForwardingTestOperationListener.java =================================================================== diff -u -N -r3559e2686a72cdf575a7819da19b25f4e974c985 -rda11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b --- subprojects/tooling-api-builders/src/main/java/org/gradle/tooling/internal/provider/runner/ClientForwardingTestOperationListener.java (.../ClientForwardingTestOperationListener.java) (revision 3559e2686a72cdf575a7819da19b25f4e974c985) +++ subprojects/tooling-api-builders/src/main/java/org/gradle/tooling/internal/provider/runner/ClientForwardingTestOperationListener.java (.../ClientForwardingTestOperationListener.java) (revision da11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b) @@ -88,7 +88,7 @@ public void progress(OperationIdentifier buildOperationId, OperationProgressEvent progressEvent) { if (progressEvent.getDetails() instanceof TestListenerBuildOperationAdapter.OutputProgress) { TestListenerBuildOperationAdapter.OutputProgress progress = (TestListenerBuildOperationAdapter.OutputProgress) progressEvent.getDetails(); - InternalTestOutputDescriptor descriptor = new DefaultTestOutputDescriptor(new OperationIdentifier(idFactory.nextId()), progress.getTestId()); + InternalTestOutputDescriptor descriptor = new DefaultTestOutputDescriptor(new OperationIdentifier(idFactory.nextId()), progress.getTestDescriptorId()); DefaultTestOutputResult result = new DefaultTestOutputResult(progressEvent.getTime(), progressEvent.getTime(), getDestination(progress.getOutput().getDestination()), progress.getOutput().getMessage()); eventConsumer.progress(new DefaultTestOutputEvent(progressEvent.getTime(), descriptor, result)); } Index: subprojects/tooling-api-builders/src/main/java/org/gradle/tooling/internal/provider/runner/ProgressEventConsumer.java =================================================================== diff -u -N -r3559e2686a72cdf575a7819da19b25f4e974c985 -rda11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b --- subprojects/tooling-api-builders/src/main/java/org/gradle/tooling/internal/provider/runner/ProgressEventConsumer.java (.../ProgressEventConsumer.java) (revision 3559e2686a72cdf575a7819da19b25f4e974c985) +++ subprojects/tooling-api-builders/src/main/java/org/gradle/tooling/internal/provider/runner/ProgressEventConsumer.java (.../ProgressEventConsumer.java) (revision da11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b) @@ -19,7 +19,6 @@ import org.gradle.initialization.BuildEventConsumer; import org.gradle.internal.operations.BuildOperationDescriptor; import org.gradle.tooling.internal.protocol.events.InternalOperationFinishedProgressEvent; -import org.gradle.tooling.internal.protocol.events.InternalOperationResult; import org.gradle.tooling.internal.protocol.events.InternalOperationStartedProgressEvent; import org.gradle.tooling.internal.protocol.events.InternalProgressEvent; Index: subprojects/tooling-api-builders/src/main/java/org/gradle/tooling/internal/provider/runner/ToolingBuilderServices.java =================================================================== diff -u -N -rc6f378aa218bb865e18ea2948bb1edff648af398 -rda11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b --- subprojects/tooling-api-builders/src/main/java/org/gradle/tooling/internal/provider/runner/ToolingBuilderServices.java (.../ToolingBuilderServices.java) (revision c6f378aa218bb865e18ea2948bb1edff648af398) +++ subprojects/tooling-api-builders/src/main/java/org/gradle/tooling/internal/provider/runner/ToolingBuilderServices.java (.../ToolingBuilderServices.java) (revision da11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b) @@ -25,9 +25,6 @@ import org.gradle.launcher.exec.ChainingBuildActionRunner; import org.gradle.tooling.internal.provider.events.OperationResultPostProcessor; -import java.io.BufferedWriter; -import java.io.FileWriter; -import java.io.IOException; import java.util.Arrays; public class ToolingBuilderServices extends AbstractPluginServiceRegistry { Index: subprojects/tooling-api/src/crossVersionTest/groovy/org/gradle/integtests/tooling/r60/TestProgressCrossVersionSpec.groovy =================================================================== diff -u -N -r3559e2686a72cdf575a7819da19b25f4e974c985 -rda11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b --- subprojects/tooling-api/src/crossVersionTest/groovy/org/gradle/integtests/tooling/r60/TestProgressCrossVersionSpec.groovy (.../TestProgressCrossVersionSpec.groovy) (revision 3559e2686a72cdf575a7819da19b25f4e974c985) +++ subprojects/tooling-api/src/crossVersionTest/groovy/org/gradle/integtests/tooling/r60/TestProgressCrossVersionSpec.groovy (.../TestProgressCrossVersionSpec.groovy) (revision da11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b) @@ -23,8 +23,6 @@ import org.gradle.tooling.events.ProgressEvent import org.gradle.tooling.events.test.Destination import org.gradle.tooling.events.test.TestOutputEvent -import org.gradle.tooling.events.test.TestOutputFinishProgressEvent -import org.gradle.tooling.events.test.TestOutputStartProgressEvent class TestProgressCrossVersionSpec extends ToolingApiSpecification { Index: subprojects/tooling-api/src/main/java/org/gradle/tooling/events/OperationType.java =================================================================== diff -u -N -rfe4aa832dc7f6d1fc364b3c9685cca50fc162edf -rda11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b --- subprojects/tooling-api/src/main/java/org/gradle/tooling/events/OperationType.java (.../OperationType.java) (revision fe4aa832dc7f6d1fc364b3c9685cca50fc162edf) +++ subprojects/tooling-api/src/main/java/org/gradle/tooling/events/OperationType.java (.../OperationType.java) (revision da11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b) @@ -16,6 +16,8 @@ package org.gradle.tooling.events; +import org.gradle.api.Incubating; + /** * Enumerates the different types of operations for which progress events can be received. * @@ -61,7 +63,10 @@ /** * Flag for test output operation progress events. + * + * @since 6.0 */ + @Incubating TEST_OUTPUT } Index: subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/Destination.java =================================================================== diff -u -N -r3559e2686a72cdf575a7819da19b25f4e974c985 -rda11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b --- subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/Destination.java (.../Destination.java) (revision 3559e2686a72cdf575a7819da19b25f4e974c985) +++ subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/Destination.java (.../Destination.java) (revision da11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b) @@ -16,9 +16,18 @@ package org.gradle.tooling.events.test; +import org.gradle.api.Incubating; + import java.io.Serializable; +/** + * Enumerates possible output streams for {@link TestOutputEvent}. + * + * @since 6.0 + */ +@Incubating public enum Destination implements Serializable { + StdOut(0), StdErr(1); @@ -38,6 +47,6 @@ return d; } } - throw new RuntimeException("Cannot find destination with code " + code); + throw new IllegalArgumentException("Cannot find destination with code " + code); } } Index: subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputDescriptor.java =================================================================== diff -u -N -r8e3900f014aedd3fa72a18870a0ccc58ddfac1ba -rda11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b --- subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputDescriptor.java (.../TestOutputDescriptor.java) (revision 8e3900f014aedd3fa72a18870a0ccc58ddfac1ba) +++ subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputDescriptor.java (.../TestOutputDescriptor.java) (revision da11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b) @@ -16,7 +16,14 @@ package org.gradle.tooling.events.test; +import org.gradle.api.Incubating; import org.gradle.tooling.events.OperationDescriptor; +/** + * Describes a test output operation. + * + * @since 6.0 + */ +@Incubating public interface TestOutputDescriptor extends OperationDescriptor { } Index: subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputEvent.java =================================================================== diff -u -N -r3559e2686a72cdf575a7819da19b25f4e974c985 -rda11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b --- subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputEvent.java (.../TestOutputEvent.java) (revision 3559e2686a72cdf575a7819da19b25f4e974c985) +++ subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputEvent.java (.../TestOutputEvent.java) (revision da11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b) @@ -16,13 +16,15 @@ package org.gradle.tooling.events.test; +import org.gradle.api.Incubating; import org.gradle.tooling.events.ProgressEvent; /** * An event that informs about a test having started its execution. * * @since 6.0 */ +@Incubating public interface TestOutputEvent extends ProgressEvent { Destination getDestination(); Index: subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputFinishProgressEvent.java =================================================================== diff -u -N --- subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputFinishProgressEvent.java (revision 8e3900f014aedd3fa72a18870a0ccc58ddfac1ba) +++ subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputFinishProgressEvent.java (revision 0) @@ -1,30 +0,0 @@ -/* - * Copyright 2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gradle.tooling.events.test; - -import org.gradle.tooling.events.FinishEvent; - -/** - * An event that informs about a test having started its execution. - * - * @since 6.0 - */ -public interface TestOutputFinishProgressEvent extends TestOutputProgressEvent, FinishEvent { - - @Override - TestOutputResult getResult(); -} Index: subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputProgressEvent.java =================================================================== diff -u -N --- subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputProgressEvent.java (revision cc7e7d3e0196cffad238943fefc002271c6bdee2) +++ subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputProgressEvent.java (revision 0) @@ -1,28 +0,0 @@ -/* - * Copyright 2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gradle.tooling.events.test; - -import org.gradle.tooling.events.ProgressEvent; -import org.gradle.tooling.events.StartEvent; - -/** - * An event that informs about a test having started its execution. - * - * @since 6.0 - */ -public interface TestOutputProgressEvent extends ProgressEvent { -} Index: subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputResult.java =================================================================== diff -u -N --- subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputResult.java (revision 5daf4c7edcfe21359d9e3f9cdc379378dc05fb8b) +++ subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputResult.java (revision 0) @@ -1,25 +0,0 @@ -/* - * Copyright 2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gradle.tooling.events.test; - -import org.gradle.tooling.events.OperationResult; - -public interface TestOutputResult extends OperationResult { - - Destination getDestination(); - String getMessage(); -} Index: subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputStartProgressEvent.java =================================================================== diff -u -N --- subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputStartProgressEvent.java (revision 8e3900f014aedd3fa72a18870a0ccc58ddfac1ba) +++ subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/TestOutputStartProgressEvent.java (revision 0) @@ -1,27 +0,0 @@ -/* - * Copyright 2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gradle.tooling.events.test; - -import org.gradle.tooling.events.StartEvent; - -/** - * An event that informs about a test having started its execution. - * - * @since 6.0 - */ -public interface TestOutputStartProgressEvent extends TestOutputProgressEvent, StartEvent { -} Index: subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestOutputEvent.java =================================================================== diff -u -N -r3559e2686a72cdf575a7819da19b25f4e974c985 -rda11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b --- subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestOutputEvent.java (.../DefaultTestOutputEvent.java) (revision 3559e2686a72cdf575a7819da19b25f4e974c985) +++ subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestOutputEvent.java (.../DefaultTestOutputEvent.java) (revision da11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b) @@ -19,7 +19,6 @@ import org.gradle.tooling.events.OperationDescriptor; import org.gradle.tooling.events.test.Destination; import org.gradle.tooling.events.test.TestOutputEvent; -import org.gradle.tooling.events.test.TestOutputResult; /** * Implementation of the {@code TestFinishEvent} interface. Index: subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestOutputFinishEvent.java =================================================================== diff -u -N --- subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestOutputFinishEvent.java (revision 5daf4c7edcfe21359d9e3f9cdc379378dc05fb8b) +++ subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestOutputFinishEvent.java (revision 0) @@ -1,38 +0,0 @@ -/* - * Copyright 2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gradle.tooling.events.test.internal; - -import org.gradle.tooling.events.OperationDescriptor; -import org.gradle.tooling.events.internal.DefaultFinishEvent; -import org.gradle.tooling.events.test.Destination; -import org.gradle.tooling.events.test.TestOutputFinishProgressEvent; -import org.gradle.tooling.events.test.TestOutputResult; - -/** - * Implementation of the {@code TestFinishEvent} interface. - */ -public final class DefaultTestOutputFinishEvent extends DefaultFinishEvent implements TestOutputFinishProgressEvent { - - public DefaultTestOutputFinishEvent(long eventTime, String displayName, OperationDescriptor descriptor, Destination destination, String message) { - super(eventTime, displayName, descriptor, new DefaultTestOutputResult(eventTime, eventTime, destination, message)); - } - - @Override - public TestOutputResult getResult() { - return (TestOutputResult) super.getResult(); - } -} Index: subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestOutputOperationDescriptor.java =================================================================== diff -u -N -r8e3900f014aedd3fa72a18870a0ccc58ddfac1ba -rda11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b --- subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestOutputOperationDescriptor.java (.../DefaultTestOutputOperationDescriptor.java) (revision 8e3900f014aedd3fa72a18870a0ccc58ddfac1ba) +++ subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestOutputOperationDescriptor.java (.../DefaultTestOutputOperationDescriptor.java) (revision da11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b) @@ -23,7 +23,6 @@ public class DefaultTestOutputOperationDescriptor extends DefaultOperationDescriptor implements TestOutputDescriptor { - public DefaultTestOutputOperationDescriptor(InternalOperationDescriptor internalDescriptor, OperationDescriptor parent) { super(internalDescriptor, parent); } Index: subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestOutputResult.java =================================================================== diff -u -N --- subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestOutputResult.java (revision 5daf4c7edcfe21359d9e3f9cdc379378dc05fb8b) +++ subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestOutputResult.java (revision 0) @@ -1,44 +0,0 @@ -/* - * Copyright 2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gradle.tooling.events.test.internal; - -import org.gradle.tooling.events.OperationResult; -import org.gradle.tooling.events.internal.DefaultOperationSuccessResult; -import org.gradle.tooling.events.test.Destination; -import org.gradle.tooling.events.test.TestOutputResult; - -public final class DefaultTestOutputResult extends DefaultOperationSuccessResult implements OperationResult, TestOutputResult { - - private final Destination destination; - private final String message; - - public DefaultTestOutputResult(long startTime, long endTime, Destination destination, String message) { - super(startTime, endTime); - this.destination = destination; - this.message = message; - } - - @Override - public Destination getDestination() { - return destination; - } - - @Override - public String getMessage() { - return message; - } -} Index: subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestOutputStartEvent.java =================================================================== diff -u -N --- subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestOutputStartEvent.java (revision 8e3900f014aedd3fa72a18870a0ccc58ddfac1ba) +++ subprojects/tooling-api/src/main/java/org/gradle/tooling/events/test/internal/DefaultTestOutputStartEvent.java (revision 0) @@ -1,29 +0,0 @@ -/* - * Copyright 2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.gradle.tooling.events.test.internal; - -import org.gradle.tooling.events.OperationDescriptor; -import org.gradle.tooling.events.internal.DefaultStartEvent; -import org.gradle.tooling.events.test.TestOutputDescriptor; -import org.gradle.tooling.events.test.TestOutputStartProgressEvent; - -public final class DefaultTestOutputStartEvent extends DefaultStartEvent implements TestOutputStartProgressEvent { - - public DefaultTestOutputStartEvent(long eventTime, String displayName, OperationDescriptor descriptor) { - super(eventTime, displayName, descriptor); - } -} Index: subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/parameters/BuildProgressListenerAdapter.java =================================================================== diff -u -N -r3559e2686a72cdf575a7819da19b25f4e974c985 -rda11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b --- subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/parameters/BuildProgressListenerAdapter.java (.../BuildProgressListenerAdapter.java) (revision 3559e2686a72cdf575a7819da19b25f4e974c985) +++ subprojects/tooling-api/src/main/java/org/gradle/tooling/internal/consumer/parameters/BuildProgressListenerAdapter.java (.../BuildProgressListenerAdapter.java) (revision da11e587a0094e0e9b2ee0e7b12e6fd5b4aea16b) @@ -66,7 +66,6 @@ import org.gradle.tooling.events.test.TestOperationResult; import org.gradle.tooling.events.test.TestOutputDescriptor; import org.gradle.tooling.events.test.TestOutputEvent; -import org.gradle.tooling.events.test.TestOutputProgressEvent; import org.gradle.tooling.events.test.TestProgressEvent; import org.gradle.tooling.events.test.TestStartEvent; import org.gradle.tooling.events.test.internal.DefaultJvmTestOperationDescriptor; @@ -138,9 +137,6 @@ import org.gradle.tooling.internal.protocol.events.InternalTransformDescriptor; import org.gradle.tooling.internal.protocol.events.InternalWorkItemDescriptor; -import java.io.BufferedWriter; -import java.io.FileWriter; -import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -229,7 +225,7 @@ projectConfigurationProgressListeners.getSource().statusChanged(event); } else if (event instanceof TransformProgressEvent) { transformProgressListeners.getSource().statusChanged(event); - } else if (event instanceof TestOutputProgressEvent) { + } else if (event instanceof TestOutputEvent) { testOutputProgressListeners.getSource().statusChanged(event); } else { // Everything else treat as a generic operation @@ -401,7 +397,6 @@ TestOutputDescriptor outputDescriptor = addDescriptor(event.getDescriptor(), toTestOutputDescriptor(descriptor)); Destination destination = Destination.fromCode(event.getResult().getDestination()); return new DefaultTestOutputEvent(event.getEventTime(), outputDescriptor, destination, event.getResult().getMessage()); - return new DefaultTestOutputEvent(event.getEventTime(), outputDescriptor, destination, event.getResult().getMessage()); } private StartEvent genericStartedEvent(InternalOperationStartedProgressEvent event) {