From 64d3c71276a7a4a0a825dc830c3c6dbd758ffb5c Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Mon, 4 Feb 2019 17:04:10 +0300 Subject: [PATCH] Gradle: allow to send custom test events for Gradle test runner using internal xml protocol --- .../gradle/tooling/builder/ExternalProjectBuilderImpl.groovy | 2 +- .../plugins/gradle/tooling/internal/init/testFilterInit.gradle | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy index 93081ca212a6..c38c0c815e83 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ExternalProjectBuilderImpl.groovy @@ -158,7 +158,7 @@ class ExternalProjectBuilderImpl implements ModelBuilderService { externalTask.description = task.description externalTask.group = task.group ?: "other" def ext = task.getExtensions()?.extraProperties - externalTask.test = (task instanceof Test) || (ext?.has("idea.internal.test") && ext.get("idea.internal.test") == true) + externalTask.test = (task instanceof Test) || (ext?.has("idea.internal.test") && Boolean.valueOf(ext.get("idea.internal.test"))) externalTask.type = ProjectExtensionsDataBuilderImpl.getType(task) result.put(externalTask.name, externalTask) } diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/init/testFilterInit.gradle b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/init/testFilterInit.gradle index 174db92e3b64..51a5e201ab14 100644 --- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/init/testFilterInit.gradle +++ b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/init/testFilterInit.gradle @@ -3,6 +3,7 @@ import groovy.xml.MarkupBuilder import org.gradle.api.internal.tasks.testing.TestDescriptorInternal import org.gradle.util.* +System.setProperty("idea.active", "true") String[] ijTestIncludes = ${TEST_NAME_INCLUDES} boolean ijTestFilteringSupported = GradleVersion.current().compareTo(GradleVersion.version("1.10"))>=0 boolean skipExecution