From 17e57a3fc113eb6c963b5fa5d5f698772bd2b3be Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Tue, 23 Dec 2014 12:25:27 +0300 Subject: [PATCH] IDEA-134657 gradle: test resources should appear earlier than production resources in test classpath --- .../gradle/execution/GradleOrderEnumeratorHandler.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java index 8e9e69eac1ff..3361754f910b 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleOrderEnumeratorHandler.java @@ -95,13 +95,12 @@ public class GradleOrderEnumeratorHandler extends OrderEnumerationHandler { ExternalProject externalProject = externalProjectDataService.findExternalProject(externalRootProject, rootModel.getModule()); if (externalProject == null) return false; - if (includeProduction) { - addOutputModuleRoots(externalProject.getSourceSets().get("main"), ExternalSystemSourceType.RESOURCE, result); - } - if (includeTests) { addOutputModuleRoots(externalProject.getSourceSets().get("test"), ExternalSystemSourceType.TEST_RESOURCE, result); } + if (includeProduction) { + addOutputModuleRoots(externalProject.getSourceSets().get("main"), ExternalSystemSourceType.RESOURCE, result); + } return true; }