From 506247e590761e3537b715e1141111652e299ac6 Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Mon, 14 Mar 2016 18:45:08 +0300 Subject: [PATCH] gradle: set TestModuleProperties production-module only for 'test' modules (IDEA-151925) --- .../service/project/manage/AbstractModuleDataService.java | 4 +--- .../service/project/BaseGradleProjectResolverExtension.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java index 31b74e432f85..7aad277b5972 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java @@ -92,9 +92,7 @@ public abstract class AbstractModuleDataService extends Ab Module module = node.getUserData(MODULE_KEY); if (module != null) { String productionModuleId = node.getData().getProductionModuleId(); - if (productionModuleId != null) { - modelsProvider.setTestModuleProperties(module, productionModuleId); - } + modelsProvider.setTestModuleProperties(module, productionModuleId); setModuleOptions(module, node); ModifiableRootModel modifiableRootModel = modelsProvider.getModifiableRootModel(module); syncPaths(module, modifiableRootModel, node.getData()); diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java index 4d048250f202..ed082c5fab4c 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/BaseGradleProjectResolverExtension.java @@ -206,8 +206,8 @@ public class BaseGradleProjectResolverExtension implements GradleProjectResolver } } else { - sourceSetData.setProductionModuleId(getInternalModuleName(gradleModule, "main")); if ("test".equals(sourceSet.getName())) { + sourceSetData.setProductionModuleId(getInternalModuleName(gradleModule, "main")); final Set testsArtifacts = externalProject.getArtifactsByConfiguration().get("tests"); if (testsArtifacts != null) { artifacts.addAll(testsArtifacts);