From 5fe18ae81dfdc76c68a2dd15f3889ef43be5511a Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Mon, 19 Oct 2015 16:11:15 +0300 Subject: [PATCH] gradle: test fix (for merge content roots of the same source set module change) --- .../plugins/gradle/importing/GradleFoldersImportingTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleFoldersImportingTest.java b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleFoldersImportingTest.java index d7f5b4d10028..1830602d1b94 100644 --- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleFoldersImportingTest.java +++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleFoldersImportingTest.java @@ -83,8 +83,8 @@ public class GradleFoldersImportingTest extends GradleImportingTestCase { assertContentRoots("project", getProjectPath()); assertDefaultGradleJavaProjectFolders("project"); - assertGeneratedSources("project_main", "src/main/java"); - assertGeneratedTestSources("project_test", "src/test/java"); + assertGeneratedSources("project_main", "java"); + assertGeneratedTestSources("project_test", "java"); } @Test